Remove explicit GC Poll from GC.SuppressFinalize()

Author: AaronRobinsonMSFT

src/coreclr/System.Private.CoreLib/src/System/GC.CoreCLR.cs

@@ -346,14 +346,18 @@ public static void WaitForPendingFinalizers()
 
         // Indicates that the system should not call the Finalize() method on
         // an object that would normally require this call.
-        [MethodImpl(MethodImplOptions.InternalCall)]
-        private static extern void _SuppressFinalize(object o);
+        [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "GCInterface_SuppressFinalize")]
+        [SuppressGCTransition]
+        private static partial void SuppressFinalize(ObjectHandleOnStack obj);
 
-        public static void SuppressFinalize(object obj)
+        public static unsafe void SuppressFinalize(object obj)
         {
             ArgumentNullException.ThrowIfNull(obj);
 
-            _SuppressFinalize(obj);
+            if (RuntimeHelpers.GetMethodTable(obj)->HasFinalizer)
+            {
+                SuppressFinalize(ObjectHandleOnStack.Create(ref obj));
+            }
         }
 
         // Indicates that the system should call the Finalize() method on an object

src/coreclr/vm/comutilnative.cpp

@@ -1106,21 +1106,14 @@ extern "C" void QCALLTYPE GCInterface_UnregisterFrozenSegment(void* segment)
 **Arguments: Object of interest
 **Exceptions: None
 ==============================================================================*/
-FCIMPL1(void, GCInterface::SuppressFinalize, Object *obj)
+extern "C" void QCALLTYPE GCInterface_SuppressFinalize(QCall::ObjectHandleOnStack pObj)
 {
-    FCALL_CONTRACT;
+    QCALL_CONTRACT_NO_GC_TRANSITION;
 
     // Checked by the caller
-    _ASSERTE(obj != NULL);
-
-    if (!obj->GetMethodTable ()->HasFinalizer())
-        return;
-
-    GCHeapUtilities::GetGCHeap()->SetFinalizationRun(obj);
-    FC_GC_POLL();
+    _ASSERTE(pObj.Get()->GetMethodTable()->HasFinalizer());
+    GCHeapUtilities::GetGCHeap()->SetFinalizationRun(OBJECTREFToObject(pObj.Get()));
 }
-FCIMPLEND
-
 
 /*============================ReRegisterForFinalize==============================
 **Action: Indicate that an object's finalizer should be run by the system.

src/coreclr/vm/comutilnative.h

@@ -181,7 +181,6 @@ class GCInterface {
 
     static FCDECL0(int,     GetMaxGeneration);
     static FCDECL1(void,    KeepAlive, Object *obj);
-    static FCDECL1(void,    SuppressFinalize, Object *obj);
     static FCDECL2(int,     CollectionCount, INT32 generation, INT32 getSpecialGCCount);
 
     static FCDECL0(INT64,    GetAllocatedBytesForCurrentThread);
@@ -212,6 +211,8 @@ extern "C" INT64 QCALLTYPE GCInterface_GetTotalMemory();
 
 extern "C" void QCALLTYPE GCInterface_Collect(INT32 generation, INT32 mode);
 
+extern "C" void QCALLTYPE GCInterface_SuppressFinalize(QCall::ObjectHandleOnStack pObj);
+
 extern "C" void* QCALLTYPE GCInterface_GetNextFinalizableObject(QCall::ObjectHandleOnStack pObj);
 
 extern "C" void QCALLTYPE GCInterface_WaitForPendingFinalizers();

src/coreclr/vm/ecalllist.h

@@ -270,8 +270,6 @@ FCFuncStart(gGCInterfaceFuncs)
     FCFuncElement("GetGenerationSize", GCInterface::GetGenerationSize)
     FCFuncElement("GetGenerationInternal", GCInterface::GetGenerationInternal)
     FCFuncElement("GetMaxGeneration", GCInterface::GetMaxGeneration)
-    FCFuncElement("_SuppressFinalize", GCInterface::SuppressFinalize)
-
     FCFuncElement("GetAllocatedBytesForCurrentThread", GCInterface::GetAllocatedBytesForCurrentThread)
     FCFuncElement("GetTotalAllocatedBytesApproximate", GCInterface::GetTotalAllocatedBytesApproximate)
 FCFuncEnd()

src/coreclr/vm/qcallentrypoints.cpp

@@ -318,6 +318,7 @@ static const Entry s_QCall[] =
     DllImportEntry(GCInterface_AllocateNewArray)
     DllImportEntry(GCInterface_GetTotalMemory)
     DllImportEntry(GCInterface_Collect)
+    DllImportEntry(GCInterface_SuppressFinalize)
     DllImportEntry(GCInterface_ReRegisterForFinalize)
     DllImportEntry(GCInterface_GetNextFinalizableObject)
     DllImportEntry(GCInterface_WaitForPendingFinalizers)