diff options
| author | Jonghyun Park <parjong@gmail.com> | 2017-03-21 15:10:30 +0900 |
|---|---|---|
| committer | Jonghyun Park <parjong@gmail.com> | 2017-03-21 15:10:30 +0900 |
| commit | 325332e383e698f0f1262a7f1b15586380e406dd (patch) | |
| tree | 4d127e066ccc0a9dbb0a6269097f726db2b84571 | |
| parent | 281da0a152ff5dc65b4bebcc95d19ec8e4a4508e (diff) | |
| download | coreclr-325332e383e698f0f1262a7f1b15586380e406dd.tar.gz coreclr-325332e383e698f0f1262a7f1b15586380e406dd.tar.bz2 coreclr-325332e383e698f0f1262a7f1b15586380e406dd.zip | |
Fix bogus assert in resolveVirtualMethodHelper and update related ilproj
| -rw-r--r-- | src/vm/jitinterface.cpp | 1 | ||||
| -rw-r--r-- | tests/src/Loader/classloader/MethodImpl/self_override1.ilproj | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/vm/jitinterface.cpp b/src/vm/jitinterface.cpp index 1639e2df19..4b9f2f85e4 100644 --- a/src/vm/jitinterface.cpp +++ b/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/tests/src/Loader/classloader/MethodImpl/self_override1.ilproj b/tests/src/Loader/classloader/MethodImpl/self_override1.ilproj index 772b2792fd..61a1808d19 100644 --- a/tests/src/Loader/classloader/MethodImpl/self_override1.ilproj +++ b/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> |