<!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>[187667] branches/safari-601.1-branch/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/187667">187667</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-07-31 11:41:04 -0700 (Fri, 31 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/187579">r187579</a>. rdar://problem/21668986</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceJavaScriptCoreChangeLog">branches/safari-601.1-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceJavaScriptCoredfgDFGArgumentsEliminationPhasecpp">branches/safari-601.1-branch/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceJavaScriptCoretestsstressvarargsinliningunderflowjs">branches/safari-601.1-branch/Source/JavaScriptCore/tests/stress/varargs-inlining-underflow.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/JavaScriptCore/ChangeLog (187666 => 187667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/JavaScriptCore/ChangeLog 2015-07-31 18:38:11 UTC (rev 187666)
+++ branches/safari-601.1-branch/Source/JavaScriptCore/ChangeLog 2015-07-31 18:41:04 UTC (rev 187667)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-07-31 Lucas Forschler <lforschler@apple.com>
+
+ Merge r187579
+
+ 2015-07-29 Filip Pizlo <fpizlo@apple.com>
+
+ DFG::ArgumentsEliminationPhase should emit a PutStack for all of the GetStacks that the ByteCodeParser emitted
+ https://bugs.webkit.org/show_bug.cgi?id=147433
+ rdar://problem/21668986
+
+ Reviewed by Mark Lam.
+
+ Ideally, the ByteCodeParser would only emit SetArgument nodes for named arguments. But
+ currently that's not what it does - it emits a SetArgument for every argument that a varargs
+ call may pass. Each SetArgument gets turned into a GetStack. This means that if
+ ArgumentsEliminationPhase optimizes away PutStacks for those varargs arguments that didn't
+ get passed or used, we get degenerate IR where we have a GetStack of something that didn't
+ have a PutStack.
+
+ This fixes the bug by removing the code to optimize away PutStacks in
+ ArgumentsEliminationPhase.
+
+ * dfg/DFGArgumentsEliminationPhase.cpp:
+ * tests/stress/varargs-inlining-underflow.js: Added.
+ (baz):
+ (bar):
+ (foo):
+
</ins><span class="cx"> 2015-07-24 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r187139. rdar://problem/21847618
</span></span></pre></div>
<a id="branchessafari6011branchSourceJavaScriptCoredfgDFGArgumentsEliminationPhasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp (187666 => 187667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp 2015-07-31 18:38:11 UTC (rev 187666)
+++ branches/safari-601.1-branch/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp 2015-07-31 18:41:04 UTC (rev 187667)
</span><span class="lines">@@ -517,11 +517,12 @@
</span><span class="cx"> value = insertionSet.insertNode(
</span><span class="cx"> nodeIndex, SpecNone, GetStack, node->origin, OpInfo(data));
</span><span class="cx"> } else {
</span><del>- // Check if this an element that we must initialize.
- if (storeIndex >= varargsData->mandatoryMinimum) {
- // It's not. We're done.
- break;
- }
</del><ins>+ // FIXME: We shouldn't have to store anything if
+ // storeIndex >= varargsData->mandatoryMinimum, but we will still
+ // have GetStacks in that range. So if we don't do the stores, we'll
+ // have degenerate IR: we'll have GetStacks of something that didn't
+ // have PutStacks.
+ // https://bugs.webkit.org/show_bug.cgi?id=147434
</ins><span class="cx">
</span><span class="cx"> if (!undefined) {
</span><span class="cx"> undefined = insertionSet.insertConstant(
</span></span></pre></div>
<a id="branchessafari6011branchSourceJavaScriptCoretestsstressvarargsinliningunderflowjsfromrev187579trunkSourceJavaScriptCoretestsstressvarargsinliningunderflowjs"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1-branch/Source/JavaScriptCore/tests/stress/varargs-inlining-underflow.js (from rev 187579, trunk/Source/JavaScriptCore/tests/stress/varargs-inlining-underflow.js) (0 => 187667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/JavaScriptCore/tests/stress/varargs-inlining-underflow.js (rev 0)
+++ branches/safari-601.1-branch/Source/JavaScriptCore/tests/stress/varargs-inlining-underflow.js 2015-07-31 18:41:04 UTC (rev 187667)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+function baz() {
+}
+
+function bar() {
+ baz.apply(this, arguments);
+}
+
+for (var i = 0; i < 1000; ++i)
+ bar(1, 2, 3, 4, 5, 6, 7);
+
+function foo() {
+ bar();
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i)
+ foo();
</ins></span></pre>
</div>
</div>
</body>
</html>