Skip to content

Constraint checking #20

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
trylek merged 1 commit into from
May 12, 2021
Merged

Constraint checking #20

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
24 changes: 24 additions & 0 deletions src/coreclr/vm/typedesc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1903,6 +1903,30 @@ BOOL TypeVarTypeDesc::SatisfiesConstraints(SigTypeContext *pTypeContextOfConstra
// if a concrete type can be cast to the constraint, then this constraint will be satisifed
if (thElem.CanCastTo(thConstraint))
{
// Static virtual methods need an extra check when an abstract type is used for instantiation
// to ensure that the implementation of the constraint is complete
if (!thElem.IsTypeDesc() &&
thElem.AsMethodTable()->IsAbstract() &&
thConstraint.IsInterface() &&
thConstraint.AsMethodTable()->HasVirtualStaticMethods())
{
MethodTable *pInterfaceMT = thConstraint.AsMethodTable();
bool virtualStaticResolutionCheckFailed = false;
for (MethodTable::MethodIterator it(pInterfaceMT); it.IsValid(); it.Next())
{
MethodDesc *pMD = it.GetMethodDesc();
if (pMD->IsVirtual() &&
pMD->IsStatic() &&
!thElem.AsMethodTable()->ResolveVirtualStaticMethod(pInterfaceMT, pMD, /* allowNullResult */ TRUE, /* checkDuplicates */ TRUE))
{
virtualStaticResolutionCheckFailed = true;
break;
}
}

if (virtualStaticResolutionCheckFailed)
continue;
}
fCanCast = TRUE;
break;
}
Expand Down
4 changes: 2 additions & 2 deletions ...ader/StaticVirtualMethods/NegativeTestCases/UnimplementedAbstractMethodOnAbstractClass.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,14 @@ ConstrainedCallOnAbstractClassToAbstractMethodOnSharedGenericDone: nop
.try {
call void TestEntrypoint::TestScenario2Wrapper()
ldstr "ConstraintCheckShouldFail"
ldstr "TypeLoadException"
ldstr "VerificationException"
ldstr "Did not throw exception"
call void [TypeHierarchyCommonCs]Statics::CheckForFailure(string,string,string)
leave.s ConstraintCheckShouldFailDone
} catch [System.Runtime]System.Exception {
stloc.0
ldstr "ConstraintCheckShouldFail"
ldstr "TypeLoadException"
ldstr "VerificationException"
ldloc.0
callvirt instance class [System.Runtime]System.Type [System.Runtime]System.Exception::GetType()
callvirt instance string [System.Runtime]System.Reflection.MemberInfo::get_Name()
Expand Down