Fix bogus assert in resolveVirtualMethodHelper and update related ilproj

Commit migrated from https://github.com/dotnet/coreclr/commit/325332e383e698f0f1262a7f1b15586380e406dd

diff --git a/src/coreclr/src/vm/jitinterface.cpp b/src/coreclr/src/vm/jitinterface.cpp
index 1639e2d..4b9f2f8 100644 (file)
--- a/src/coreclr/src/vm/jitinterface.cpp
+++ b/src/coreclr/src/vm/jitinterface.cpp
@@ -8796,7 +8796,6 @@ static CORINFO_METHOD_HANDLE resolveVirtualMethodHelper(MethodDesc* callerMethod
         // The base method should be in the base vtable
         WORD slot = pBaseMD->GetSlot();
         _ASSERTE(slot < pBaseMT->GetNumVirtuals());
-        _ASSERTE(pBaseMD == pBaseMT->GetMethodDescForSlot(slot));
         
         // Fetch the method that would be invoked if the class were
         // exactly derived class. It is up to the jit to determine whether

diff --git a/src/coreclr/tests/src/Loader/classloader/MethodImpl/self_override1.ilproj b/src/coreclr/tests/src/Loader/classloader/MethodImpl/self_override1.ilproj
index 772b279..61a1808 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/MethodImpl/self_override1.ilproj
+++ b/src/coreclr/tests/src/Loader/classloader/MethodImpl/self_override1.ilproj
@@ -14,6 +14,15 @@
     <CLRTestPriority>0</CLRTestPriority>
   </PropertyGroup>
 
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup>
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>