Skip to content

Extend static constructor interpreter to support vtable-like structures #114354

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 4 commits into from
Apr 8, 2025
Merged

Extend static constructor interpreter to support vtable-like structures #114354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3146a64
wip
MichalStrehovsky Apr 7, 2025
d069aba
Avoid ThrowInvalidProgramException
MichalStrehovsky Apr 7, 2025
3fb3c39
Test
MichalStrehovsky Apr 7, 2025
453abdf
Fix win-x86
MichalStrehovsky Apr 8, 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
8 changes: 1 addition & 7 deletions src/coreclr/nativeaot/Runtime/HandleTableHelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,8 @@ static ManagedObjectWrapper* ToManagedObjectWrapper(void* dispatchPtr)
// invokes AddRef while holding a lock that it *also* holds while a GC is in progress. If AddRef was managed, we would have
// to synchronize with the GC before entering AddRef, which would deadlock with the other thread holding Xaml's lock.
//
static uint32_t __stdcall IUnknown_AddRef(void* pComThis)
EXTERN_C uint32_t __stdcall RhIUnknown_AddRef(void* pComThis)
{
ManagedObjectWrapper* wrapper = ToManagedObjectWrapper(pComThis);
return wrapper->AddRef();
}

FCIMPL0(void*, RhGetIUnknownAddRef)
{
return (void*)&IUnknown_AddRef;
}
FCIMPLEND
2 changes: 1 addition & 1 deletion ...iveaot/System.Private.CoreLib/src/System/Runtime/InteropServices/ComWrappers.NativeAot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,7 +1337,7 @@ public static void RegisterForMarshalling(ComWrappers instance)
public static unsafe void GetIUnknownImpl(out IntPtr fpQueryInterface, out IntPtr fpAddRef, out IntPtr fpRelease)
{
fpQueryInterface = (IntPtr)(delegate* unmanaged<IntPtr, Guid*, IntPtr*, int>)&ComWrappers.IUnknown_QueryInterface;
fpAddRef = RuntimeImports.RhGetIUnknownAddRef(); // Implemented in C/C++ to avoid GC transitions
fpAddRef = (IntPtr)(delegate*<IntPtr, uint>)&RuntimeImports.RhIUnknown_AddRef; // Implemented in C/C++ to avoid GC transitions
fpRelease = (IntPtr)(delegate* unmanaged<IntPtr, uint>)&ComWrappers.IUnknown_Release;
}

Expand Down
10 changes: 8 additions & 2 deletions src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/RuntimeImports.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,8 +501,14 @@ internal enum GcRestrictedCalloutKind
internal static extern unsafe void RhUnregisterRefCountedHandleCallback(IntPtr pCalloutMethod, MethodTable* pTypeFilter);

[MethodImplAttribute(MethodImplOptions.InternalCall)]
[RuntimeImport(RuntimeLibrary, "RhGetIUnknownAddRef")]
internal static extern IntPtr RhGetIUnknownAddRef();
[RuntimeImport(RuntimeLibrary,
#if TARGET_WINDOWS && TARGET_X86
"_RhIUnknown_AddRef@4"
#else
"RhIUnknown_AddRef"
#endif
)]
internal static extern uint RhIUnknown_AddRef(nint pThis);

#if FEATURE_OBJCMARSHAL
[MethodImplAttribute(MethodImplOptions.InternalCall)]
Expand Down
Loading
Loading