diff options
Diffstat (limited to 'js/src/gc/Nursery.cpp')
-rw-r--r-- | js/src/gc/Nursery.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/js/src/gc/Nursery.cpp b/js/src/gc/Nursery.cpp index 4753848c56..e3afd5d055 100644 --- a/js/src/gc/Nursery.cpp +++ b/js/src/gc/Nursery.cpp @@ -613,6 +613,9 @@ void js::Nursery::leaveZealMode() { MOZ_ASSERT(isEmpty()); + // Reset the nursery size. + setCapacity(minSpaceSize()); + toSpace.moveToStartOfChunk(this, 0); toSpace.setStartToCurrentPosition(); @@ -1810,7 +1813,7 @@ void Nursery::requestMinorGC(JS::GCReason reason) { } else if (heapState == JS::HeapState::MajorCollecting) { // The GC runs sweeping tasks that may access the storebuffer in parallel // and these require taking the store buffer lock. - MOZ_ASSERT(CurrentThreadIsGCSweeping()); + MOZ_ASSERT(!CurrentThreadIsGCMarking()); runtime()->gc.assertCurrentThreadHasLockedStoreBuffer(); } else { MOZ_CRASH("Unexpected heap state"); |