Bug 1084651 - Part 4b: Adjust and clarify some tests using gcslice(0). r=wmccloskey
☠☠ backed out by 3ad6929d9571 ☠ ☠
authorEmanuel Hoogeveen <emanuel.hoogeveen@gmail.com>
Tue, 04 Nov 2014 08:17:00 +0100
changeset 214096 59a163addd791fc094735c6c60016c7a78af578a
parent 214095 d36f6dbbf92524b670df77a75a3427441c097dbc
child 214097 2711fbd9181959f3a8a923111595b24c2b08979d
push id27771
push userryanvm@gmail.com
push dateWed, 05 Nov 2014 19:04:24 +0000
treeherdermozilla-central@305b4fecce99 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswmccloskey
bugs1084651
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1084651 - Part 4b: Adjust and clarify some tests using gcslice(0). r=wmccloskey
dom/workers/test/test_promise_resolved_with_string.html
js/src/jit-test/tests/auto-regress/bug755639.js
js/src/jit-test/tests/auto-regress/bug758164.js
js/src/jit-test/tests/auto-regress/bug813029.js
js/src/jit-test/tests/basic/bug754242.js
js/src/jit-test/tests/basic/bug767234.js
js/src/jit-test/tests/basic/bug782337.js
js/src/jit-test/tests/basic/bug808067.js
js/src/jit-test/tests/gc/bug-886551-1.js
js/src/jit-test/tests/gc/bug-886551-2.js
js/src/jit-test/tests/gc/incremental-01.js
js/src/jit-test/tests/gc/incremental-02.js
js/src/jit-test/tests/gc/multi-02.js
js/src/jit-test/tests/gc/multi-03.js
--- a/dom/workers/test/test_promise_resolved_with_string.html
+++ b/dom/workers/test/test_promise_resolved_with_string.html
@@ -10,22 +10,22 @@ https://bugzilla.mozilla.org/show_bug.cg
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript">
 
   /** Test for Bug 1027221 **/
     // Set up a permanent atom
     SimpleTest.waitForExplicitFinish();
     var x = "x";
     // Trigger some incremental gc
-    SpecialPowers.Cu.getJSTestingFunctions().gcslice(0);
+    SpecialPowers.Cu.getJSTestingFunctions().gcslice(1);
 
     // Kick off a worker that uses this same atom
     var w = new Worker("data:text/plain,Promise.resolve('x').then(function() { postMessage(1); });");
     // Maybe trigger some more incremental gc
-    SpecialPowers.Cu.getJSTestingFunctions().gcslice(0);
+    SpecialPowers.Cu.getJSTestingFunctions().gcslice(1);
 
     w.onmessage = function() {
       ok(true, "Got here");
       SimpleTest.finish();
     };
 
   </script>
 </head>
--- a/js/src/jit-test/tests/auto-regress/bug755639.js
+++ b/js/src/jit-test/tests/auto-regress/bug755639.js
@@ -23,12 +23,12 @@ function m(d)
         return "";
     f(m(d - 1));
 }
 m(1);
 gcPreserveCode();
 try {
   mjitChunkLimit(1);
 } catch(exc1) {}
-gcslice(0);
+gcslice(1);
 m(1);
 gc();
 m(2);
--- a/js/src/jit-test/tests/auto-regress/bug758164.js
+++ b/js/src/jit-test/tests/auto-regress/bug758164.js
@@ -1,6 +1,6 @@
 // Binary: cache/js-dbg-64-407632130d1b-linux
 // Flags:
 //
 
 gc();
-evaluate("gcslice(0);");
+evaluate("gcslice(1);");
--- a/js/src/jit-test/tests/auto-regress/bug813029.js
+++ b/js/src/jit-test/tests/auto-regress/bug813029.js
@@ -1,12 +1,12 @@
 // Binary: cache/js-dbg-64-4fddb9923ef0-linux
 // Flags: --ion-eager
 //
 
 function printBugNumber (num) {
   BUGNUMBER = num;
 }
-gcslice(0)
+gcslice(1)
 schedulegc(this);
-gcslice(1);
+gcslice(2);
 var BUGNUMBER = ("one");
 printBugNumber();
--- a/js/src/jit-test/tests/basic/bug754242.js
+++ b/js/src/jit-test/tests/basic/bug754242.js
@@ -1,7 +1,7 @@
 var g1 = newGlobal();
 schedulegc(g1);
-gcslice(0);
+gcslice(1);
 function testEq(b) {
     var a = deserialize(serialize(b));
 }
 testEq(Array(1024).join(Array(1024).join((false))));
--- a/js/src/jit-test/tests/basic/bug767234.js
+++ b/js/src/jit-test/tests/basic/bug767234.js
@@ -1,14 +1,14 @@
 function gen()
 {
     var local = new Date();
     yield 1;
     local = null;
     gc();
-    gcslice(0);
+    gcslice(0); // Start IGC, but don't mark anything.
     yield 2;
 }
 
 var g = gen();
 g.next();
 g.next();
 gcslice();
--- a/js/src/jit-test/tests/basic/bug782337.js
+++ b/js/src/jit-test/tests/basic/bug782337.js
@@ -7,10 +7,10 @@ function recur(n)
 	gc();
     } else {
 	recur(n-1);
     }
     var obj = new Object();
 }
 
 validategc(false);
-gcslice(0);
+gcslice(1);
 recur(10);
--- a/js/src/jit-test/tests/basic/bug808067.js
+++ b/js/src/jit-test/tests/basic/bug808067.js
@@ -6,14 +6,14 @@ function reportCompare (expected, actual
   testcase.reason = output;
 }
 gcPreserveCode();
 var summary = 'return with argument and lazy generator detection';
 expect = "generator function foo returns a value";
 actual = (function (j)  {}).message;
 reportCompare(expect, actual, summary + ": 1");
 reportCompare(expect, actual, summary + ": 2");
-gcslice(0);
 gcslice(1);
+gcslice(2);
 gc();
 var strings = [ (0), ];
 for (var i = 0; i < strings.length; i++)
   reportCompare(expect, actual, summary + (5e1) + strings[i]);
--- a/js/src/jit-test/tests/gc/bug-886551-1.js
+++ b/js/src/jit-test/tests/gc/bug-886551-1.js
@@ -1,8 +1,8 @@
 if (this.hasOwnProperty('Intl')) {
     gc();
-    gcslice(0);
+    gcslice(1);
     var thisValues = [ "x" ];
     thisValues.forEach(function (value) {
             var format = Intl.DateTimeFormat.call(value);
     });
 }
--- a/js/src/jit-test/tests/gc/bug-886551-2.js
+++ b/js/src/jit-test/tests/gc/bug-886551-2.js
@@ -1,7 +1,7 @@
 gc();
-gcslice(0);
+gcslice(1);
 function isClone(a, b) {
         var rmemory = new WeakMap();
             rmemory.set(a,b);
 }
 isClone([]);
--- a/js/src/jit-test/tests/gc/incremental-01.js
+++ b/js/src/jit-test/tests/gc/incremental-01.js
@@ -18,14 +18,14 @@ function init()
 
 /*
  * Use eval here so that the interpreter frames end up higher on the
  * stack, which avoids them being seen later on by the conservative
  * scanner.
  */
 eval("init()");
 
-gcslice(0);
+gcslice(0); // Start IGC, but don't mark anything.
 selectforgc(objs.root2);
 gcslice(1);
 objs.root2.ptr = objs.root1.ptr;
 objs.root1.ptr = null;
 gcslice();
--- a/js/src/jit-test/tests/gc/incremental-02.js
+++ b/js/src/jit-test/tests/gc/incremental-02.js
@@ -17,14 +17,14 @@ function init()
 
 /*
  * Use eval here so that the interpreter frames end up higher on the
  * stack, which avoids them being seen later on by the conservative
  * scanner.
  */
 eval("init()");
 
-gcslice(0);
+gcslice(0); // Start IGC, but don't mark anything.
 selectforgc(objs.root);
 gcslice(1);
 delete objs.root.b;
 delete objs.root.a;
 gcslice();
--- a/js/src/jit-test/tests/gc/multi-02.js
+++ b/js/src/jit-test/tests/gc/multi-02.js
@@ -1,10 +1,10 @@
 /* Exercise the path where we want to collect a new compartment in the middle of incremental GC. */
 
 var g1 = newGlobal();
 var g2 = newGlobal();
 
 schedulegc(g1);
-gcslice(0);
+gcslice(0); // Start IGC, but don't mark anything.
 schedulegc(g2);
 gcslice(1);
 gcslice();
--- a/js/src/jit-test/tests/gc/multi-03.js
+++ b/js/src/jit-test/tests/gc/multi-03.js
@@ -1,11 +1,11 @@
 /* Exercise the path where we want to collect a new compartment in the middle of incremental GC. */
 
 var g1 = newGlobal();
 var g2 = newGlobal();
 
 schedulegc(g1);
 schedulegc(g2);
-gcslice(0);
+gcslice(0); // Start IGC, but don't mark anything.
 schedulegc(g1);
 gcslice(1);
 gcslice();