<!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>[162905] branches/jsCStack/Source/JavaScriptCore</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/162905">162905</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-01-27 19:36:41 -0800 (Mon, 27 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>DFG ArrayPush implementation does strange things to the result register on the slow path
https://bugs.webkit.org/show_bug.cgi?id=127754
Reviewed by Michael Saboff.
This told the slow path machinery that there was NoResult, which then sort of worked
by accident because it would invoke a callOperation and pass the result register
(i.e. storageLengthGPR) thinking it was giving it the first argument when in reality
that callOperation would use it as the result register. The downside is that we would
probably fail to omit the result register from silent spilling, but that probably
doesn't even matter since storageLengthGPR doesn't appear as an in-use register (it's
locked, but not attached to a Node, and so it's not "in use").
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* tests/stress/array-push.js: Added.
(foo):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoretestsstressarraypushjs">branches/jsCStack/Source/JavaScriptCore/tests/stress/array-push.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (162904 => 162905)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-28 02:56:45 UTC (rev 162904)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-28 03:36:41 UTC (rev 162905)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-01-27 Filip Pizlo <fpizlo@apple.com>
+
+ DFG ArrayPush implementation does strange things to the result register on the slow path
+ https://bugs.webkit.org/show_bug.cgi?id=127754
+
+ Reviewed by Michael Saboff.
+
+ This told the slow path machinery that there was NoResult, which then sort of worked
+ by accident because it would invoke a callOperation and pass the result register
+ (i.e. storageLengthGPR) thinking it was giving it the first argument when in reality
+ that callOperation would use it as the result register. The downside is that we would
+ probably fail to omit the result register from silent spilling, but that probably
+ doesn't even matter since storageLengthGPR doesn't appear as an in-use register (it's
+ locked, but not attached to a Node, and so it's not "in use").
+
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * tests/stress/array-push.js: Added.
+ (foo):
+
</ins><span class="cx"> 2014-01-27 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> Getting all layout tests passing on the branch.
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (162904 => 162905)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-01-28 02:56:45 UTC (rev 162904)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-01-28 03:36:41 UTC (rev 162905)
</span><span class="lines">@@ -3188,7 +3188,7 @@
</span><span class="cx">
</span><span class="cx"> addSlowPathGenerator(
</span><span class="cx"> slowPathCall(
</span><del>- slowPath, this, operationArrayPush, NoResult, storageLengthGPR,
</del><ins>+ slowPath, this, operationArrayPush, storageLengthGPR,
</ins><span class="cx"> valueGPR, baseGPR));
</span><span class="cx">
</span><span class="cx"> jsValueResult(storageLengthGPR, node);
</span><span class="lines">@@ -3212,7 +3212,7 @@
</span><span class="cx">
</span><span class="cx"> addSlowPathGenerator(
</span><span class="cx"> slowPathCall(
</span><del>- slowPath, this, operationArrayPushDouble, NoResult, storageLengthGPR,
</del><ins>+ slowPath, this, operationArrayPushDouble, storageLengthGPR,
</ins><span class="cx"> valueFPR, baseGPR));
</span><span class="cx">
</span><span class="cx"> jsValueResult(storageLengthGPR, node);
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoretestsstressarraypushjs"></a>
<div class="addfile"><h4>Added: branches/jsCStack/Source/JavaScriptCore/tests/stress/array-push.js (0 => 162905)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/tests/stress/array-push.js (rev 0)
+++ branches/jsCStack/Source/JavaScriptCore/tests/stress/array-push.js 2014-01-28 03:36:41 UTC (rev 162905)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+function foo() {
+ var array = [];
+ var result = [];
+ for (var i = 0; i < 42; ++i)
+ result.push(array.push(7 - i));
+ return [array, result];
+}
+
+noInline(foo);
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo();
+ if (result[0].toString() != "7,6,5,4,3,2,1,0,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-18,-19,-20,-21,-22,-23,-24,-25,-26,-27,-28,-29,-30,-31,-32,-33,-34")
+ throw "Error: bad array: " + result[0];
+ if (result[1].toString() != "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42")
+ throw "Error: bad array: " + result[1];
+}
+
</ins></span></pre>
</div>
</div>
</body>
</html>