Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 9c4637a

Browse files
committed
Merge pull request #2016 from dotnet-bot/from-tfs
Merge changes from TFS
2 parents 9d212e9 + 7de4fc3 commit 9c4637a

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/SymbolTable.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1982,7 +1982,13 @@ private SymWithType GetSlotForOverride(MethodInfo method)
19821982

19831983
AggregateSymbol aggregate = GetCTypeFromType(baseMethodInfo.DeclaringType).getAggregate();
19841984
MethodSymbol baseMethod = FindMethodFromMemberInfo(baseMethodInfo);
1985-
Debug.Assert(baseMethod != null);
1985+
1986+
// This assert is temporarily disabled to improve testability of the area on .NetNative
1987+
//Debug.Assert(baseMethod != null);
1988+
if ((object)baseMethod == null)
1989+
{
1990+
throw Error.InternalCompilerError();
1991+
}
19861992

19871993
return new SymWithType(baseMethod, aggregate.getThisType());
19881994
}

src/Microsoft.CSharp/src/Resources/Microsoft.CSharp.rd.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<Method Name="GetLength" Dynamic="Required"/>
5353
<Method Name="get_Length" Dynamic="Required"/>
5454
</Type>
55+
<Type Name="Nullable`1" Dynamic="Required All"/>
5556
<Type Name="Nullable&lt;System.Char&gt;" Dynamic="Required Public"/>
5657
<Type Name="Nullable&lt;System.SByte&gt;" Dynamic="Required Public"/>
5758
<Type Name="Nullable&lt;System.Byte&gt;" Dynamic="Required Public"/>
@@ -82,5 +83,13 @@
8283
<Type Name="Object" Dynamic="Required Public" />
8384
</Namespace>
8485
</Assembly>
86+
87+
<Assembly Name="System.Linq.Expressions">
88+
<Namespace Name="System.Linq.Expressions">
89+
<Type Name="Expression" Dynamic="Required Public">
90+
</Type>
91+
</Namespace>
92+
</Assembly>
93+
8594
</Library>
8695
</Directives>

0 commit comments

Comments
 (0)