Skip to content

Fix calling convention mismatch in GC callouts #110685

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
Dec 16, 2024
Merged

Fix calling convention mismatch in GC callouts #110685

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13890ce
Fix calling convention mismatch in GC callouts
MichalStrehovsky Dec 13, 2024
37ce31c
Change native side instead
MichalStrehovsky Dec 16, 2024
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
12 changes: 6 additions & 6 deletions ...stem.Private.CoreLib/src/System/Runtime/InteropServices/TrackerObjectManager.NativeAot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ public static void EndReferenceTracking()

public static unsafe void RegisterGCCallbacks()
{
delegate* unmanaged<int, void> gcStartCallback = &GCStartCollection;
delegate* unmanaged<int, void> gcStopCallback = &GCStopCollection;
delegate* unmanaged<int, void> gcAfterMarkCallback = &GCAfterMarkPhase;
delegate* unmanaged[Fastcall]<int, void> gcStartCallback = &GCStartCollection;
delegate* unmanaged[Fastcall]<int, void> gcStopCallback = &GCStopCollection;
delegate* unmanaged[Fastcall]<int, void> gcAfterMarkCallback = &GCAfterMarkPhase;

if (!RuntimeImports.RhRegisterGcCallout(RuntimeImports.GcRestrictedCalloutKind.StartCollection, (IntPtr)gcStartCallback) ||
!RuntimeImports.RhRegisterGcCallout(RuntimeImports.GcRestrictedCalloutKind.EndCollection, (IntPtr)gcStopCallback) ||
Expand All @@ -155,7 +155,7 @@ public static bool AddReferencePath(object target, object foundReference)
}

// Used during GC callback
[UnmanagedCallersOnly]
[UnmanagedCallersOnly(CallConvs = [typeof(CallConvFastcall)])]
private static void GCStartCollection(int condemnedGeneration)
{
if (condemnedGeneration >= 2)
Expand All @@ -167,7 +167,7 @@ private static void GCStartCollection(int condemnedGeneration)
}

// Used during GC callback
[UnmanagedCallersOnly]
[UnmanagedCallersOnly(CallConvs = [typeof(CallConvFastcall)])]
private static void GCStopCollection(int condemnedGeneration)
{
if (condemnedGeneration >= 2)
Expand All @@ -177,7 +177,7 @@ private static void GCStopCollection(int condemnedGeneration)
}

// Used during GC callback
[UnmanagedCallersOnly]
[UnmanagedCallersOnly(CallConvs = [typeof(CallConvFastcall)])]
private static void GCAfterMarkPhase(int condemnedGeneration)
{
DetachNonPromotedObjects();
Expand Down
Loading