Change native side instead

dotnet · Jan 6, 2025 · fe399fb · fe399fb
1 parent 3d03a9e
commit fe399fb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/coreclr/nativeaot/Runtime/RestrictedCallouts.h b/src/coreclr/nativeaot/Runtime/RestrictedCallouts.h
@@ -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);
 };
diff --git a/...stem.Private.CoreLib/src/System/Runtime/InteropServices/TrackerObjectManager.NativeAot.cs b/...stem.Private.CoreLib/src/System/Runtime/InteropServices/TrackerObjectManager.NativeAot.cs
@@ -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) ||
@@ -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)
@@ -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)
@@ -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();