1 files changed, 58 insertions, 0 deletions
diff --git a/js/src/jit-test/tests/gc/bug-1579025.js b/js/src/jit-test/tests/gc/bug-1579025.js
new file mode 100644
index 0000000000..c11e7fdf1e
--- /dev/null
+++ b/js/src/jit-test/tests/gc/bug-1579025.js
@@ -0,0 +1,58 @@
+// Test that a zone GC collects the selected zones.
+
+function waitForState(state) {
+  while (gcstate() !== state && gcstate() !== "NotActive") {
+    gcslice(100);
+  }
+}
+
+gczeal(0);
+gc();
+
+let z1 = this;
+let z2 = newGlobal({newCompartment: true});
+
+// Initially nothing is being collected.
+
+assertEq(gcstate(), "NotActive");
+assertEq(gcstate(z1), "NoGC");
+assertEq(gcstate(z2), "NoGC");
+
+// No zones selected => full GC.
+
+startgc(1);
+
+// It's non-deterministic whether we see the prepare state or not.
+waitForState("Mark");
+
+assertEq(gcstate(), "Mark");
+assertEq(gcstate(z1), "MarkBlackOnly");
+assertEq(gcstate(z2), "MarkBlackOnly");
+finishgc();
+
+// Use of schedulezone() => zone GC.
+
+schedulezone(z1);
+startgc(1);
+waitForState("Mark");
+assertEq(gcstate(), "Mark");
+assertEq(gcstate(z1), "MarkBlackOnly");
+assertEq(gcstate(z2), "NoGC");
+finishgc();
+
+schedulezone(z2);
+startgc(1);
+waitForState("Mark");
+assertEq(gcstate(), "Mark");
+assertEq(gcstate(z1), "NoGC");
+assertEq(gcstate(z2), "MarkBlackOnly");
+finishgc();
+
+schedulezone(z1);
+schedulezone(z2);
+startgc(1);
+waitForState("Mark");
+assertEq(gcstate(), "Mark");
+assertEq(gcstate(z1), "MarkBlackOnly");
+assertEq(gcstate(z2), "MarkBlackOnly");
+finishgc();