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

Fix classcompat loader and static virtual methods #54658

Merged
merged 1 commit into from
Jun 25, 2021
Merged

Fix classcompat loader and static virtual methods #54658

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
4 changes: 2 additions & 2 deletions src/coreclr/vm/classcompat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,7 @@ VOID MethodTableBuilder::BuildInteropVTable_PlaceMembers(
}
}

if(Classification & mdcMethodImpl)
if (Classification & mdcMethodImpl)
{ // If this method serves as the BODY of a MethodImpl specification, then
// we should iterate all the MethodImpl's for this class and see just how many
// of them this method participates in as the BODY.
Expand Down Expand Up @@ -2807,7 +2807,7 @@ VOID MethodTableBuilder::EnumerateClassMethods()
// on this type so we can just compare the tok with the body token found
// from the overrides.
for(DWORD impls = 0; impls < bmtMethodImpl->dwNumberMethodImpls; impls++) {
if(bmtMethodImpl->rgMethodImplTokens[impls].methodBody == tok) {
if ((bmtMethodImpl->rgMethodImplTokens[impls].methodBody == tok) && !IsMdStatic(dwMemberAttrs)) {
Classification |= mdcMethodImpl;
break;
}
Expand Down