Fix the QCall contract for GC suppression. (#108344)

* Fix the QCall contract for GC suppression. * Remove QCALL_BEGIN/END from method
dotnet · Sep 28, 2024 · 7c69e7d · 7c69e7d
1 parent 3fd7b0f
commit 7c69e7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/coreclr/vm/comsynchronizable.cpp b/src/coreclr/vm/comsynchronizable.cpp
@@ -724,15 +724,7 @@ extern "C" BOOL QCALLTYPE ThreadNative_GetIsBackground(QCall::ThreadHandle threa
     }
     CONTRACTL_END;
 
-    BOOL res = FALSE;
-
-    BEGIN_QCALL;
-
-    res = thread->IsBackground();
-
-    END_QCALL;
-
-    return res;
+    return thread->IsBackground();
 }
 
 // Set whether or not this is a background thread.

diff --git a/src/coreclr/vm/qcall.h b/src/coreclr/vm/qcall.h
@@ -129,8 +129,8 @@
     MODE_PREEMPTIVE;            \
 
 #define QCALL_CHECK_NO_GC_TRANSITION    \
-    THROWS;                             \
-    GC_TRIGGERS;                        \
+    NOTHROW;                            \
+    GC_NOTRIGGER;                       \
     MODE_COOPERATIVE;                   \
 
 #define QCALL_CONTRACT CONTRACTL { QCALL_CHECK; } CONTRACTL_END;