<!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>[152798] tags/Safari-537.51.1</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/152798">152798</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2013-07-17 12:52:20 -0700 (Wed, 17 Jul 2013)</dd>
</dl>

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari537511LayoutTestsChangeLog">tags/Safari-537.51.1/LayoutTests/ChangeLog</a></li>
<li><a href="#tagsSafari537511LayoutTestsfastjsjsctestlist">tags/Safari-537.51.1/LayoutTests/fast/js/jsc-test-list</a></li>
<li><a href="#tagsSafari537511SourceJavaScriptCoreChangeLog">tags/Safari-537.51.1/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#tagsSafari537511SourceJavaScriptCoredfgDFGFixupPhasecpp">tags/Safari-537.51.1/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
<li><a href="#tagsSafari537511SourceJavaScriptCoredfgDFGNodeh">tags/Safari-537.51.1/Source/JavaScriptCore/dfg/DFGNode.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#tagsSafari537511LayoutTestsfastjsdfgmakeropeallemptystringsexpectedtxt">tags/Safari-537.51.1/LayoutTests/fast/js/dfg-make-rope-all-empty-strings-expected.txt</a></li>
<li><a href="#tagsSafari537511LayoutTestsfastjsdfgmakeropeallemptystringshtml">tags/Safari-537.51.1/LayoutTests/fast/js/dfg-make-rope-all-empty-strings.html</a></li>
<li><a href="#tagsSafari537511LayoutTestsfastjsscripttestsdfgmakeropeallemptystringsjs">tags/Safari-537.51.1/LayoutTests/fast/js/script-tests/dfg-make-rope-all-empty-strings.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari537511LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.51.1/LayoutTests/ChangeLog (152797 => 152798)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.51.1/LayoutTests/ChangeLog        2013-07-17 19:49:44 UTC (rev 152797)
+++ tags/Safari-537.51.1/LayoutTests/ChangeLog        2013-07-17 19:52:20 UTC (rev 152798)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2013-07-17  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
+        Merge r152742
+
+    2013-07-16  Filip Pizlo  &lt;fpizlo@apple.com&gt;
+
+            MakeRope fixup shouldn't lead to an Identity without kids
+            https://bugs.webkit.org/show_bug.cgi?id=118745
+
+            Reviewed by Mark Hahnenberg.
+
+            * fast/js/dfg-make-rope-all-empty-strings.html: Added.
+            * fast/js/dfg-make-rope-all-empty-strings-expected.txt: Added.
+            * fast/js/jsc-test-list:
+            * fast/js/script-tests/dfg-make-rope-all-empty-strings.js: Added.
+            (foo):
+            (bar):
+
</ins><span class="cx"> 2013-07-16  Lucas Forschler  &lt;lforschler@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Rollout r152703
</span></span></pre></div>
<a id="tagsSafari537511LayoutTestsfastjsdfgmakeropeallemptystringsexpectedtxtfromrev152742trunkLayoutTestsfastjsdfgmakeropeallemptystringsexpectedtxt"></a>
<div class="copfile"><h4>Copied: tags/Safari-537.51.1/LayoutTests/fast/js/dfg-make-rope-all-empty-strings-expected.txt (from rev 152742, trunk/LayoutTests/fast/js/dfg-make-rope-all-empty-strings-expected.txt) (0 => 152798)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.51.1/LayoutTests/fast/js/dfg-make-rope-all-empty-strings-expected.txt                                (rev 0)
+++ tags/Safari-537.51.1/LayoutTests/fast/js/dfg-make-rope-all-empty-strings-expected.txt        2013-07-17 19:52:20 UTC (rev 152798)
</span><span class="lines">@@ -0,0 +1,109 @@
</span><ins>+Check that the DFG can handle MakeRope or ValueAdd on all empty strings.
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS bar() is &quot;&quot;
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="tagsSafari537511LayoutTestsfastjsdfgmakeropeallemptystringshtmlfromrev152742trunkLayoutTestsfastjsdfgmakeropeallemptystringshtml"></a>
<div class="copfile"><h4>Copied: tags/Safari-537.51.1/LayoutTests/fast/js/dfg-make-rope-all-empty-strings.html (from rev 152742, trunk/LayoutTests/fast/js/dfg-make-rope-all-empty-strings.html) (0 => 152798)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.51.1/LayoutTests/fast/js/dfg-make-rope-all-empty-strings.html                                (rev 0)
+++ tags/Safari-537.51.1/LayoutTests/fast/js/dfg-make-rope-all-empty-strings.html        2013-07-17 19:52:20 UTC (rev 152798)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+&lt;!DOCTYPE HTML PUBLIC &quot;-//IETF//DTD HTML//EN&quot;&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;script src=&quot;resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;script src=&quot;script-tests/dfg-make-rope-all-empty-strings.js&quot;&gt;&lt;/script&gt;
+&lt;script src=&quot;resources/js-test-post.js&quot;&gt;&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="tagsSafari537511LayoutTestsfastjsjsctestlist"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.51.1/LayoutTests/fast/js/jsc-test-list (152797 => 152798)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.51.1/LayoutTests/fast/js/jsc-test-list        2013-07-17 19:49:44 UTC (rev 152797)
+++ tags/Safari-537.51.1/LayoutTests/fast/js/jsc-test-list        2013-07-17 19:52:20 UTC (rev 152798)
</span><span class="lines">@@ -181,6 +181,7 @@
</span><span class="cx"> fast/js/dfg-intrinsic-side-effect-assignment-osr-exit
</span><span class="cx"> fast/js/dfg-intrinsic-unused-this
</span><span class="cx"> fast/js/dfg-intrinsic-unused-this-method-check
</span><ins>+fast/js/dfg-make-rope-all-empty-strings
</ins><span class="cx"> fast/js/dfg-max-backwards-propagation
</span><span class="cx"> fast/js/dfg-min-backwards-propagation
</span><span class="cx"> fast/js/dfg-min-max
</span></span></pre></div>
<a id="tagsSafari537511LayoutTestsfastjsscripttestsdfgmakeropeallemptystringsjsfromrev152742trunkLayoutTestsfastjsscripttestsdfgmakeropeallemptystringsjs"></a>
<div class="copfile"><h4>Copied: tags/Safari-537.51.1/LayoutTests/fast/js/script-tests/dfg-make-rope-all-empty-strings.js (from rev 152742, trunk/LayoutTests/fast/js/script-tests/dfg-make-rope-all-empty-strings.js) (0 => 152798)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.51.1/LayoutTests/fast/js/script-tests/dfg-make-rope-all-empty-strings.js                                (rev 0)
+++ tags/Safari-537.51.1/LayoutTests/fast/js/script-tests/dfg-make-rope-all-empty-strings.js        2013-07-17 19:52:20 UTC (rev 152798)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+description(
+&quot;Check that the DFG can handle MakeRope or ValueAdd on all empty strings.&quot;
+);
+
+function foo(a, b) {
+    return a + b;
+}
+
+function bar() {
+    return foo(&quot;&quot;, &quot;&quot;);
+}
+
+for (var i = 0; i &lt; 100; ++i)
+    shouldBe(&quot;bar()&quot;, &quot;\&quot;\&quot;&quot;);
+
</ins></span></pre></div>
<a id="tagsSafari537511SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.51.1/Source/JavaScriptCore/ChangeLog (152797 => 152798)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.51.1/Source/JavaScriptCore/ChangeLog        2013-07-17 19:49:44 UTC (rev 152797)
+++ tags/Safari-537.51.1/Source/JavaScriptCore/ChangeLog        2013-07-17 19:52:20 UTC (rev 152798)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2013-07-17  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
+        Merge r152742
+
+    2013-07-16  Filip Pizlo  &lt;fpizlo@apple.com&gt;
+
+            MakeRope fixup shouldn't lead to an Identity without kids
+            https://bugs.webkit.org/show_bug.cgi?id=118745
+
+            Reviewed by Mark Hahnenberg.
+
+            Make the empty string pruning part of fixupMakeRope() stop if it's on the last child.
+
+            Make Node::convertToIdentity release-assert that it has exactly one kid.
+
+            * dfg/DFGFixupPhase.cpp:
+            (JSC::DFG::FixupPhase::fixupMakeRope):
+            * dfg/DFGNode.h:
+            (JSC::DFG::Node::convertToIdentity):
+
</ins><span class="cx"> 2013-07-15  Lucas Forschler  &lt;lforschler@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r152613
</span></span></pre></div>
<a id="tagsSafari537511SourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.51.1/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (152797 => 152798)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.51.1/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp        2013-07-17 19:49:44 UTC (rev 152797)
+++ tags/Safari-537.51.1/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp        2013-07-17 19:52:20 UTC (rev 152798)
</span><span class="lines">@@ -960,6 +960,11 @@
</span><span class="cx">             JSString* string = jsCast&lt;JSString*&gt;(m_graph.valueOfJSConstant(edge.node()).asCell());
</span><span class="cx">             if (string-&gt;length())
</span><span class="cx">                 continue;
</span><ins>+            
+            // Don't allow the MakeRope to have zero children.
+            if (!i &amp;&amp; !node-&gt;child2())
+                break;
+            
</ins><span class="cx">             node-&gt;children.removeEdge(i--);
</span><span class="cx">         }
</span><span class="cx">         
</span></span></pre></div>
<a id="tagsSafari537511SourceJavaScriptCoredfgDFGNodeh"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.51.1/Source/JavaScriptCore/dfg/DFGNode.h (152797 => 152798)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.51.1/Source/JavaScriptCore/dfg/DFGNode.h        2013-07-17 19:49:44 UTC (rev 152797)
+++ tags/Safari-537.51.1/Source/JavaScriptCore/dfg/DFGNode.h        2013-07-17 19:52:20 UTC (rev 152798)
</span><span class="lines">@@ -221,6 +221,8 @@
</span><span class="cx"> 
</span><span class="cx">     void convertToIdentity()
</span><span class="cx">     {
</span><ins>+        RELEASE_ASSERT(child1());
+        RELEASE_ASSERT(!child2());
</ins><span class="cx">         setOpAndDefaultNonExitFlags(Identity);
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>