[X2Go-Commits] [pale-moon] 144/294: Reset nursery position when it's disabled.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch upstream/28.5.0
in repository pale-moon.

commit c53602c802cfaeaede20cb0bb2180194389eeb05
Author: Jon Coppeard <jcoppeard at mozilla.com>
Date:   Fri Mar 22 13:17:31 2019 +0100

    Reset nursery position when it's disabled.
---
 js/src/gc/Nursery.cpp | 1 +
 js/src/gc/Nursery.h   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/js/src/gc/Nursery.cpp b/js/src/gc/Nursery.cpp
index ea4350f..93a0eb6 100644
--- a/js/src/gc/Nursery.cpp
+++ b/js/src/gc/Nursery.cpp
@@ -210,6 +210,7 @@ js::Nursery::disable()
         return;
     updateNumChunks(0);
     currentEnd_ = 0;
+    position_ = 0;
     runtime()->gc.storeBuffer.disable();
 }
 
diff --git a/js/src/gc/Nursery.h b/js/src/gc/Nursery.h
index 0d215d9..a839a49 100644
--- a/js/src/gc/Nursery.h
+++ b/js/src/gc/Nursery.h
@@ -245,6 +245,7 @@ class Nursery
 
     // Free space remaining, not counting chunk trailers.
     MOZ_ALWAYS_INLINE size_t freeSpace() const {
+        MOZ_ASSERT(isEnabled());
         MOZ_ASSERT(currentEnd_ - position_ <= NurseryChunkUsableSize);
         return (currentEnd_ - position_) +
                (numChunks() - currentChunk_ - 1) * NurseryChunkUsableSize;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git