Skip to content

Fix static virtual methods for delegate creation #118470

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 2 commits into from
Aug 7, 2025
Merged

Fix static virtual methods for delegate creation #118470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2bac6e
Fix static virtual methods for delegate creation
davidwrighton Aug 6, 2025
707b5c0
Update issues.targets
davidwrighton Aug 6, 2025
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
1 change: 1 addition & 0 deletions src/coreclr/inc/vptr_list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ VPTR_CLASS(CallCountingStubManager)
VPTR_CLASS(PEImageLayout)
VPTR_CLASS(ConvertedImageLayout)
VPTR_CLASS(LoadedImageLayout)
VPTR_CLASS(NativeImageLayout)
VPTR_CLASS(FlatImageLayout)

#ifdef DEBUGGING_SUPPORTED
Expand Down
8 changes: 4 additions & 4 deletions src/coreclr/vm/peimagelayout.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,18 +145,18 @@ class LoadedImageLayout: public PEImageLayout
#endif // !DACCESS_COMPILE
};

#ifndef DACCESS_COMPILE
// A special layout that is used to load standalone composite r2r files.
// This layout is not owned by a PEImage and created by simply loading the file
// at the given path.
class NativeImageLayout : public PEImageLayout
{
VPTR_VTABLE_CLASS(NativeImageLayout, PEImageLayout)

public:

public:
#ifndef DACCESS_COMPILE
NativeImageLayout(LPCWSTR fullPath);
};
#endif
};

#endif // PEIMAGELAYOUT_H_

5 changes: 5 additions & 0 deletions src/coreclr/vm/zapsig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,6 +953,11 @@ MethodDesc *ZapSig::DecodeMethod(ModuleBase *pInfoModule,
MemberLoader::ThrowMissingMethodException(constrainedType.GetMethodTable(), NULL, NULL, NULL, 0, NULL);
}

if (directMethod->IsStatic() && (ppTH != NULL))
{
*ppTH = directMethod->GetMethodTable();
}

// Strip the instantiating stub if the signature did not ask for one
if (directMethod->IsInstantiatingStub() && !isInstantiatingStub)
{
Expand Down
6 changes: 0 additions & 6 deletions src/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,12 +540,6 @@
<ExcludeList Include="$(XunitTestBinBase)/JIT/superpmi/superpmicollect/*">
<Issue>Not compatible with crossgen2</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTestDefaultImp/**">
<Issue>https://github.com/dotnet/runtime/issues/109200</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/GenericContext/GenericContextTest/**">
<Issue>https://github.com/dotnet/runtime/issues/109200</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Regressions/coreclr/GitHub_68278/**">
<Issue>https://github.com/dotnet/runtime/issues/108255</Issue>
</ExcludeList>
Expand Down
Loading