Use cross refs args directly in more places

BrzVlad · BrzVlad · commit 4d61fbe7e570 · 2025-06-13T23:51:53.000+03:00
diff --git a/src/coreclr/gc/env/gcenv.ee.h b/src/coreclr/gc/env/gcenv.ee.h
@@ -39,7 +39,7 @@ class GCToEEInterface
     // Promote refcounted handle callback
     static bool RefCountedHandleCallbacks(Object * pObject);
 
-    static void TriggerClientBridgeProcessing(size_t sccsLen, StronglyConnectedComponent* sccs, size_t ccrsLen, ComponentCrossReference* ccrs);
+    static void TriggerClientBridgeProcessing(MarkCrossReferencesArgs* args);
 
     // Sync block cache management
     static void SyncBlockCacheWeakPtrScan(HANDLESCANPROC scanProc, uintptr_t lp1, uintptr_t lp2);
diff --git a/src/coreclr/gc/env/gctoeeinterface.standalone.inl b/src/coreclr/gc/env/gctoeeinterface.standalone.inl
@@ -49,9 +49,9 @@ namespace standalone
             return ::GCToEEInterface::RefCountedHandleCallbacks(pObject);
         }
 
-        void TriggerClientBridgeProcessing(size_t sccsLen, StronglyConnectedComponent* sccs, size_t ccrsLen, ComponentCrossReference* ccrs)
+        void TriggerClientBridgeProcessing(MarkCrossReferencesArgs* args)
         {
-            return ::GCToEEInterface::TriggerClientBridgeProcessing(sccsLen, sccs, ccrsLen, ccrs);
+            return ::GCToEEInterface::TriggerClientBridgeProcessing(args);
         }
 
         void SyncBlockCacheWeakPtrScan(HANDLESCANPROC scanProc, uintptr_t lp1, uintptr_t lp2)
diff --git a/src/coreclr/gc/gcbridge.cpp b/src/coreclr/gc/gcbridge.cpp
@@ -1169,7 +1169,7 @@ static bool tarjan_scc_algorithm ()
     return true;
 }
 
-static void build_scc_callback_data (BridgeProcessorResult *bp_res)
+static MarkCrossReferencesArgs* build_scc_callback_data ()
 {
     ColorBucket *cur;
     int j;
@@ -1279,24 +1279,19 @@ static void build_scc_callback_data (BridgeProcessorResult *bp_res)
         printf("\t%ld -> %ld\n", api_xrefs[i].SourceGroupIndex, api_xrefs[i].DestinationGroupIndex);
 #endif
 
-    bp_res->sccsLen = num_sccs;
-    bp_res->sccs = api_sccs;
-    bp_res->ccrsLen = xref_count;
-    bp_res->ccrs = api_xrefs;
+    return new (nothrow) MarkCrossReferencesArgs(num_sccs, api_sccs, xref_count, api_xrefs); 
 }
 
-BridgeProcessorResult ProcessBridgeObjects()
+MarkCrossReferencesArgs* ProcessBridgeObjects()
 {
-    BridgeProcessorResult bp_res = { 0 };
-
     if (!tarjan_scc_algorithm())
-        return bp_res;
+        return NULL;
 
-    build_scc_callback_data(&bp_res);
+    MarkCrossReferencesArgs* args = build_scc_callback_data();
 
     reset_objects_header();
 
     bridge_finish();
 
-    return bp_res;
+    return args;
 }
diff --git a/src/coreclr/gc/gcbridge.h b/src/coreclr/gc/gcbridge.h
@@ -8,17 +8,8 @@
 #include "common.h"
 #include "gcinterface.h"
 
-struct BridgeProcessorResult
-{
-    int sccsLen;
-    StronglyConnectedComponent *sccs;
-
-    int ccrsLen;
-    ComponentCrossReference *ccrs;
-};
-
 void BridgeResetData();
-BridgeProcessorResult ProcessBridgeObjects();
+MarkCrossReferencesArgs* ProcessBridgeObjects();
 
 void RegisterBridgeObject(Object *object, uintptr_t context);
 uint8_t** GetRegisteredBridges(size_t *pNumBridges);
diff --git a/src/coreclr/gc/gcenv.ee.standalone.inl b/src/coreclr/gc/gcenv.ee.standalone.inl
@@ -72,10 +72,10 @@ inline bool GCToEEInterface::RefCountedHandleCallbacks(Object * pObject)
     return g_theGCToCLR->RefCountedHandleCallbacks(pObject);
 }
 
-inline void GCToEEInterface::TriggerClientBridgeProcessing(size_t sccsLen, StronglyConnectedComponent* sccs, size_t ccrsLen, ComponentCrossReference* ccrs)
+inline void GCToEEInterface::TriggerClientBridgeProcessing(MarkCrossReferencesArgs* args)
 {
     assert(g_theGCToCLR != nullptr);
-    return g_theGCToCLR->TriggerClientBridgeProcessing(sccsLen, sccs, ccrsLen, ccrs);
+    return g_theGCToCLR->TriggerClientBridgeProcessing(args);
 }
 
 inline void GCToEEInterface::SyncBlockCacheWeakPtrScan(HANDLESCANPROC scanProc, uintptr_t lp1, uintptr_t lp2)
diff --git a/src/coreclr/gc/gcinterface.ee.h b/src/coreclr/gc/gcinterface.ee.h
@@ -240,7 +240,7 @@ class IGCToCLR {
     bool RefCountedHandleCallbacks(Object * pObject) PURE_VIRTUAL
 
     virtual
-    void TriggerClientBridgeProcessing(size_t sccsLen, StronglyConnectedComponent* sccs, size_t ccrsLen, ComponentCrossReference* ccrs) PURE_VIRTUAL
+    void TriggerClientBridgeProcessing(MarkCrossReferencesArgs* args) PURE_VIRTUAL
 
     // Performs a weak pointer scan of the sync block cache.
     virtual
diff --git a/src/coreclr/gc/gcinterface.h b/src/coreclr/gc/gcinterface.h
@@ -156,12 +156,24 @@ struct ComponentCrossReference
     size_t DestinationGroupIndex;
 };
 
-struct MarkCrossReferences
+struct MarkCrossReferencesArgs
 {
     size_t ComponentCount;
     StronglyConnectedComponent* Components;
     size_t CrossReferenceCount;
     ComponentCrossReference* CrossReferences;
+
+    MarkCrossReferencesArgs(
+        size_t ComponentCount,
+        StronglyConnectedComponent* Components,
+        size_t CrossReferenceCount,
+        ComponentCrossReference* CrossReferences)
+    {
+        this->ComponentCount = ComponentCount;
+        this->Components = Components;
+        this->CrossReferenceCount = CrossReferenceCount;
+        this->CrossReferences = CrossReferences;
+    }
 };
 
 
diff --git a/src/coreclr/gc/objecthandle.cpp b/src/coreclr/gc/objecthandle.cpp
@@ -1624,9 +1624,12 @@ uint8_t** Ref_ScanBridgeObjects(uint32_t condemned, uint32_t maxgen, ScanContext
     }
 
     // The callee here will free the allocated memory.
-    BridgeProcessorResult bpResult = ProcessBridgeObjects();
+    MarkCrossReferencesArgs *args = ProcessBridgeObjects();
 
-    GCToEEInterface::TriggerClientBridgeProcessing(bpResult.sccsLen, bpResult.sccs, bpResult.ccrsLen, bpResult.ccrs);
+    if (args != NULL)
+    {
+        GCToEEInterface::TriggerClientBridgeProcessing(args);
+    }
 
     return GetRegisteredBridges(numObjs);
 }
diff --git a/src/coreclr/gc/sample/gcenv.ee.cpp b/src/coreclr/gc/sample/gcenv.ee.cpp
@@ -164,7 +164,7 @@ bool GCToEEInterface::RefCountedHandleCallbacks(Object * pObject)
     return false;
 }
 
-void GCToEEInterface::TriggerClientBridgeProcessing(size_t sccsLen, StronglyConnectedComponent* sccs, size_t ccrsLen, ComponentCrossReference* ccrs)
+void GCToEEInterface::TriggerClientBridgeProcessing(MarkCrossReferencesArgs* args)
 {
 }
 
diff --git a/src/coreclr/vm/gcenv.ee.cpp b/src/coreclr/vm/gcenv.ee.cpp
@@ -402,7 +402,7 @@ bool GCToEEInterface::RefCountedHandleCallbacks(Object * pObject)
     return false;
 }
 
-void GCToEEInterface::TriggerClientBridgeProcessing(size_t sccsLen, StronglyConnectedComponent* sccs, size_t ccrsLen, ComponentCrossReference* ccrs)
+void GCToEEInterface::TriggerClientBridgeProcessing(MarkCrossReferencesArgs* args)
 {
     CONTRACTL
     {
@@ -412,7 +412,7 @@ void GCToEEInterface::TriggerClientBridgeProcessing(size_t sccsLen, StronglyConn
     CONTRACTL_END;
 
 #ifdef FEATURE_GCBRIDGE
-    Interop::TriggerClientBridgeProcessing(sccsLen, sccs, ccrsLen, ccrs);
+    Interop::TriggerClientBridgeProcessing(args);
 #endif // FEATURE_GCBRIDGE
 }
 
diff --git a/src/coreclr/vm/interoplibinterface.h b/src/coreclr/vm/interoplibinterface.h
@@ -73,10 +73,7 @@ class JavaNative
 {
 public: // GC interaction
     static bool TriggerClientBridgeProcessing(
-        _In_ size_t sccsLen,
-        _In_ StronglyConnectedComponent* sccs,
-        _In_ size_t ccrsLen,
-        _In_ ComponentCrossReference* ccrs);
+        _In_ MarkCrossReferencesArgs* args);
 };
 
 extern "C" BOOL QCALLTYPE JavaMarshal_Initialize(
@@ -87,7 +84,7 @@ extern "C" void* QCALLTYPE JavaMarshal_CreateReferenceTrackingHandle(
     _In_ void* context);
 
 extern "C" void QCALLTYPE JavaMarshal_FinishCrossReferenceProcessing(
-    _In_ MarkCrossReferences *crossReferences,
+    _In_ MarkCrossReferencesArgs *crossReferences,
     _In_ int length,
     _In_ void* unreachableObjectHandles);
 
@@ -133,13 +130,10 @@ class Interop
     static void WaitForGCBridgeFinish();
 
     static void TriggerClientBridgeProcessing(
-        _In_ size_t sccsLen,
-        _In_ StronglyConnectedComponent* sccs,
-        _In_ size_t ccrsLen,
-        _In_ ComponentCrossReference* ccrs);
+        _In_ MarkCrossReferencesArgs* args);
 
     static void FinishCrossReferenceProcessing(
-        _In_ MarkCrossReferences *crossReferences,
+        _In_ MarkCrossReferencesArgs *crossReferences,
         _In_ int length,
         _In_ void* unreachableObjectHandles);
 
diff --git a/src/coreclr/vm/interoplibinterface_java.cpp b/src/coreclr/vm/interoplibinterface_java.cpp
@@ -11,7 +11,7 @@
 
 #include "interoplibinterface.h"
 
-using CrossreferenceHandleCallback = void(STDMETHODCALLTYPE *)(MarkCrossReferences*);
+using CrossreferenceHandleCallback = void(STDMETHODCALLTYPE *)(MarkCrossReferencesArgs*);
 
 namespace
 {
@@ -65,7 +65,7 @@ extern "C" void* QCALLTYPE JavaMarshal_CreateReferenceTrackingHandle(
 }
 
 extern "C" void QCALLTYPE JavaMarshal_FinishCrossReferenceProcessing(
-    _In_ MarkCrossReferences *crossReferences,
+    _In_ MarkCrossReferencesArgs *crossReferences,
     _In_ int length,
     _In_ void* unreachableObjectHandles)
 {
@@ -97,10 +97,7 @@ extern "C" BOOL QCALLTYPE JavaMarshal_GetContext(
 }
 
 bool JavaNative::TriggerClientBridgeProcessing(
-    _In_ size_t sccsLen,
-    _In_ StronglyConnectedComponent* sccs,
-    _In_ size_t ccrsLen,
-    _In_ ComponentCrossReference* ccrs)
+    _In_ MarkCrossReferencesArgs *args)
 {
     CONTRACTL
     {
@@ -113,13 +110,7 @@ bool JavaNative::TriggerClientBridgeProcessing(
     if (g_MarkCrossReferences == NULL)
         return false;
 
-    MarkCrossReferences arg;
-    arg.ComponentCount = sccsLen;
-    arg.Components = sccs;
-    arg.CrossReferenceCount = ccrsLen;
-    arg.CrossReferences = ccrs;
-
-    g_MarkCrossReferences(&arg);
+    g_MarkCrossReferences(args);
     return true;
 }
 
diff --git a/src/coreclr/vm/interoplibinterface_shared.cpp b/src/coreclr/vm/interoplibinterface_shared.cpp
@@ -163,9 +163,7 @@ namespace
     CLREvent* g_bridgeFinished = nullptr;
 
     void ReleaseGCBridgeArgumentsWorker(
-        _In_ size_t sccsLen,
-        _In_ StronglyConnectedComponent* sccs,
-        _In_ ComponentCrossReference* ccrs)
+        _In_ MarkCrossReferencesArgs* args)
     {
         CONTRACTL
         {
@@ -178,12 +176,13 @@ namespace
         // See callers of GCToEEInterface::TriggerGCBridge().
 
         // Free memory in each of the SCCs
-        for (size_t i = 0; i < sccsLen; i++)
+        for (size_t i = 0; i < args->ComponentCount; i++)
         {
-            free(sccs[i].Context);
+            free(args->Components[i].Context);
         }
-        free(sccs);
-        free(ccrs);
+        free(args->Components);
+        free(args->CrossReferences);
+        free(args);
     }
 }
 
@@ -213,10 +212,7 @@ void Interop::WaitForGCBridgeFinish()
 }
 
 void Interop::TriggerClientBridgeProcessing(
-    _In_ size_t sccsLen,
-    _In_ StronglyConnectedComponent* sccs,
-    _In_ size_t ccrsLen,
-    _In_ ComponentCrossReference* ccrs)
+    _In_ MarkCrossReferencesArgs* args)
 {
     CONTRACTL
     {
@@ -229,21 +225,21 @@ void Interop::TriggerClientBridgeProcessing(
     {
         // Release the memory allocated since the GCBridge
         // is already running and we're not passing them to it.
-        ReleaseGCBridgeArgumentsWorker(sccsLen, sccs, ccrs);
+        ReleaseGCBridgeArgumentsWorker(args);
         return;
     }
 
     bool gcBridgeTriggered = false;
 
 #ifdef FEATURE_JAVAMARSHAL
-    gcBridgeTriggered = JavaNative::TriggerClientBridgeProcessing(sccsLen, sccs, ccrsLen, ccrs);
+    gcBridgeTriggered = JavaNative::TriggerClientBridgeProcessing(args);
 #endif // FEATURE_JAVAMARSHAL
 
     if (!gcBridgeTriggered)
     {
         // Release the memory allocated since the GCBridge
         // wasn't trigger for some reason.
-        ReleaseGCBridgeArgumentsWorker(sccsLen, sccs, ccrs);
+        ReleaseGCBridgeArgumentsWorker(args);
         return;
     }
 
@@ -263,7 +259,7 @@ void Interop::TriggerClientBridgeProcessing(
 }
 
 void Interop::FinishCrossReferenceProcessing(
-    _In_ MarkCrossReferences *crossReferences,
+    _In_ MarkCrossReferencesArgs *args,
     _In_ int length,
     _In_ void* unreachableObjectHandles)
 {
@@ -285,7 +281,7 @@ void Interop::FinishCrossReferenceProcessing(
         g_bridgeFinished->Set();
     }
 
-    ReleaseGCBridgeArgumentsWorker(crossReferences->ComponentCount, crossReferences->Components, crossReferences->CrossReferences);
+    ReleaseGCBridgeArgumentsWorker(args);
 }
 
 #endif // FEATURE_GCBRIDGE
diff --git a/src/tests/Interop/GCBridge/GCBridgeNative.cpp b/src/tests/Interop/GCBridge/GCBridgeNative.cpp
@@ -26,10 +26,7 @@ struct MarkCrossReferencesArgs
 
 typedef void (*MarkCrossReferencesFtn)(MarkCrossReferencesArgs*);
 
-static size_t g_sccsLen;
-static StronglyConnectedComponent* g_sccs;
-static size_t g_ccrsLen;
-static ComponentCrossReference* g_ccrs;
+static MarkCrossReferencesArgs *markCrossRefsArgs;
 
 MarkCrossReferencesFtn g_bpFinishCallback;
 
@@ -42,21 +39,12 @@ static void BPFinish()
 
     // A real callback would also receive the set of unreachable
     // bridge objects so the gchandles for them are freed
-    MarkCrossReferencesArgs crossRefs;
-    crossRefs.Components = g_sccs;
-    crossRefs.ComponentCount = g_sccsLen;
-    crossRefs.CrossReferences = g_ccrs;
-    crossRefs.CrossReferenceCount = g_ccrsLen;
-
-    g_bpFinishCallback(&crossRefs);
+    g_bpFinishCallback(markCrossRefsArgs);
 }
 
 static void MarkCrossReferences(MarkCrossReferencesArgs* crossRefs)
 {
-    g_sccsLen = crossRefs->ComponentCount;
-    g_sccs = crossRefs->Components;
-    g_ccrsLen = crossRefs->CrossReferenceCount;
-    g_ccrs = crossRefs->CrossReferences;
+    markCrossRefsArgs = crossRefs;
 
     std::thread thr(BPFinish);
     thr.detach();

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,9 @@ namespace standalone`
`49`	`49`	`return ::GCToEEInterface::RefCountedHandleCallbacks(pObject);`
`50`	`50`	`}`
`51`	`51`
`52`		`- void TriggerClientBridgeProcessing(size_t sccsLen, StronglyConnectedComponent* sccs, size_t ccrsLen, ComponentCrossReference* ccrs)`
	`52`	`+ void TriggerClientBridgeProcessing(MarkCrossReferencesArgs* args)`
`53`	`53`	`{`
`54`		`- return ::GCToEEInterface::TriggerClientBridgeProcessing(sccsLen, sccs, ccrsLen, ccrs);`
	`54`	`+ return ::GCToEEInterface::TriggerClientBridgeProcessing(args);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`void SyncBlockCacheWeakPtrScan(HANDLESCANPROC scanProc, uintptr_t lp1, uintptr_t lp2)`
Original file line number	Diff line number	Diff line change
`@@ -72,10 +72,10 @@ inline bool GCToEEInterface::RefCountedHandleCallbacks(Object * pObject)`
`72`	`72`	`return g_theGCToCLR->RefCountedHandleCallbacks(pObject);`
`73`	`73`	`}`
`74`	`74`
`75`		`-inline void GCToEEInterface::TriggerClientBridgeProcessing(size_t sccsLen, StronglyConnectedComponent* sccs, size_t ccrsLen, ComponentCrossReference* ccrs)`
	`75`	`+inline void GCToEEInterface::TriggerClientBridgeProcessing(MarkCrossReferencesArgs* args)`
`76`	`76`	`{`
`77`	`77`	`assert(g_theGCToCLR != nullptr);`
`78`		`- return g_theGCToCLR->TriggerClientBridgeProcessing(sccsLen, sccs, ccrsLen, ccrs);`
	`78`	`+ return g_theGCToCLR->TriggerClientBridgeProcessing(args);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`inline void GCToEEInterface::SyncBlockCacheWeakPtrScan(HANDLESCANPROC scanProc, uintptr_t lp1, uintptr_t lp2)`
Original file line number	Diff line number	Diff line change
`@@ -1624,9 +1624,12 @@ uint8_t** Ref_ScanBridgeObjects(uint32_t condemned, uint32_t maxgen, ScanContext`
`1624`	`1624`	`}`
`1625`	`1625`
`1626`	`1626`	`// The callee here will free the allocated memory.`
`1627`		`- BridgeProcessorResult bpResult = ProcessBridgeObjects();`
	`1627`	`+ MarkCrossReferencesArgs *args = ProcessBridgeObjects();`
`1628`	`1628`
`1629`		`- GCToEEInterface::TriggerClientBridgeProcessing(bpResult.sccsLen, bpResult.sccs, bpResult.ccrsLen, bpResult.ccrs);`
	`1629`	`+ if (args != NULL)`
	`1630`	`+ {`
	`1631`	`+ GCToEEInterface::TriggerClientBridgeProcessing(args);`
	`1632`	`+ }`
`1630`	`1633`
`1631`	`1634`	`return GetRegisteredBridges(numObjs);`
`1632`	`1635`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ bool GCToEEInterface::RefCountedHandleCallbacks(Object * pObject)`
`164`	`164`	`return false;`
`165`	`165`	`}`
`166`	`166`
`167`		`-void GCToEEInterface::TriggerClientBridgeProcessing(size_t sccsLen, StronglyConnectedComponent* sccs, size_t ccrsLen, ComponentCrossReference* ccrs)`
	`167`	`+void GCToEEInterface::TriggerClientBridgeProcessing(MarkCrossReferencesArgs* args)`
`168`	`168`	`{`
`169`	`169`	`}`
`170`	`170`
Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ bool GCToEEInterface::RefCountedHandleCallbacks(Object * pObject)`
`402`	`402`	`return false;`
`403`	`403`	`}`
`404`	`404`
`405`		`-void GCToEEInterface::TriggerClientBridgeProcessing(size_t sccsLen, StronglyConnectedComponent* sccs, size_t ccrsLen, ComponentCrossReference* ccrs)`
	`405`	`+void GCToEEInterface::TriggerClientBridgeProcessing(MarkCrossReferencesArgs* args)`
`406`	`406`	`{`
`407`	`407`	`CONTRACTL`
`408`	`408`	`{`
`@@ -412,7 +412,7 @@ void GCToEEInterface::TriggerClientBridgeProcessing(size_t sccsLen, StronglyConn`
`412`	`412`	`CONTRACTL_END;`
`413`	`413`
`414`	`414`	`#ifdef FEATURE_GCBRIDGE`
`415`		`- Interop::TriggerClientBridgeProcessing(sccsLen, sccs, ccrsLen, ccrs);`
	`415`	`+ Interop::TriggerClientBridgeProcessing(args);`
`416`	`416`	`#endif // FEATURE_GCBRIDGE`
`417`	`417`	`}`
`418`	`418`