Remove IsolateHeap and fix build errors.

Author: atulkatti

lib/Common/ConfigFlagsList.h

@@ -1377,7 +1377,6 @@ FLAGNR(Number,  MinBailOutsBeforeRejit, "Minimum number of bailouts for a single
 FLAGNR(Number,  MinBailOutsBeforeRejitForLoops, "Minimum number of bailouts for a single bailout record after which a rejit is considered", DEFAULT_CONFIG_MinBailOutsBeforeRejitForLoops)
 FLAGNR(Boolean, LibraryStackFrame           , "Display library stack frame", DEFAULT_CONFIG_LibraryStackFrame)
 FLAGNR(Boolean, LibraryStackFrameDebugger   , "Assume debugger support for library stack frame", DEFAULT_CONFIG_LibraryStackFrameDebugger)
-FLAGNR(Number, RecyclerIsolatedHeapStress, "Stress allocation on isolated heap", 2)
 #ifdef RECYCLER_STRESS
 FLAGNR(Boolean, RecyclerStress        , "Stress the recycler by collect on every allocation call", false)
 #if ENABLE_CONCURRENT_GC

lib/Common/Memory/CMakeLists.txt

@@ -12,6 +12,7 @@ set (CCM_SOURCE_FILES ${CCM_SOURCE_FILES}
     HeapBlockMap.cpp
     HeapBucket.cpp
     HeapInfo.cpp
+    HeapInfoManager.cpp
     IdleDecommitPageAllocator.cpp
     LargeHeapBlock.cpp
     LargeHeapBucket.cpp
@@ -26,6 +27,7 @@ set (CCM_SOURCE_FILES ${CCM_SOURCE_FILES}
     RecyclerObjectGraphDumper.cpp
     RecyclerPageAllocator.cpp
     RecyclerSweep.cpp
+    RecyclerSweepManager.cpp
     RecyclerWriteBarrierManager.cpp
     SmallFinalizableHeapBlock.cpp
     SmallFinalizableHeapBucket.cpp

lib/Common/Memory/HeapBlock.h

@@ -131,8 +131,6 @@ enum ObjectInfoBits : unsigned short
     ClientTrackedBit            = 0x0400,       // This allocation is client tracked
     TraceBit                    = 0x0800,
 
-    IsolatedBit                 = 0x1000,
-
     // Additional definitions based on above
 
 #ifdef RECYCLER_STATS

lib/Common/Memory/HeapInfo.cpp

@@ -1311,6 +1311,7 @@ size_t HeapInfo::GetWriteWatchPageCount()
 }
 #endif
 #endif
+
 void
 HeapInfo::SweepPendingObjects(RecyclerSweep& recyclerSweep)
 {
@@ -2108,7 +2109,6 @@ void HeapInfo::ResumeIdleDecommitNonLeaf()
     });
 }
 
-#ifdef IDLE_DECOMMIT_ENABLED
 void
 HeapInfo::EnterIdleDecommit()
 {
@@ -2130,6 +2130,7 @@ HeapInfo::LeaveIdleDecommit(bool allowTimer)
     return idleDecommitSignal;
 }
 
+#ifdef IDLE_DECOMMIT_ENABLED
 DWORD HeapInfo::IdleDecommit()
 {
     DWORD waitTime = INFINITE;

lib/Common/Memory/HeapInfo.h

@@ -203,10 +203,8 @@ class HeapInfo
     static void * GetAlignedAddress(void * address) { return (void*)((uintptr_t)address & ~(uintptr_t)HeapInfo::ObjectAlignmentMask); }
 private:
     template <ObjectInfoBits attributes>
-    typename SmallHeapBlockType<attributes, SmallAllocationBlockAttributes>::BucketType& GetBucket(size_t sizeCat);    
+    typename SmallHeapBlockType<attributes, SmallAllocationBlockAttributes>::BucketType& GetBucket(size_t sizeCat);
 
-    void SweepNonFinalizableBuckets(RecyclerSweep& recyclerSweep, bool concurrent);
-
 #ifdef BUCKETIZE_MEDIUM_ALLOCATIONS
 #if SMALLBLOCK_MEDIUM_ALLOC
     template <ObjectInfoBits attributes>
@@ -376,7 +374,7 @@ class HeapInfo
 
         inline const ValidPointers<TBlockAttributes> GetValidPointersForIndex(uint bucketIndex) const
         {
-            AnalysisAssert(bucketIndex < TBlockAttributes::BucketCount);  
+            AnalysisAssert(bucketIndex < TBlockAttributes::BucketCount);
             ushort const * validPointers = nullptr;
 #if USE_VPM_TABLE
             validPointers = validPointersBuffer[bucketIndex];
@@ -386,7 +384,7 @@ class HeapInfo
 
         inline const typename SmallHeapBlockT<TBlockAttributes>::SmallHeapBlockBitVector * GetInvalidBitVector(uint index) const
         {
-            AnalysisAssert(index < TBlockAttributes::BucketCount);            
+            AnalysisAssert(index < TBlockAttributes::BucketCount);
 #if USE_STATIC_VPM
             return &(*invalidBitsBuffers)[index];
 #else
@@ -503,9 +501,10 @@ class HeapInfo
 
      void SuspendIdleDecommitNonLeaf();
      void ResumeIdleDecommitNonLeaf();
-#ifdef IDLE_DECOMMIT_ENABLED
+
      void EnterIdleDecommit();
      IdleDecommitSignal LeaveIdleDecommit(bool allowTimer);
+#ifdef IDLE_DECOMMIT_ENABLED
      DWORD IdleDecommit();
 #endif
 #if DBG

lib/Common/Memory/HeapInfoManager.cpp

@@ -9,40 +9,35 @@ namespace Memory
 template <class Fn>
 bool HeapInfoManager::AreAllHeapInfo(Fn fn)
 {
-    return fn(defaultHeap) && fn(isolatedHeap);
+    return fn(defaultHeap);
 }
 
 template <class Fn>
 bool HeapInfoManager::IsAnyHeapInfo(Fn fn)
 {
-    return fn(defaultHeap) || fn(isolatedHeap);
+    return fn(defaultHeap);
 }
 
 template <class Fn>
 void HeapInfoManager::ForEachHeapInfo(Fn fn)
 {
     fn(defaultHeap);
-    fn(isolatedHeap);
 }
 
 template <class Fn>
 void HeapInfoManager::ForEachHeapInfo(RecyclerSweepManager& recyclerSweepManager, Fn fn)
 {
     fn(defaultHeap, recyclerSweepManager.defaultHeapRecyclerSweep);
-    fn(isolatedHeap, recyclerSweepManager.isolatedHeapRecyclerSweep);
 }
 
 template <class Fn>
 void HeapInfoManager::ForEachHeapInfo(RecyclerSweepManager * recyclerSweepManager, Fn fn)
 {
     fn(defaultHeap, recyclerSweepManager? &recyclerSweepManager->defaultHeapRecyclerSweep : nullptr);
-    fn(isolatedHeap, recyclerSweepManager? &recyclerSweepManager->isolatedHeapRecyclerSweep : nullptr);
 }
 
 HeapInfoManager::HeapInfoManager(AllocationPolicyManager * policyManager, Js::ConfigFlagsTable& configFlagsTable, IdleDecommitPageAllocator * leafPageAllocator) :
-    isolatedLeafPageAllocator(&isolatedHeap, policyManager, configFlagsTable, RecyclerHeuristic::Instance.DefaultMaxFreePageCount, RecyclerHeuristic::Instance.DefaultMaxAllocPageCount),
     defaultHeap(policyManager, configFlagsTable, leafPageAllocator),
-    isolatedHeap(policyManager, configFlagsTable, &isolatedLeafPageAllocator),
 #if ENABLE_PARTIAL_GC
     uncollectedNewPageCount(0),
     unusedPartialCollectFreeBytes(0),
@@ -474,7 +469,6 @@ HeapInfoManager::Close()
     {
         heapInfo.CloseNonLeaf();
     });
-    this->isolatedLeafPageAllocator.Close();
 }
 
 void
@@ -494,7 +488,7 @@ HeapInfoManager::ResumeIdleDecommitNonLeaf()
         heapInfo.ResumeIdleDecommitNonLeaf();
     });
 }
-#ifdef IDLE_DECOMMIT_ENABLED
+
 void
 HeapInfoManager::EnterIdleDecommit()
 {
@@ -516,6 +510,7 @@ HeapInfoManager::LeaveIdleDecommit(bool allowTimer)
     return idleDecommitSignal;
 }
 
+#ifdef IDLE_DECOMMIT_ENABLED
 DWORD
 HeapInfoManager::IdleDecommit()
 {

lib/Common/Memory/HeapInfoManager.h

@@ -18,11 +18,6 @@ class HeapInfoManager
         return &defaultHeap;
     }
 
-    HeapInfo * GetIsolatedHeap()
-    {
-        return &isolatedHeap;
-    }
-
     void Initialize(Recycler * recycler
 #ifdef RECYCLER_PAGE_HEAP
         , PageHeapMode pageheapmode = PageHeapMode::PageHeapModeOff
@@ -109,9 +104,9 @@ class HeapInfoManager
 
     void SuspendIdleDecommitNonLeaf();
     void ResumeIdleDecommitNonLeaf();
-#ifdef IDLE_DECOMMIT_ENABLED
     void EnterIdleDecommit();
     IdleDecommitSignal LeaveIdleDecommit(bool allowTimer);
+#ifdef IDLE_DECOMMIT_ENABLED
     DWORD IdleDecommit();
 #endif
 #if DBG
@@ -204,10 +199,7 @@ class HeapInfoManager
     friend class HeapInfo;
     friend class RecyclerSweepManager;
 
-    RecyclerPageAllocator isolatedLeafPageAllocator;
     HeapInfo defaultHeap;
-    HeapInfo isolatedHeap;
-
 
     size_t uncollectedAllocBytes;
     size_t lastUncollectedAllocBytes;

lib/Common/Memory/Recycler.cpp

@@ -169,7 +169,6 @@ Recycler::Recycler(AllocationPolicyManager * policyManager, IdleDecommitPageAllo
 #if DBG
     isExternalStackSkippingGC(false),
     isProcessingRescan(false),
-    recyclerIsolatedHeapStressAllocationCount(0),
 #endif
 #if ENABLE_PARTIAL_GC
     inPartialCollectMode(false),
@@ -1054,15 +1053,14 @@ Recycler::LeaveIdleDecommit()
                 Output::Flush();
             }
 #endif
+
+#pragma prefast(suppress:6387, "INVALID_PARAM_VALUE_1 We will never reach here if concurrentIdleDecommitEvent is NULL.");
             SetEvent(this->concurrentIdleDecommitEvent);
         }
     }
 
 #else
-    ForEachPageAllocator([](IdleDecommitPageAllocator* pageAlloc)
-    {
-        pageAlloc->LeaveIdleDecommit(false);
-    });
+    autoHeap.LeaveIdleDecommit(false /*allowTimer*/);
 #endif
 }
 
@@ -1178,14 +1176,7 @@ bool Recycler::ExplicitFreeInternal(void* buffer, size_t size, size_t sizeCat)
     Assert(heapBlock != nullptr);
 
 #if DBG
-    if (this->GetRecyclerFlagsTable().RecyclerIsolatedHeapStress != 0)
-    {
-        heapInfo = heapBlock->GetHeapInfo();
-    }
-    else
-    {
-        Assert(heapInfo == heapBlock->GetHeapInfo());
-    }
+    Assert(heapInfo == heapBlock->GetHeapInfo());
 #endif
 
 #ifdef RECYCLER_PAGE_HEAP
@@ -1387,11 +1378,7 @@ void Recycler::GetNormalHeapBlockAllocatorInfoForNativeAllocation(size_t allocSi
     Assert(HeapInfo::IsSmallObject(allocSize));
 
     allocatorAddress = (char*)this + offsetof(Recycler, autoHeap)
-#ifdef RECYCLER_ISOLATED_HEAP
-        + (isolated ? offsetof(HeapInfoManager, isolatedHeap) : offsetof(HeapInfoManager, defaultHeap))
-#else
         + offsetof(HeapInfoManager, defaultHeap)
-#endif
         + offsetof(HeapInfo, heapBuckets)
         + sizeof(HeapBucketGroup<SmallAllocationBlockAttributes>)*((uint)(allocSize >> HeapConstants::ObjectAllocationShift) - 1)
         + HeapBucketGroup<SmallAllocationBlockAttributes>::GetHeapBucketOffset()
@@ -3186,7 +3173,7 @@ Recycler::SweepHeap(bool concurrent, RecyclerSweepManager& recyclerSweepManager)
 #if ENABLE_BACKGROUND_PAGE_ZEROING
         if (CONFIG_FLAG(EnableBGFreeZero))
         {
-            Assert(!autoHeap.HasZeroQueuedPages());            
+            Assert(!autoHeap.HasZeroQueuedPages());
         }
 #endif
 

lib/Common/Memory/Recycler.h

@@ -1074,32 +1074,15 @@ class Recycler
     template <ObjectInfoBits attributes>
     HeapInfo * GetHeapInfoForAllocation()
     {
-#if DBG
-        if (this->GetRecyclerFlagsTable().IsEnabled(Js::RecyclerIsolatedHeapStressFlag))
-        {
-            recyclerIsolatedHeapStressAllocationCount++;
-            if ((recyclerIsolatedHeapStressAllocationCount % this->GetRecyclerFlagsTable().RecyclerIsolatedHeapStress) != 0)
-            {
-                return this->autoHeap.GetIsolatedHeap();
-            }
-        }
-#endif
         return this->GetHeapInfo<attributes>();
     }
 
     template <ObjectInfoBits attributes>
     HeapInfo * GetHeapInfo()
     {
-        if (attributes & IsolatedBit)
-        {
-            return this->autoHeap.GetIsolatedHeap();
-        }
         return this->autoHeap.GetDefaultHeap();
     }
 
-#if DBG
-    uint recyclerIsolatedHeapStressAllocationCount;
-#endif
 #ifdef PROFILE_MEM
     RecyclerMemoryData * memoryData;
 #endif
@@ -1167,7 +1150,6 @@ class Recycler
 
     void Prime();
     void* GetOwnerContext() { return (void*) this->collectionWrapper; }
-    //PageAllocator * GetPageAllocator() { return threadPageAllocator; }
     bool NeedOOMRescan() const;
     void SetNeedOOMRescan();
     void ClearNeedOOMRescan();
@@ -1377,21 +1359,21 @@ class Recycler
     char* GetAddressOfAllocator(size_t sizeCat)
     {
         Assert(HeapInfo::IsAlignedSmallObjectSize(sizeCat));
-        return (char*)this->GetHeapInfo<attributes>()->GetBucket<(ObjectInfoBits)(attributes & GetBlockTypeBitMask)>(sizeCat).GetAllocator();
+        return (char*)this->GetHeapInfo<attributes>()->template GetBucket<(ObjectInfoBits)(attributes & GetBlockTypeBitMask)>(sizeCat).GetAllocator();
     }
 
     template <ObjectInfoBits attributes>
     uint32 GetEndAddressOffset(size_t sizeCat)
     {
         Assert(HeapInfo::IsAlignedSmallObjectSize(sizeCat));
-        return this->GetHeapInfo<attributes>()->GetBucket<(ObjectInfoBits)(attributes & GetBlockTypeBitMask)>(sizeCat).GetAllocator()->GetEndAddressOffset();
+        return this->GetHeapInfo<attributes>()->template GetBucket<(ObjectInfoBits)(attributes & GetBlockTypeBitMask)>(sizeCat).GetAllocator()->GetEndAddressOffset();
     }
 
     template <ObjectInfoBits attributes>
     uint32 GetFreeObjectListOffset(size_t sizeCat)
     {
         Assert(HeapInfo::IsAlignedSmallObjectSize(sizeCat));
-        return this->GetHeapInfo<attributes>()->GetBucket<(ObjectInfoBits)(attributes & GetBlockTypeBitMask)>(sizeCat).GetAllocator()->GetFreeObjectListOffset();
+        return this->GetHeapInfo<attributes>()->template GetBucket<(ObjectInfoBits)(attributes & GetBlockTypeBitMask)>(sizeCat).GetAllocator()->GetFreeObjectListOffset();
     }
 
     void GetNormalHeapBlockAllocatorInfoForNativeAllocation(size_t sizeCat, void*& allocatorAddress, uint32& endAddressOffset, uint32& freeListOffset, bool allowBumpAllocation, bool isOOPJIT);
@@ -2271,7 +2253,7 @@ class CollectedRecyclerWeakRefHeapBlock : public HeapBlock
 #endif
 
 #if DBG
-    virtual HeapInfo * GetHeapInfo() const override { Assert(false); return false; }
+    virtual HeapInfo * GetHeapInfo() const override { Assert(false); return nullptr; }
     virtual BOOL IsFreeObject(void* objectAddress) override { Assert(false); return false; }
 #endif
     virtual BOOL IsValidObject(void* objectAddress) override { Assert(false); return false; }

lib/Common/Memory/RecyclerSweepManager.cpp

@@ -53,6 +53,10 @@ RecyclerSweepManager::BeginSweep(Recycler * recycler)
         // We are about to sweep, give the runtime a chance to see the now-immutable state of the world.
         // And clean up all the cache not monitor by the GC (e.g. inline caches)
         AUTO_NO_EXCEPTION_REGION;
+
+        // RecyclerSweep may not be initialized till later in this function but
+        // GCETW relies on the recycler pointer being correctly set up
+        this->recycler = recycler;
         GCETW(GC_PRESWEEPCALLBACK_START, (this));
         recycler->collectionWrapper->PreSweepCallback();
         GCETW(GC_PRESWEEPCALLBACK_STOP, (this));
@@ -66,8 +70,6 @@ RecyclerSweepManager::BeginSweep(Recycler * recycler)
     recycler->recyclerSweepManager = this;
 
     this->defaultHeapRecyclerSweep.BeginSweep(recycler, this, recycler->autoHeap.GetDefaultHeap());
-    this->isolatedHeapRecyclerSweep.BeginSweep(recycler, this, recycler->autoHeap.GetIsolatedHeap());
-
 
 #if ENABLE_PARTIAL_GC
     Assert(recycler->clientTrackedObjectList.Empty());
@@ -133,7 +135,7 @@ RecyclerSweepManager::FinishSweep()
     if (recycler->collectionState == CollectionStateConcurrentSweepPass2)
     {
         GCETW_INTERNAL(GC_START, (recycler, ETWEvent_ConcurrentSweep_Pass2));
-        GCETW_INTERNAL(GC_START2, (recycler, ETWEvent_ConcurrentSweep_Pass2, this->collectionStartReason, this->collectionStartFlags));
+        GCETW_INTERNAL(GC_START2, (recycler, ETWEvent_ConcurrentSweep_Pass2, recycler->collectionStartReason, recycler->collectionStartFlags));
     }
 #endif
 
@@ -217,7 +219,7 @@ RecyclerSweepManager::FinishSweep()
     if (recycler->collectionState == CollectionStateConcurrentSweepPass2)
     {
         GCETW_INTERNAL(GC_STOP, (recycler, ETWEvent_ConcurrentSweep_Pass2));
-        GCETW_INTERNAL(GC_STOP2, (recycler, ETWEvent_ConcurrentSweep_Pass2, this->collectionStartReason, this->collectionStartFlags));
+        GCETW_INTERNAL(GC_STOP2, (recycler, ETWEvent_ConcurrentSweep_Pass2, recycler->collectionStartReason, recycler->collectionStartFlags));
     }
 #endif
 #endif
@@ -255,7 +257,6 @@ void
 RecyclerSweepManager::ShutdownCleanup()
 {
     this->defaultHeapRecyclerSweep.ShutdownCleanup();
-    this->isolatedHeapRecyclerSweep.ShutdownCleanup();
 }
 
 #if ENABLE_CONCURRENT_GC
@@ -583,6 +584,6 @@ RecyclerSweepManager::DoAdjustPartialHeuristics() const
 #if DBG || defined(RECYCLER_SLOW_CHECK_ENABLED)
 size_t RecyclerSweepManager::GetPendingMergeNewHeapBlockCount(HeapInfo const * heapInfo)
 {
-    return this->defaultHeapRecyclerSweep.GetPendingMergeNewHeapBlockCount(heapInfo) + this->isolatedHeapRecyclerSweep.GetPendingMergeNewHeapBlockCount(heapInfo);
+    return this->defaultHeapRecyclerSweep.GetPendingMergeNewHeapBlockCount(heapInfo);
 }
 #endif