Title: [219803] releases/WebKitGTK/webkit-2.16
Revision
219803
Author
[email protected]
Date
2017-07-24 02:50:57 -0700 (Mon, 24 Jul 2017)

Log Message

Merge r217016 - JSC: Incorrect LoadVarargs handling in ArgumentsEliminationPhase::transform
https://bugs.webkit.org/show_bug.cgi?id=172208

Reviewed by Saam Barati.

JSTests:

* stress/arguments-elimination-varargs-too-many-args-arg-count.js: Added.
(foo):
(bar):
(baz):

Source/_javascript_Core:

* dfg/DFGArgumentsEliminationPhase.cpp:

Modified Paths

Added Paths

Diff

Modified: releases/WebKitGTK/webkit-2.16/JSTests/ChangeLog (219802 => 219803)


--- releases/WebKitGTK/webkit-2.16/JSTests/ChangeLog	2017-07-24 09:45:17 UTC (rev 219802)
+++ releases/WebKitGTK/webkit-2.16/JSTests/ChangeLog	2017-07-24 09:50:57 UTC (rev 219803)
@@ -1,3 +1,15 @@
+2017-05-17  Filip Pizlo  <[email protected]>
+
+        JSC: Incorrect LoadVarargs handling in ArgumentsEliminationPhase::transform
+        https://bugs.webkit.org/show_bug.cgi?id=172208
+
+        Reviewed by Saam Barati.
+
+        * stress/arguments-elimination-varargs-too-many-args-arg-count.js: Added.
+        (foo):
+        (bar):
+        (baz):
+
 2017-04-17  Mark Lam  <[email protected]>
 
         JSArray::appendMemcpy() needs to handle copying from Undecided indexing type too.

Added: releases/WebKitGTK/webkit-2.16/JSTests/stress/arguments-elimination-varargs-too-many-args-arg-count.js (0 => 219803)


--- releases/WebKitGTK/webkit-2.16/JSTests/stress/arguments-elimination-varargs-too-many-args-arg-count.js	                        (rev 0)
+++ releases/WebKitGTK/webkit-2.16/JSTests/stress/arguments-elimination-varargs-too-many-args-arg-count.js	2017-07-24 09:50:57 UTC (rev 219803)
@@ -0,0 +1,30 @@
+function foo()
+{
+    return arguments.length;
+}
+
+function bar(...args)
+{
+    var a = [42];
+    if (isFinalTier())
+        a = args;
+    return {ftl: isFinalTier(), result: foo(...a)};
+}
+
+function baz()
+{
+    return bar(1, 2, 3, 4);
+}
+
+noInline(baz);
+
+for (var i = 0; i < 100000; ++i) {
+    var result = baz();
+    if (result.ftl) {
+        if (result.result != 4)
+            throw "Error: bad result in loop in DFG: " + result;
+    } else {
+        if (result.result != 1)
+            throw "Error: bad result in loop before DFG: " + result;
+    }
+}

Modified: releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/ChangeLog (219802 => 219803)


--- releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/ChangeLog	2017-07-24 09:45:17 UTC (rev 219802)
+++ releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/ChangeLog	2017-07-24 09:50:57 UTC (rev 219803)
@@ -1,3 +1,12 @@
+2017-05-17  Filip Pizlo  <[email protected]>
+
+        JSC: Incorrect LoadVarargs handling in ArgumentsEliminationPhase::transform
+        https://bugs.webkit.org/show_bug.cgi?id=172208
+
+        Reviewed by Saam Barati.
+
+        * dfg/DFGArgumentsEliminationPhase.cpp:
+
 2017-04-17  Mark Lam  <[email protected]>
 
         JSArray::appendMemcpy() needs to handle copying from Undecided indexing type too.

Modified: releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/dfg/DFGArgumentsEliminationPhase.cpp (219802 => 219803)


--- releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/dfg/DFGArgumentsEliminationPhase.cpp	2017-07-24 09:45:17 UTC (rev 219802)
+++ releases/WebKitGTK/webkit-2.16/Source/_javascript_Core/dfg/DFGArgumentsEliminationPhase.cpp	2017-07-24 09:50:57 UTC (rev 219803)
@@ -845,11 +845,11 @@
                                     }
                                     storeValue(undefined, storeIndex);
                                 }
+                                
+                                node->remove();
+                                node->origin.exitOK = canExit;
+                                break;
                             }
-
-                            node->remove();
-                            node->origin.exitOK = canExit;
-                            break;
                         }
                     } else {
                         unsigned numberOfArgumentsToSkip = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to