<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[205944] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/205944">205944</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-14 18:14:45 -0700 (Wed, 14 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERT_NOT_REACHED when using spread inside an array literal with Function.prototype.apply
https://bugs.webkit.org/show_bug.cgi?id=162003
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-09-14
Reviewed by Saam Barati.
JSTests:
* stress/spread-calling.js:
* test262.yaml:
Source/JavaScriptCore:
* bytecompiler/NodesCodegen.cpp:
(JSC::ArrayNode::isSimpleArray):
Don't treat an Array that has a spread expression inside it as simple.
This avoids a fast path for f.apply(x, simpleArray) that was not handling
spread expressions within arrays, and instead taking a path that can
handle the spreading.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestsstressspreadcallingjs">trunk/JSTests/stress/spread-calling.js</a></li>
<li><a href="#trunkJSTeststest262yaml">trunk/JSTests/test262.yaml</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (205943 => 205944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-09-15 01:08:20 UTC (rev 205943)
+++ trunk/JSTests/ChangeLog 2016-09-15 01:14:45 UTC (rev 205944)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-09-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ ASSERT_NOT_REACHED when using spread inside an array literal with Function.prototype.apply
+ https://bugs.webkit.org/show_bug.cgi?id=162003
+
+ Reviewed by Saam Barati.
+
+ * stress/spread-calling.js:
+ * test262.yaml:
+
</ins><span class="cx"> 2016-09-14 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> YARR doesn't check for invalid flags for literal regular expressions
</span></span></pre></div>
<a id="trunkJSTestsstressspreadcallingjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/stress/spread-calling.js (205943 => 205944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/spread-calling.js 2016-09-15 01:08:20 UTC (rev 205943)
+++ trunk/JSTests/stress/spread-calling.js 2016-09-15 01:14:45 UTC (rev 205944)
</span><span class="lines">@@ -68,6 +68,8 @@
</span><span class="cx"> testFunction(0, ..."12345", ...object3);
</span><span class="cx"> testEmpty(...[]);
</span><span class="cx"> testFunction(...object4, ...object4);
</span><ins>+ testFunction.call(null, 0, ...[1, 2, 3], 4, 5, 6, 7, 8, 9);
+ testFunction.apply(null, [0, ...[1, 2, 3], 4, 5, 6, 7, 8, 9])
</ins><span class="cx"> let failed = false;
</span><span class="cx"> try {
</span><span class="cx"> testFunction(...objectThrow);
</span></span></pre></div>
<a id="trunkJSTeststest262yaml"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/test262.yaml (205943 => 205944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/test262.yaml 2016-09-15 01:08:20 UTC (rev 205943)
+++ trunk/JSTests/test262.yaml 2016-09-15 01:14:45 UTC (rev 205944)
</span><span class="lines">@@ -53236,21 +53236,21 @@
</span><span class="cx"> - path: test262/test/language/expressions/array/spread-err-sngl-err-unresolvable.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</span><span class="cx"> - path: test262/test/language/expressions/array/spread-mult-empty.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</ins><span class="cx"> - path: test262/test/language/expressions/array/spread-mult-empty.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</ins><span class="cx"> - path: test262/test/language/expressions/array/spread-mult-expr.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</ins><span class="cx"> - path: test262/test/language/expressions/array/spread-mult-expr.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</ins><span class="cx"> - path: test262/test/language/expressions/array/spread-mult-iter.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</ins><span class="cx"> - path: test262/test/language/expressions/array/spread-mult-iter.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</ins><span class="cx"> - path: test262/test/language/expressions/array/spread-mult-literal.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</ins><span class="cx"> - path: test262/test/language/expressions/array/spread-mult-literal.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</ins><span class="cx"> - path: test262/test/language/expressions/array/spread-sngl-empty.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</span><span class="cx"> - path: test262/test/language/expressions/array/spread-sngl-empty.js
</span><span class="lines">@@ -53260,9 +53260,9 @@
</span><span class="cx"> - path: test262/test/language/expressions/array/spread-sngl-expr.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</span><span class="cx"> - path: test262/test/language/expressions/array/spread-sngl-iter.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</ins><span class="cx"> - path: test262/test/language/expressions/array/spread-sngl-iter.js
</span><del>- cmd: runTest262 :fail, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</del><ins>+ cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</ins><span class="cx"> - path: test262/test/language/expressions/array/spread-sngl-literal.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</span><span class="cx"> - path: test262/test/language/expressions/array/spread-sngl-literal.js
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (205943 => 205944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-09-15 01:08:20 UTC (rev 205943)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-09-15 01:14:45 UTC (rev 205944)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-09-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ ASSERT_NOT_REACHED when using spread inside an array literal with Function.prototype.apply
+ https://bugs.webkit.org/show_bug.cgi?id=162003
+
+ Reviewed by Saam Barati.
+
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::ArrayNode::isSimpleArray):
+ Don't treat an Array that has a spread expression inside it as simple.
+ This avoids a fast path for f.apply(x, simpleArray) that was not handling
+ spread expressions within arrays, and instead taking a path that can
+ handle the spreading.
+
</ins><span class="cx"> 2016-09-14 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r205933 and r205936.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (205943 => 205944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2016-09-15 01:08:20 UTC (rev 205943)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2016-09-15 01:14:45 UTC (rev 205944)
</span><span class="lines">@@ -413,6 +413,8 @@
</span><span class="cx"> for (ElementNode* ptr = m_element; ptr; ptr = ptr->next()) {
</span><span class="cx"> if (ptr->elision())
</span><span class="cx"> return false;
</span><ins>+ if (ptr->value()->isSpreadExpression())
+ return false;
</ins><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>