Bug 1084651 - Part 4a: Adjust some tests to preserve previous behavior. r=billm
authorEmanuel Hoogeveen <emanuel.hoogeveen@gmail.com>
Tue, 21 Oct 2014 11:50:00 +0200
changeset 226166 02ce0a109d59245342808fa7b0dc4d8b0aa4c043
parent 226165 738e596ac58d3fb7d2cd126c540aa0fc15a15dc5
child 226167 7eb792add2453ddbbf68cebeeccf68c16d2eab14
push id36
push userdburns@mozilla.com
push dateMon, 10 Nov 2014 15:14:02 +0000
reviewersbillm
bugs1084651
milestone36.0a1
Bug 1084651 - Part 4a: Adjust some tests to preserve previous behavior. r=billm
js/src/jit-test/tests/auto-regress/bug783421.js
js/src/jit-test/tests/auto-regress/bug812235.js
js/src/jit-test/tests/basic/bug817002.js
js/src/jit-test/tests/basic/evaluate-worker.js
js/src/jit-test/tests/gc/bug-889682-1.js
js/src/jit-test/tests/gc/bug-889682-2.js
js/src/jit-test/tests/gc/bug-889682-3.js
js/src/jit-test/tests/gc/bug-981295.js
js/src/tests/js1_8_5/extensions/typedarray.js
--- a/js/src/jit-test/tests/auto-regress/bug783421.js
+++ b/js/src/jit-test/tests/auto-regress/bug783421.js
@@ -15,16 +15,16 @@ function n() {
 }
 function h(code) {
 	f = Function(code)
 	p(f, code, true)
 }
 h("\
   p=m();\
   gcPreserveCode();\
-  gcslice(7);\
+  gcslice(8);\
 ")
 h("\"\"")
 h("")
 h("gc()")
 h("")
 h("")
 h("gczeal(4,2)")
--- a/js/src/jit-test/tests/auto-regress/bug812235.js
+++ b/js/src/jit-test/tests/auto-regress/bug812235.js
@@ -1,10 +1,10 @@
 // Binary: cache/js-dbg-64-a37525d304d9-linux
 // Flags: --ion-eager
 //
 gc()
 schedulegc(this)
-gcslice(2)
+gcslice(3)
 function f() {
     this["x"] = this["x"] = {}
 }
 new f()
--- a/js/src/jit-test/tests/basic/bug817002.js
+++ b/js/src/jit-test/tests/basic/bug817002.js
@@ -1,13 +1,13 @@
 gc()
 evalcx("\
     if (!(\"gcslice\" in this))\
       gcslice = function() { };\
     array = new Uint8Array;\
     t0 = array.subarray();\
-    gcslice(11); \
+    gcslice(12); \
     array.subarray();\
     gc();\
     gc();\
     array.subarray().a = 1;\
     gc();",
 newGlobal(''))
--- a/js/src/jit-test/tests/basic/evaluate-worker.js
+++ b/js/src/jit-test/tests/basic/evaluate-worker.js
@@ -1,14 +1,14 @@
 // |jit-test| slow
 
 if (typeof evalInWorker == "undefined")
     quit();
 
-gcslice(10);
+gcslice(11);
 evalInWorker("print('helo world');");
 for (i = 0; i < 100000; i++) {}
 
 evalInWorker("\
   for (var i = 0; i < 10; i++) { \
     var o = {}; \
     for (var j = 0; j < 100; j++) \
       o['a' + j] = j; \
--- a/js/src/jit-test/tests/gc/bug-889682-1.js
+++ b/js/src/jit-test/tests/gc/bug-889682-1.js
@@ -4,10 +4,10 @@ var recursiveFunctions = [{
     text: "(function(){if(a){}g()})"
 }];
 (function testAllRecursiveFunctions() {
     for (var i = 0; i < recursiveFunctions.length; ++i) {
         var a = recursiveFunctions[i];
         eval(a.text.replace(/@/g, ""))
     }
 })();
-gcslice(2868);
+gcslice(2869);
 Function("v={c:[{x:[[]],N:{x:[{}[d]]}}]}=minorgc(true)")()
--- a/js/src/jit-test/tests/gc/bug-889682-2.js
+++ b/js/src/jit-test/tests/gc/bug-889682-2.js
@@ -5,10 +5,10 @@ var recursiveFunctions = [{
     text: "(function(){if(a){}g()})"
 }];
 (function testAllRecursiveFunctions() {
     for (var i = 0; i < recursiveFunctions.length; ++i) {
         var a = recursiveFunctions[i];
         eval(a.text.replace(/@/g, ""))
     }
 })();
-gcslice(2868);
+gcslice(2869);
 Function("v={c:[{x:[[]],N:{x:[{}[d]]}}]}=minorgc(true)")()
--- a/js/src/jit-test/tests/gc/bug-889682-3.js
+++ b/js/src/jit-test/tests/gc/bug-889682-3.js
@@ -5,10 +5,10 @@ var recursiveFunctions = [{
     text: "(function(){if(a){}g()})"
 }];
 (function testAllRecursiveFunctions() {
     for (var i = 0; i < recursiveFunctions.length; ++i) {
         var a = recursiveFunctions[i];
         eval(a.text.replace(/@/g, ""))
     }
 })();
-gcslice(2868);
+gcslice(2869);
 Function("v={c:[{x:[[]],N:{x:[{}[d]]}}]}=minorgc(true)")()
--- a/js/src/jit-test/tests/gc/bug-981295.js
+++ b/js/src/jit-test/tests/gc/bug-981295.js
@@ -1,9 +1,9 @@
 var NotEarlyErrorString = "NotEarlyError";
 var NotEarlyError = new Error(NotEarlyErrorString);
 var juneDate = new Date(2000, 5, 20, 0, 0, 0, 0);
 for (var i = 0; i < function(x) myObj(Date.prototype.toString.apply(x)); void i) {
     eval(a.text.replace(/@/g, ""))
 }
-gcslice(2600);
+gcslice(2601);
 function testcase() {}
 new Uint16Array(testcase);
--- a/js/src/tests/js1_8_5/extensions/typedarray.js
+++ b/js/src/tests/js1_8_5/extensions/typedarray.js
@@ -198,17 +198,17 @@ function test()
         gcparam('markStackLimit', 200);
         var forceOverflow = [ buffer ];
         for (let i = 0; i < 1000; i++) {
             forceOverflow = [ forceOverflow ];
         }
         gc();
         buffer = null;
         views = null;
-        gcslice(2); gcslice(2); gcslice(2); gcslice(2); gcslice(2); gcslice(2); gc();
+        gcslice(3); gcslice(3); gcslice(3); gcslice(3); gcslice(3); gcslice(3); gc();
     }
 
     var buf, buf2;
 
     buf = new ArrayBuffer(100);
     check(function() buf);
     check(function() buf.byteLength == 100);