Diff
Modified: trunk/LayoutTests/ChangeLog (155308 => 155309)
--- trunk/LayoutTests/ChangeLog 2013-09-08 18:24:32 UTC (rev 155308)
+++ trunk/LayoutTests/ChangeLog 2013-09-08 18:43:46 UTC (rev 155309)
@@ -1,3 +1,29 @@
+2013-09-08 Filip Pizlo <[email protected]>
+
+ fast/js/dfg-* tests should wait for the concurrent JIT
+ https://bugs.webkit.org/show_bug.cgi?id=120723
+
+ Rubber stamped by Oliver Hunt.
+
+ Convert more tests.
+
+ * fast/js/dfg-cross-global-object-inline-new-array-expected.txt:
+ * fast/js/dfg-cross-global-object-inline-new-array-with-elements-expected.txt:
+ * fast/js/dfg-cross-global-object-inline-new-array-with-size-expected.txt:
+ * fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal-with-variables.js:
+ (doit):
+ * fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal.js:
+ (doit):
+ * fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-elements.js:
+ (done):
+ (doit):
+ * fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-size.js:
+ (done):
+ (doit):
+ * fast/js/script-tests/dfg-cross-global-object-inline-new-array.js:
+ (done):
+ (doit):
+
2013-09-08 Commit Queue <[email protected]>
Unreviewed, rolling out r155069 and r155138.
Modified: trunk/LayoutTests/fast/js/dfg-cross-global-object-inline-new-array-expected.txt (155308 => 155309)
--- trunk/LayoutTests/fast/js/dfg-cross-global-object-inline-new-array-expected.txt 2013-09-08 18:24:32 UTC (rev 155308)
+++ trunk/LayoutTests/fast/js/dfg-cross-global-object-inline-new-array-expected.txt 2013-09-08 18:43:46 UTC (rev 155309)
@@ -3,7 +3,7 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS done() called with 4800
+PASS done() called with 24
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/js/dfg-cross-global-object-inline-new-array-with-elements-expected.txt (155308 => 155309)
--- trunk/LayoutTests/fast/js/dfg-cross-global-object-inline-new-array-with-elements-expected.txt 2013-09-08 18:24:32 UTC (rev 155308)
+++ trunk/LayoutTests/fast/js/dfg-cross-global-object-inline-new-array-with-elements-expected.txt 2013-09-08 18:43:46 UTC (rev 155309)
@@ -3,7 +3,7 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS done() called with 6600
+PASS done() called with 33
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/js/dfg-cross-global-object-inline-new-array-with-size-expected.txt (155308 => 155309)
--- trunk/LayoutTests/fast/js/dfg-cross-global-object-inline-new-array-with-size-expected.txt 2013-09-08 18:24:32 UTC (rev 155308)
+++ trunk/LayoutTests/fast/js/dfg-cross-global-object-inline-new-array-with-size-expected.txt 2013-09-08 18:43:46 UTC (rev 155309)
@@ -3,7 +3,7 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS done() called with 204800
+PASS done() called with 1024
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal-with-variables.js (155308 => 155309)
--- trunk/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal-with-variables.js 2013-09-08 18:24:32 UTC (rev 155308)
+++ trunk/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal-with-variables.js 2013-09-08 18:43:46 UTC (rev 155309)
@@ -31,9 +31,9 @@
code += " return window.parent.foo(x);\n";
code += "}\n";
code += "window.parent.noInline(bar);\n";
- code += "var theArray;\n";
code += "while (!window.parent.dfgCompiled({f:bar}))\n";
- code += " theArray = bar(1);\n";
+ code += " bar(1);\n";
+ code += "var theArray = bar(1);\n";
code += "var result = theArray.thingy + theArray.length + theArray[0] + theArray[1] + theArray[2];\n";
code += "window.parent.done(result);\n";
code += "</script></body></html>";
Modified: trunk/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal.js (155308 => 155309)
--- trunk/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal.js 2013-09-08 18:24:32 UTC (rev 155308)
+++ trunk/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-literal.js 2013-09-08 18:43:46 UTC (rev 155309)
@@ -31,9 +31,9 @@
code += " return window.parent.foo();\n";
code += "}\n";
code += "window.parent.noInline(bar);\n";
- code += "var theArray;\n";
code += "while (!window.parent.dfgCompiled({f:bar}))\n";
- code += " theArray = bar();\n";
+ code += " bar();\n";
+ code += "var theArray = bar();\n";
code += "var result = theArray.thingy + theArray.length + theArray[0] + theArray[1] + theArray[2];\n";
code += "window.parent.done(result);\n";
code += "</script></body></html>";
Modified: trunk/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-elements.js (155308 => 155309)
--- trunk/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-elements.js 2013-09-08 18:24:32 UTC (rev 155308)
+++ trunk/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-elements.js 2013-09-08 18:43:46 UTC (rev 155309)
@@ -11,7 +11,7 @@
Array.prototype.thingy = 24;
function done(value) {
- var expected = (24 + 3 + 1 + 2 + 3) * 200;
+ var expected = (24 + 3 + 1 + 2 + 3);
if (value == expected)
testPassed("done() called with " + expected);
else
@@ -30,11 +30,12 @@
code += "function bar() {\n";
code += " return window.parent.foo();\n";
code += "}\n";
+ code += "window.parent.noInline(bar);\n"
+ code += "while (!window.parent.dfgCompiled({f:bar}))\n";
+ code += " bar();\n";
code += "var result = 0;\n";
- code += "for (var i = 0; i < 200; ++i) {\n";
- code += " var theArray = bar();\n";
- code += " result += theArray.thingy + theArray.length + theArray[0] + theArray[1] + theArray[2];\n";
- code += "}\n";
+ code += "var theArray = bar();\n";
+ code += "result += theArray.thingy + theArray.length + theArray[0] + theArray[1] + theArray[2];\n";
code += "window.parent.done(result);\n";
code += "</script></body></html>";
Modified: trunk/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-size.js (155308 => 155309)
--- trunk/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-size.js 2013-09-08 18:24:32 UTC (rev 155308)
+++ trunk/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array-with-size.js 2013-09-08 18:43:46 UTC (rev 155309)
@@ -11,7 +11,7 @@
Array.prototype.thingy = 24;
function done(value) {
- var expected = (24 + 1000) * 200;
+ var expected = 24 + 1000;
if (value == expected)
testPassed("done() called with " + expected);
else
@@ -30,11 +30,12 @@
code += "function bar() {\n";
code += " return window.parent.foo();\n";
code += "}\n";
+ code += "window.parent.noInline(bar);\n"
+ code += "while (!window.parent.dfgCompiled({f:bar}))\n";
+ code += " bar();\n";
code += "var result = 0;\n";
- code += "for (var i = 0; i < 200; ++i) {\n";
- code += " var theArray = bar();\n";
- code += " result += theArray.thingy + theArray.length;\n";
- code += "}\n";
+ code += "var theArray = bar();\n";
+ code += "result += theArray.thingy + theArray.length;\n";
code += "window.parent.done(result);\n";
code += "</script></body></html>";
Modified: trunk/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array.js (155308 => 155309)
--- trunk/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array.js 2013-09-08 18:24:32 UTC (rev 155308)
+++ trunk/LayoutTests/fast/js/script-tests/dfg-cross-global-object-inline-new-array.js 2013-09-08 18:43:46 UTC (rev 155309)
@@ -11,7 +11,7 @@
Array.prototype.thingy = 24;
function done(value) {
- var expected = 24 * 200;
+ var expected = 24;
if (value == expected)
testPassed("done() called with " + expected);
else
@@ -30,9 +30,10 @@
code += "function bar() {\n";
code += " return window.parent.foo();\n";
code += "}\n";
- code += "var result = 0;\n";
- code += "for (var i = 0; i < 200; ++i)\n";
- code += " result += bar().thingy;\n";
+ code += "window.parent.noInline(bar);\n"
+ code += "while (!window.parent.dfgCompiled({f:bar}))\n"
+ code += " bar();\n";
+ code += "var result = bar().thingy;\n";
code += "window.parent.done(result);\n";
code += "</script></body></html>";
