a few cleanups

src/coreclr/nativeaot/Runtime/CMakeLists.txt

@@ -10,6 +10,7 @@ set(COMMON_RUNTIME_SOURCES
     EHHelpers.cpp
     event.cpp
     FinalizerHelpers.cpp
+    GcEnum.cpp
     GCHelpers.cpp
     gctoclreventsink.cpp
     gcheaputilities.cpp
@@ -23,7 +24,6 @@ set(COMMON_RUNTIME_SOURCES
     ObjectLayout.cpp
     portable.cpp
     RestrictedCallouts.cpp
-    GcEnum.cpp
     RhConfig.cpp
     RuntimeInstance.cpp
     StackFrameIterator.cpp

src/coreclr/nativeaot/Runtime/GCHelpers.cpp

@@ -89,7 +89,6 @@ bool InitializeSubsystems()
 // should be marked as not containing any references. The rest of the fields don't matter: the GC does not
 // query them and the rest of the runtime will never hold a reference to free object.
 
-
 void MethodTable::InitializeAsGcFreeType()
 {
     m_uFlags = ParameterizedEEType | HasComponentSizeFlag;

src/coreclr/nativeaot/Runtime/GcEnum.cpp

@@ -58,9 +58,9 @@ static void GcEnumObjectsConservatively(PTR_PTR_Object ppLowerBound, PTR_PTR_Obj
 }
 
 void EnumGcRefsInRegionConservatively(PTR_OBJECTREF pLowerBound,
-                                                          PTR_OBJECTREF pUpperBound,
-                                                          ScanFunc* pfnEnumCallback,
-                                                          ScanContext* pvCallbackData)
+                                      PTR_OBJECTREF pUpperBound,
+                                      ScanFunc* pfnEnumCallback,
+                                      ScanContext* pvCallbackData)
 {
     GcEnumObjectsConservatively(pLowerBound, pUpperBound, pfnEnumCallback, pvCallbackData);
 }

src/coreclr/nativeaot/Runtime/gcenv.ee.cpp

@@ -101,15 +101,7 @@ void GCToEEInterface::GcScanRoots(ScanFunc* fn, int condemned, int max_gen, Scan
         if (pThread->IsGCSpecial())
             continue;
 
-#if !defined (ISOLATED_HEAPS)
-        if (!GCHeapUtilities::GetGCHeap()->IsThreadUsingAllocationContextHeap(pThread->GetAllocContext(),
-            sc->thread_number))
-        {
-            // STRESS_LOG2(LF_GC|LF_GCROOTS, LL_INFO100, "{ Scan of Thread %p (ID = %x) declined by this heap\n",
-            //             pThread, pThread->GetThreadId());
-        }
-        else
-#endif
+        if (GCHeapUtilities::GetGCHeap()->IsThreadUsingAllocationContextHeap(pThread->GetAllocContext(), sc->thread_number))
         {
             InlinedThreadStaticRoot* pRoot = pThread->GetInlinedThreadStaticList();
             while (pRoot != NULL)
@@ -137,7 +129,7 @@ void GCToEEInterface::GcScanRoots(ScanFunc* fn, int condemned, int max_gen, Scan
     }
     END_FOREACH_THREAD
 
-        sc->thread_under_crawl = NULL;
+    sc->thread_under_crawl = NULL;
 }
 
 void GCToEEInterface::GcEnumAllocContexts(enum_alloc_context_func* fn, void* param)