fixes after rebasing

Author: VSadov

src/coreclr/gc/env/gctoeeinterface.standalone.inl

@@ -19,11 +19,21 @@ namespace standalone
             ::GCToEEInterface::RestartEE(bFinishedGC);
         }
 
+        void GcScanCurrentStackRoots(promote_func* fn, ScanContext* sc)
+        {
+            ::GCToEEInterface::GcScanCurrentStackRoots(fn, sc);
+        }
+
         void GcScanRoots(promote_func* fn, int condemned, int max_gen, ScanContext* sc)
         {
             ::GCToEEInterface::GcScanRoots(fn, condemned, max_gen, sc);
         }
 
+        void GcPoll()
+        {
+            ::GCToEEInterface::GcPoll();
+        }
+
         void GcStartWork(int condemned, int max_gen)
         {
             ::GCToEEInterface::GcStartWork(condemned, max_gen);

src/coreclr/gc/gc.h

@@ -338,7 +338,7 @@ inline bool IsServerHeap()
 {
 #ifdef FEATURE_SVR_GC
     assert(g_gc_heap_type != GC_HEAP_INVALID);
-    return g_gc_heap_type == GC_HEAP_SVR;
+    return g_gc_heap_type >= GC_HEAP_SVR;
 #else // FEATURE_SVR_GC
     return false;
 #endif // FEATURE_SVR_GC

src/coreclr/gc/gchandletable.cpp

@@ -73,7 +73,11 @@ HHANDLETABLE GCHandleStore::GetTable()
 
 OBJECTHANDLE GCHandleStore::CreateHandleOfType(Object* object, HandleType type)
 {
+#ifdef FEATURE_SATORI_GC
+    HHANDLETABLE handletable = _underlyingBucket.pTable[GetCurrentThreadHomeHeapNumber()];
+#else
     HHANDLETABLE handletable = GetTable();
+#endif
     return ::HndCreateHandle(handletable, type, ObjectToOBJECTREF(object));
 }
 

src/coreclr/gc/handletablescan.cpp

@@ -787,6 +787,10 @@ void BlockResetAgeMapForBlocksWorker(uint32_t *pdwGen, uint32_t dwClumpMask, Sca
     STATIC_CONTRACT_GC_NOTRIGGER;
     STATIC_CONTRACT_MODE_COOPERATIVE;
 
+#if FEATURE_SATORI_GC
+    __UNREACHABLE();
+#endif
+
     // fetch the table segment we are working in
     TableSegment *pSegment = pInfo->pCurrentSegment;
 

src/coreclr/gc/objecthandle.cpp

@@ -1326,11 +1326,13 @@ bool Ref_ScanDependentHandlesForPromotion(DhContext *pDhContext)
                 if (walk->pBuckets[i] != NULL)
                 {
                     int uCPUindex = getSlotNumber(pDhContext->m_pScanContext);
-                    // int uCPUlimit = getNumberOfSlots();
-                    // assert(uCPUlimit > 0);
-                    int uCPUstep = getThreadCount(pDhContext->m_pScanContext);
                     HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
-                    // for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
+#if !defined(FEATURE_SATORI_GC)
+                    int uCPUlimit = getNumberOfSlots();
+                    assert(uCPUlimit > 0);
+                    int uCPUstep = getThreadCount(pDhContext->m_pScanContext);
+                    for (; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
+#endif
                     {
                         HHANDLETABLE hTable = pTable[uCPUindex];
                         if (hTable)
@@ -1411,11 +1413,13 @@ void Ref_ScanWeakInteriorPointersForRelocation(uint32_t condemned, uint32_t maxg
             if (walk->pBuckets[i] != NULL)
             {
                 int uCPUindex = getSlotNumber(sc);
+                HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
+#if !defined(FEATURE_SATORI_GC)
                 int uCPUlimit = getNumberOfSlots();
                 assert(uCPUlimit > 0);
                 int uCPUstep = getThreadCount(sc);
-                HHANDLETABLE* pTable = walk->pBuckets[i]->pTable;
-                for ( ; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
+                for (; uCPUindex < uCPUlimit; uCPUindex += uCPUstep)
+#endif
                 {
                     HHANDLETABLE hTable = pTable[uCPUindex];
                     if (hTable)

src/coreclr/gc/satori/SatoriAllocator.h

@@ -125,7 +125,7 @@ class SatoriAllocator
 #else
         BitScanReverse(&highestBit, value);
 #endif
-        return min(highestBit - Satori::REGION_BITS, Satori::ALLOCATOR_BUCKET_COUNT - 1);
+        return min((int)highestBit - Satori::REGION_BITS, Satori::ALLOCATOR_BUCKET_COUNT - 1);
     }
 };
 

src/coreclr/gc/satori/SatoriGC.cpp

@@ -891,3 +891,12 @@ uint64_t SatoriGC::GetGenerationBudget(int generation)
     // avoid IDE0060: Remove unused parameter 'generation'
     return -1 + 0 * generation;
 }
+
+size_t SatoriGC::GetLOHThreshold()
+{
+    return Satori::LARGE_OBJECT_THRESHOLD;
+}
+
+void SatoriGC::DiagWalkHeapWithACHandling(walk_fn fn, void *context, int gen_number, bool walk_large_object_heap_p)
+{
+}

src/coreclr/gc/satori/SatoriGC.h

@@ -165,6 +165,10 @@ class SatoriGC : public IGCHeapInternal
 
     // Inherited via IGCHeapInternal
     uint64_t GetGenerationBudget(int generation) override;
+
+    // Inherited via IGCHeapInternal
+    size_t GetLOHThreshold() override;
+    void DiagWalkHeapWithACHandling(walk_fn fn, void *context, int gen_number, bool walk_large_object_heap_p) override;
 };
 
 #endif

src/coreclr/gc/satori/SatoriObject.cpp

@@ -91,7 +91,7 @@ void SatoriObject::DirtyCardsForContent()
 {
     _ASSERTE(IsMarked());
     MethodTable* mt = RawGetMethodTable();
-    if (mt->ContainsPointersOrCollectible())
+    if (mt->ContainsGCPointersOrCollectible())
     {
         SatoriPage* page = ContainingRegion()->m_containingPage;
         // if dealing with a collectible type, include MT in the dirty range

src/coreclr/gc/satori/SatoriObject.inl

@@ -282,7 +282,7 @@ inline void SatoriObject::ForEachObjectRef(F lambda, bool includeCollectibleAllo
         lambda((SatoriObject**)&loaderAllocator);
     }
 
-    if (!mt->ContainsPointers())
+    if (!mt->ContainsGCPointers())
     {
         return;
     }
@@ -354,7 +354,7 @@ inline void SatoriObject::ForEachObjectRef(F lambda, size_t size, bool includeCo
         lambda((SatoriObject**)&loaderAllocator);
     }
 
-    if (!mt->ContainsPointers())
+    if (!mt->ContainsGCPointers())
     {
         return;
     }
@@ -421,7 +421,7 @@ inline void SatoriObject::ForEachObjectRef(F lambda, size_t start, size_t end)
         lambda((SatoriObject**)&loaderAllocator);
     }
 
-    if (!mt->ContainsPointers())
+    if (!mt->ContainsGCPointers())
     {
         return;
     }