<!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>[171728] branches/safari-600.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/171728">171728</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-07-29 01:27:07 -0700 (Tue, 29 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171689">r171689</a>.  &lt;rdar://problem/17509889&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceJavaScriptCoreChangeLog">branches/safari-600.1-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceJavaScriptCoredfgDFGFixupPhasecpp">branches/safari-600.1-branch/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceJavaScriptCoretestsstressbranchcheckint32onbooleantonumberuntypedjs">branches/safari-600.1-branch/Source/JavaScriptCore/tests/stress/branch-check-int32-on-boolean-to-number-untyped.js</a></li>
<li><a href="#branchessafari6001branchSourceJavaScriptCoretestsstressbranchchecknumberonbooleantonumberuntypedjs">branches/safari-600.1-branch/Source/JavaScriptCore/tests/stress/branch-check-number-on-boolean-to-number-untyped.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/JavaScriptCore/ChangeLog (171727 => 171728)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/JavaScriptCore/ChangeLog        2014-07-29 08:23:44 UTC (rev 171727)
+++ branches/safari-600.1-branch/Source/JavaScriptCore/ChangeLog        2014-07-29 08:27:07 UTC (rev 171728)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2014-07-29  Lucas Forschler  &lt;lforschler@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r171689
+
+    2014-07-28  Filip Pizlo  &lt;fpizlo@apple.com&gt;
+
+            Make sure that we don't use non-speculative BooleanToNumber for a speculative Branch
+            https://bugs.webkit.org/show_bug.cgi?id=135350
+            &lt;rdar://problem/17509889&gt;
+
+            Reviewed by Mark Hahnenberg and Oliver Hunt.
+
+            If we have an exiting node that uses a conversion node, then that exiting node
+            needs to have a Phantom after it for the the original node. But we can't do that
+            for Branch because https://bugs.webkit.org/show_bug.cgi?id=126778.
+
+            * dfg/DFGFixupPhase.cpp:
+            (JSC::DFG::FixupPhase::fixupNode):
+            (JSC::DFG::FixupPhase::clearPhantomsAtEnd):
+            * tests/stress/branch-check-int32-on-boolean-to-number-untyped.js: Added.
+            (foo):
+            (test):
+            * tests/stress/branch-check-number-on-boolean-to-number-untyped.js: Added.
+            (foo):
+            (test):
+
+2014-07-29  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
</ins><span class="cx">         Merge r171688
</span><span class="cx"> 
</span><span class="cx">     2014-07-28  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6001branchSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (171727 => 171728)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp        2014-07-29 08:23:44 UTC (rev 171727)
+++ branches/safari-600.1-branch/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp        2014-07-29 08:27:07 UTC (rev 171728)
</span><span class="lines">@@ -703,10 +703,14 @@
</span><span class="cx">                 fixEdge&lt;BooleanUse&gt;(node-&gt;child1());
</span><span class="cx">             else if (node-&gt;child1()-&gt;shouldSpeculateObjectOrOther())
</span><span class="cx">                 fixEdge&lt;ObjectOrOtherUse&gt;(node-&gt;child1());
</span><del>-            else if (node-&gt;child1()-&gt;shouldSpeculateInt32OrBoolean())
-                fixIntOrBooleanEdge(node-&gt;child1());
-            else if (node-&gt;child1()-&gt;shouldSpeculateNumberOrBoolean())
-                fixDoubleOrBooleanEdge(node-&gt;child1());
</del><ins>+            // FIXME: We should just be able to do shouldSpeculateInt32OrBoolean() and
+            // shouldSpeculateNumberOrBoolean() here, but we can't because then the Branch
+            // could speculate on the result of a non-speculative conversion node.
+            // https://bugs.webkit.org/show_bug.cgi?id=126778
+            else if (node-&gt;child1()-&gt;shouldSpeculateInt32())
+                fixEdge&lt;Int32Use&gt;(node-&gt;child1());
+            else if (node-&gt;child1()-&gt;shouldSpeculateNumber())
+                fixEdge&lt;DoubleRepUse&gt;(node-&gt;child1());
</ins><span class="cx"> 
</span><span class="cx">             Node* logicalNot = node-&gt;child1().node();
</span><span class="cx">             if (logicalNot-&gt;op() == LogicalNot) {
</span><span class="lines">@@ -2016,11 +2020,11 @@
</span><span class="cx">     {
</span><span class="cx">         // Terminal nodes don't need post-phantoms, and inserting them would violate
</span><span class="cx">         // the current requirement that a terminal is the last thing in a block. We
</span><del>-        // should eventually change that requirement but even if we did, this would
-        // still be a valid optimization. All terminals accept just one input, and
-        // if that input is a conversion node then no further speculations will be
-        // performed.
-        
</del><ins>+        // should eventually change that requirement. Currently we get around this by
+        // ensuring that all terminals accept just one input, and if that input is a
+        // conversion node then no further speculations will be performed. See
+        // references to the bug, below, for places where we have to have hacks to
+        // work around this.
</ins><span class="cx">         // FIXME: Get rid of this by allowing Phantoms after terminals.
</span><span class="cx">         // https://bugs.webkit.org/show_bug.cgi?id=126778
</span><span class="cx">         
</span></span></pre></div>
<a id="branchessafari6001branchSourceJavaScriptCoretestsstressbranchcheckint32onbooleantonumberuntypedjsfromrev171689trunkSourceJavaScriptCoretestsstressbranchcheckint32onbooleantonumberuntypedjs"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/Source/JavaScriptCore/tests/stress/branch-check-int32-on-boolean-to-number-untyped.js (from rev 171689, trunk/Source/JavaScriptCore/tests/stress/branch-check-int32-on-boolean-to-number-untyped.js) (0 => 171728)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/JavaScriptCore/tests/stress/branch-check-int32-on-boolean-to-number-untyped.js                                (rev 0)
+++ branches/safari-600.1-branch/Source/JavaScriptCore/tests/stress/branch-check-int32-on-boolean-to-number-untyped.js        2014-07-29 08:27:07 UTC (rev 171728)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+function foo(o) {
+    if (o.f)
+        return &quot;yes&quot;;
+    else
+        return &quot;no&quot;;
+}
+
+noInline(foo);
+
+function test(value, expected) {
+    var result = foo({f:value});
+    if (result != expected)
+        throw &quot;Error: bad result for &quot; + value + &quot;: &quot; + result;
+}
+
+for (var i = 0; i &lt; 10000; ++i) {
+    test(1, &quot;yes&quot;);
+    test(0, &quot;no&quot;);
+    test(true, &quot;yes&quot;);
+    test(false, &quot;no&quot;);
+}
+
+test(&quot;yes&quot;, &quot;yes&quot;);
</ins></span></pre></div>
<a id="branchessafari6001branchSourceJavaScriptCoretestsstressbranchchecknumberonbooleantonumberuntypedjsfromrev171689trunkSourceJavaScriptCoretestsstressbranchchecknumberonbooleantonumberuntypedjs"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/Source/JavaScriptCore/tests/stress/branch-check-number-on-boolean-to-number-untyped.js (from rev 171689, trunk/Source/JavaScriptCore/tests/stress/branch-check-number-on-boolean-to-number-untyped.js) (0 => 171728)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/JavaScriptCore/tests/stress/branch-check-number-on-boolean-to-number-untyped.js                                (rev 0)
+++ branches/safari-600.1-branch/Source/JavaScriptCore/tests/stress/branch-check-number-on-boolean-to-number-untyped.js        2014-07-29 08:27:07 UTC (rev 171728)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+function foo(o) {
+    if (o.f)
+        return &quot;yes&quot;;
+    else
+        return &quot;no&quot;;
+}
+
+noInline(foo);
+
+function test(value, expected) {
+    var result = foo({f:value});
+    if (result != expected)
+        throw &quot;Error: bad result for &quot; + value + &quot;: &quot; + result;
+}
+
+for (var i = 0; i &lt; 10000; ++i) {
+    test(1.5, &quot;yes&quot;);
+    test(0.0, &quot;no&quot;);
+    test(true, &quot;yes&quot;);
+    test(false, &quot;no&quot;);
+}
+
+test(&quot;yes&quot;, &quot;yes&quot;);
</ins></span></pre>
</div>
</div>

</body>
</html>