Skip to content

Fix issue with covariant return method validation #41703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2020
Merged

Fix issue with covariant return method validation #41703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/coreclr/src/vm/class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,8 +963,6 @@ void ClassLoader::LoadExactParents(MethodTable *pMT)

MethodTableBuilder::CopyExactParentSlots(pMT, pApproxParentMT);

ValidateMethodsWithCovariantReturnTypes(pMT);

// We can now mark this type as having exact parents
pMT->SetHasExactParent();

Expand Down
6 changes: 5 additions & 1 deletion src/coreclr/src/vm/clsload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3519,11 +3519,15 @@ static void PushFinalLevels(TypeHandle typeHnd, ClassLoadLevel targetLevel, cons
}
CONTRACTL_END


// This phase brings the type and all its transitive dependencies to their
// final state, sans the IsFullyLoaded bit.
if (targetLevel >= CLASS_DEPENDENCIES_LOADED)
{
if (!typeHnd.IsTypeDesc())
{
ClassLoader::ValidateMethodsWithCovariantReturnTypes(typeHnd.AsMethodTable());
}

BOOL fBailed = FALSE;
typeHnd.DoFullyLoad(NULL, CLASS_DEPENDENCIES_LOADED, NULL, &fBailed, pInstContext);
}
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/src/vm/clsload.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,6 +943,8 @@ class ClassLoader
TypeHandle LoadTypeHandleThrowing(NameHandle* pName, ClassLoadLevel level = CLASS_LOADED,
Module* pLookInThisModuleOnly=NULL);

static void ValidateMethodsWithCovariantReturnTypes(MethodTable* pMT);

private:

#ifndef DACCESS_COMPILE
Expand All @@ -969,8 +971,6 @@ class ClassLoader

static void LoadExactParentAndInterfacesTransitively(MethodTable *pMT);

static void ValidateMethodsWithCovariantReturnTypes(MethodTable* pMT);

static bool IsCompatibleWith(TypeHandle hType1, TypeHandle hType2);
static CorElementType GetReducedTypeElementType(TypeHandle hType);
static CorElementType GetVerificationTypeElementType(TypeHandle hType);
Expand Down
141 changes: 141 additions & 0 deletions src/tests/Loader/classloader/regressions/GitHub_41571/GitHub_41571.il
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@

// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

// Metadata version: v4.0.30319
.assembly extern System.Runtime
{
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....:
.ver 5:0:0:0
}
.assembly '41571'
{
.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.custom instance void [System.Runtime]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx
63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 ) // ceptionThrows.

// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [System.Runtime]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [System.Runtime]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 07 01 00 00 00 00 )

.custom instance void [System.Runtime]System.Runtime.Versioning.TargetFrameworkAttribute::.ctor(string) = ( 01 00 18 2E 4E 45 54 43 6F 72 65 41 70 70 2C 56 // ....NETCoreApp,V
65 72 73 69 6F 6E 3D 76 35 2E 30 01 00 54 0E 14 // ersion=v5.0..T..
46 72 61 6D 65 77 6F 72 6B 44 69 73 70 6C 61 79 // FrameworkDisplay
4E 61 6D 65 00 ) // Name.
.custom instance void [System.Runtime]System.Reflection.AssemblyCompanyAttribute::.ctor(string) = ( 01 00 05 34 31 35 37 31 00 00 ) // ...41571..
.custom instance void [System.Runtime]System.Reflection.AssemblyConfigurationAttribute::.ctor(string) = ( 01 00 05 44 65 62 75 67 00 00 ) // ...Debug..
.custom instance void [System.Runtime]System.Reflection.AssemblyFileVersionAttribute::.ctor(string) = ( 01 00 07 31 2E 30 2E 30 2E 30 00 00 ) // ...1.0.0.0..
.custom instance void [System.Runtime]System.Reflection.AssemblyInformationalVersionAttribute::.ctor(string) = ( 01 00 05 31 2E 30 2E 30 00 00 ) // ...1.0.0..
.custom instance void [System.Runtime]System.Reflection.AssemblyProductAttribute::.ctor(string) = ( 01 00 05 34 31 35 37 31 00 00 ) // ...41571..
.custom instance void [System.Runtime]System.Reflection.AssemblyTitleAttribute::.ctor(string) = ( 01 00 05 34 31 35 37 31 00 00 ) // ...41571..
.hash algorithm 0x00008004
.ver 1:0:0:0
}
.module '41571.dll'
// MVID: {7F828A34-F3E8-43DB-A60B-950719B2314B}
.imagebase 0x00400000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// Image base: 0x000001926B4D0000


// =============== CLASS MEMBERS DECLARATION ===================

.class private auto ansi beforefieldinit GitHub_41571.Program
extends [System.Runtime]System.Object
{
.method private hidebysig static int32
Main() cil managed
{
.entrypoint
// Code size 19 (0x13)
.maxstack 1
.locals init (int32 V_0)
IL_0000: nop
IL_0001: newobj instance void GitHub_41571.Base::.ctor()
IL_0006: call instance class GitHub_41571.Derived GitHub_41571.Base::CrashInCallingScope()
IL_000b: pop
IL_000c: ldc.i4.s 100
IL_000e: stloc.0
IL_000f: br.s IL_0011

IL_0011: ldloc.0
IL_0012: ret
} // end of method Program::Main

.method public hidebysig specialname rtspecialname
instance void .ctor() cil managed
{
// Code size 8 (0x8)
.maxstack 8
IL_0000: ldarg.0
IL_0001: call instance void [System.Runtime]System.Object::.ctor()
IL_0006: nop
IL_0007: ret
} // end of method Program::.ctor

} // end of class GitHub_41571.Program

.class private auto ansi beforefieldinit GitHub_41571.Base
extends [System.Runtime]System.Object
{
.method public hidebysig instance class GitHub_41571.Derived
CrashInCallingScope() cil managed
{
// Code size 2 (0x2)
.maxstack 8
IL_0000: ldnull
IL_0001: ret
} // end of method Base::CrashInCallingScope

.method public hidebysig newslot virtual
instance class GitHub_41571.Base
NeededToCrash() cil managed
{
// Code size 2 (0x2)
.maxstack 8
IL_0000: ldnull
IL_0001: ret
} // end of method Base::NeededToCrash

.method public hidebysig specialname rtspecialname
instance void .ctor() cil managed
{
// Code size 8 (0x8)
.maxstack 8
IL_0000: ldarg.0
IL_0001: call instance void [System.Runtime]System.Object::.ctor()
IL_0006: nop
IL_0007: ret
} // end of method Base::.ctor

} // end of class GitHub_41571.Base

.class private auto ansi beforefieldinit GitHub_41571.Derived
extends GitHub_41571.Base
{
.method public hidebysig newslot virtual
instance class GitHub_41571.Derived
NeededToCrash() cil managed
{
.custom instance void [System.Runtime]System.Runtime.CompilerServices.PreserveBaseOverridesAttribute::.ctor() = ( 01 00 00 00 )
.override method instance class GitHub_41571.Base GitHub_41571.Base::NeededToCrash()
// Code size 2 (0x2)
.maxstack 8
IL_0000: ldnull
IL_0001: ret
} // end of method Derived::NeededToCrash

.method public hidebysig specialname rtspecialname
instance void .ctor() cil managed
{
// Code size 8 (0x8)
.maxstack 8
IL_0000: ldarg.0
IL_0001: call instance void GitHub_41571.Base::.ctor()
IL_0006: nop
IL_0007: ret
} // end of method Derived::.ctor

} // end of class GitHub_41571.Derived
10 changes: 10 additions & 0 deletions src/tests/Loader/classloader/regressions/GitHub_41571/GitHub_41571.ilproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
<CLRTestKind>BuildAndRun</CLRTestKind>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<ItemGroup>
<Compile Include="GitHub_41571.il" />
</ItemGroup>
</Project>