Bug 1129977 - Fix bogus MarkOffThreadNurseryObjects assert when post-…

…barrier verifier is used.
rmottola · May 4, 2019 · 4d204fb · 4d204fb
1 parent d5e4d1a
commit 4d204fb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/js/src/jit-test/tests/ion/bug1129977.js b/js/src/jit-test/tests/ion/bug1129977.js
@@ -0,0 +1,10 @@
+gczeal(11);
+function C(a, b) {
+    this.b=b;
+}
+evaluate('\
+Object.defineProperty(Object.prototype, "b", {set: function() {}});\
+var f = C.bind(0x2004, 2);\
+');
+for (var i=1; i<5000; ++i)
+    new f;
diff --git a/js/src/jit/Ion.cpp b/js/src/jit/Ion.cpp
@@ -1737,8 +1737,12 @@ MarkOffThreadNurseryObjects::mark(JSTracer* trc)
 {
     JSRuntime* rt = trc->runtime();
 
-    MOZ_ASSERT(rt->jitRuntime()->hasIonNurseryObjects());
-    rt->jitRuntime()->setHasIonNurseryObjects(false);
+    if (trc->runtime()->isHeapMinorCollecting()) {
+        // Only reset hasIonNurseryObjects if we're doing an actual minor GC,
+        // not if we're, for instance, verifying post barriers.
+        MOZ_ASSERT(rt->jitRuntime()->hasIonNurseryObjects());
+        rt->jitRuntime()->setHasIonNurseryObjects(false);
+    }
 
     AutoLockHelperThreadState lock;
     if (!HelperThreadState().threads)