Merge pull request #23537 from janvorli/remove-gc-cpu-group-knowledge

[platform/upstream/coreclr.git] / src / vm / gcenv.ee.cpp

diff --git a/src/vm/gcenv.ee.cpp b/src/vm/gcenv.ee.cpp
index 5c0bc9b..ffe3cc1 100644 (file)
--- a/src/vm/gcenv.ee.cpp
+++ b/src/vm/gcenv.ee.cpp
@@ -61,15 +61,9 @@ VOID GCToEEInterface::AfterGcScanRoots (int condemned, int max_gen,
     CONTRACTL_END;
 
 #ifdef FEATURE_COMINTEROP
-    // Go through all the app domains and for each one detach all the *unmarked* RCWs to prevent
+    // Go through all the only app domain and detach all the *unmarked* RCWs to prevent
     // the RCW cache from resurrecting them.
-    UnsafeAppDomainIterator i(TRUE);
-    i.Init();
-
-    while (i.Next())
-    {
-        i.GetDomain()->DetachRCWs();
-    }
+    ::GetAppDomain()->DetachRCWs();
 #endif // FEATURE_COMINTEROP
 }
 
@@ -1483,24 +1477,21 @@ uint32_t GCToEEInterface::GetDefaultDomainIndex()
 {
     LIMITED_METHOD_CONTRACT;
 
-    return SystemDomain::System()->DefaultDomain()->GetIndex().m_dwIndex;
+    return DefaultADID;
 }
 
 void *GCToEEInterface::GetAppDomainAtIndex(uint32_t appDomainIndex)
 {
     LIMITED_METHOD_CONTRACT;
 
-    ADIndex index(appDomainIndex);
-    return static_cast<void *>(SystemDomain::GetAppDomainAtIndex(index));
+    return ::GetAppDomain();
 }
 
 bool GCToEEInterface::AppDomainCanAccessHandleTable(uint32_t appDomainID)
 {
     LIMITED_METHOD_CONTRACT;
 
-    ADIndex index(appDomainID);
-    AppDomain *pDomain = SystemDomain::GetAppDomainAtIndex(index);
-    return (pDomain != NULL);
+    return appDomainID == DefaultADID;
 }
 
 uint32_t GCToEEInterface::GetIndexOfAppDomainBeingUnloaded()