[1.10>master] [MERGE #5345 @atulkatti] MSFT:17960528 In case we back-…

…off from IdleDecommit we may still have pages in BG zero page queue. Merge pull request #5345 from atulkatti:FixIdleDecommitCheckAssert.1
chakra-core · Jun 21, 2018 · 65ea21a · 65ea21a
2 parents 127b611 + 9e876e0
commit 65ea21a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/Common/Memory/PageAllocator.cpp b/lib/Common/Memory/PageAllocator.cpp
@@ -2519,7 +2519,8 @@ PageAllocatorBase<TVirtualAlloc, TSegment, TPageSegment>::Check()
 #if ENABLE_BACKGROUND_PAGE_ZEROING
     if (CONFIG_FLAG(EnableBGFreeZero))
     {
-        Assert(!this->HasZeroQueuedPages());
+        // We may have backed-off from the idle decommit on the background thread.
+        Assert(!this->HasZeroQueuedPages() || this->waitingToEnterIdleDecommit);
     }
 #endif
     size_t currentFreePageCount = 0;