Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[release/9.0-staging] Fix calling convention mismatch in GC callouts #111105

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 3 commits into from
Jan 8, 2025
Merged

[release/9.0-staging] Fix calling convention mismatch in GC callouts #111105

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d03a9e
Fix calling convention mismatch in GC callouts
MichalStrehovsky Dec 13, 2024
fe399fb
Change native side instead
MichalStrehovsky Dec 16, 2024
eae2bba
Merge branch 'release/9.0-staging' into backport/pr-110685-to-release…
jeffschwMSFT Jan 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
Prev Previous commit
Next Next commit
Change native side instead
  • Loading branch information
@MichalStrehovsky
MichalStrehovsky authored and github-actions committed Jan 6, 2025
commit fe399fba0663e85f2ddf0cd0f6711ee5c97a56c1
2 changes: 1 addition & 1 deletion src/coreclr/nativeaot/Runtime/RestrictedCallouts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,6 @@ class RestrictedCallouts
static CrstStatic s_sLock;

// Prototypes for the callouts.
typedef void (F_CALL_CONV * GcRestrictedCallbackFunction)(uint32_t uiCondemnedGeneration);
typedef void (* GcRestrictedCallbackFunction)(uint32_t uiCondemnedGeneration);
typedef CLR_BOOL (* HandleTableRestrictedCallbackFunction)(Object * pObject);
};
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[Fastcall]<int, void> gcStartCallback = &GCStartCollection;
delegate* unmanaged[Fastcall]<int, void> gcStopCallback = &GCStopCollection;
delegate* unmanaged[Fastcall]<int, void> gcAfterMarkCallback = &GCAfterMarkPhase;
delegate* unmanaged<int, void> gcStartCallback = &GCStartCollection;
delegate* unmanaged<int, void> gcStopCallback = &GCStopCollection;
delegate* unmanaged<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(CallConvs = [typeof(CallConvFastcall)])]
[UnmanagedCallersOnly]
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(CallConvs = [typeof(CallConvFastcall)])]
[UnmanagedCallersOnly]
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(CallConvs = [typeof(CallConvFastcall)])]
[UnmanagedCallersOnly]
private static void GCAfterMarkPhase(int condemnedGeneration)
{
DetachNonPromotedObjects();
Expand Down
Loading