Skip to content
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

Jump to bottom

Move setting fHasVirtualStaticMethods out of sanity check section #54574

Merged
merged 1 commit into from
Jun 23, 2021
Merged

Move setting fHasVirtualStaticMethods out of sanity check section #54574

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
13 changes: 8 additions & 5 deletions src/coreclr/vm/methodtablebuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2906,6 +2906,13 @@ MethodTableBuilder::EnumerateClassMethods()
IDS_CLASSLOAD_BADSPECIALMETHOD,
tok);
}

// Check for the presence of virtual static methods
if (IsMdVirtual(dwMemberAttrs) && IsMdStatic(dwMemberAttrs))
{
bmtProp->fHasVirtualStaticMethods = TRUE;
}

//
// But first - minimal flags validity checks
//
Expand Down Expand Up @@ -2972,11 +2979,7 @@ MethodTableBuilder::EnumerateClassMethods()
}
if(IsMdStatic(dwMemberAttrs))
{
if (fIsClassInterface)
{
bmtProp->fHasVirtualStaticMethods = TRUE;
}
else
if (!fIsClassInterface)
{
// Static virtual methods are only allowed to exist in interfaces
BuildMethodTableThrowException(BFA_VIRTUAL_STATIC_METHOD);
Expand Down