<!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>[193782] trunk/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/193782">193782</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-12-08 13:45:54 -0800 (Tue, 08 Dec 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>DFG::UnificationPhase should merge isProfitableToUnbox, since this may have been set in ByteCodeParser
https://bugs.webkit.org/show_bug.cgi?id=152011
rdar://problem/23777875

Reviewed by Michael Saboff.

Previously UnificationPhase did not merge this because we used to only set this in FixupPhase, which runs after unification. But now
ByteCodeParser may set isProfitableToUnbox as part of how it handles the ArgumentCount of an inlined varargs call, so UnificationPhase
needs to merge it after unifying.

Also changed the order of unification since this makes the bug more obvious and easier to test.

* dfg/DFGUnificationPhase.cpp:
(JSC::DFG::UnificationPhase::run):
* tests/stress/varargs-with-unused-count.js: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGUnificationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGUnificationPhase.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressvarargswithunusedcountjs">trunk/Source/JavaScriptCore/tests/stress/varargs-with-unused-count.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (193781 => 193782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-12-08 21:44:12 UTC (rev 193781)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-12-08 21:45:54 UTC (rev 193782)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-08  Filip Pizlo  &lt;fpizlo@apple.com&gt;
+
+        DFG::UnificationPhase should merge isProfitableToUnbox, since this may have been set in ByteCodeParser
+        https://bugs.webkit.org/show_bug.cgi?id=152011
+        rdar://problem/23777875
+
+        Reviewed by Michael Saboff.
+
+        Previously UnificationPhase did not merge this because we used to only set this in FixupPhase, which runs after unification. But now
+        ByteCodeParser may set isProfitableToUnbox as part of how it handles the ArgumentCount of an inlined varargs call, so UnificationPhase
+        needs to merge it after unifying.
+
+        Also changed the order of unification since this makes the bug more obvious and easier to test.
+
+        * dfg/DFGUnificationPhase.cpp:
+        (JSC::DFG::UnificationPhase::run):
+        * tests/stress/varargs-with-unused-count.js: Added.
+
</ins><span class="cx"> 2015-12-08  Mark Lam  &lt;mark.lam@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Polymorphic operand types for DFG and FTL div.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGUnificationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGUnificationPhase.cpp (193781 => 193782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGUnificationPhase.cpp        2015-12-08 21:44:12 UTC (rev 193781)
+++ trunk/Source/JavaScriptCore/dfg/DFGUnificationPhase.cpp        2015-12-08 21:45:54 UTC (rev 193782)
</span><span class="lines">@@ -60,8 +60,7 @@
</span><span class="cx">                     if (!phi-&gt;children.child(childIdx))
</span><span class="cx">                         break;
</span><span class="cx">                     
</span><del>-                    phi-&gt;variableAccessData()-&gt;unify(
-                        phi-&gt;children.child(childIdx)-&gt;variableAccessData());
</del><ins>+                    phi-&gt;children.child(childIdx)-&gt;variableAccessData()-&gt;unify(phi-&gt;variableAccessData());
</ins><span class="cx">                 }
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="lines">@@ -74,6 +73,7 @@
</span><span class="cx">             data-&gt;find()-&gt;mergeCheckArrayHoistingFailed(data-&gt;checkArrayHoistingFailed());
</span><span class="cx">             data-&gt;find()-&gt;mergeShouldNeverUnbox(data-&gt;shouldNeverUnbox());
</span><span class="cx">             data-&gt;find()-&gt;mergeIsLoadedFrom(data-&gt;isLoadedFrom());
</span><ins>+            data-&gt;find()-&gt;mergeIsProfitableToUnbox(data-&gt;isProfitableToUnbox());
</ins><span class="cx">         }
</span><span class="cx">         
</span><span class="cx">         m_graph.m_unificationState = GloballyUnified;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressvarargswithunusedcountjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/varargs-with-unused-count.js (0 => 193782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/varargs-with-unused-count.js                                (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/varargs-with-unused-count.js        2015-12-08 21:45:54 UTC (rev 193782)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+function foo(p, q, r) {
+    while (r) {
+        if (p)
+            return 1;
+        else if (p)
+            return 2;
+        else
+            throw &quot;error&quot;;
+    }
+}
+
+function bar() {
+    foo.apply(this, arguments);
+}
+
+function baz(a, b, c, d) {
+    bar(a, b, c, d);
+}
+
+noInline(baz);
+
+for (var i = 0; i &lt; 10000; ++i)
+    baz(1, 2, 3, 4);
</ins></span></pre>
</div>
</div>

</body>
</html>