Skip to content

Fix static virtual methods with covariant return types #7

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

Closed
wants to merge 1 commit into from
Closed

Fix static virtual methods with covariant return types #7

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
22 changes: 18 additions & 4 deletions src/coreclr/vm/methodtablebuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2114,9 +2114,9 @@ BOOL MethodTableBuilder::IsEligibleForCovariantReturns(mdToken methodDeclToken)

//
// Note on covariant return types: right now we only support covariant returns for MethodImpls on
// classes, where the MethodDecl is also on a class. Interface methods are not supported.
// We will also allow covariant return types if both the MethodImpl and MethodDecl are not on the same type.
//
// classes, where the MethodDecl is also on a class. Interface methods are not supported except for static
// virtual methods. We will also allow covariant return types if both the MethodImpl and MethodDecl
// are not on the same type.

HRESULT hr = S_OK;
IMDInternalImport* pMDInternalImport = GetMDImport();
Expand Down Expand Up @@ -2181,7 +2181,21 @@ BOOL MethodTableBuilder::IsEligibleForCovariantReturns(mdToken methodDeclToken)
if (FAILED(hr))
BuildMethodTableThrowException(hr, *bmtError);

return !IsTdInterface(attr);
if (!IsTdInterface(attr))
{
return TRUE;
}

hr = pMDInternalImport->GetMethodDefProps(methodDeclToken, &attr);
if (FAILED(hr))
BuildMethodTableThrowException(hr, *bmtError);

if (IsMdStatic(attr))
{
return TRUE;
}

return FALSE;
}

//*******************************************************************************
Expand Down