<!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>[169447] trunk/Source</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/169447">169447</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-05-29 09:09:55 -0700 (Thu, 29 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>DFG::DCEPhase inserts into an insertion set in reverse, causing hilarious basic block corruption if you kill a lot of NewArrays
https://bugs.webkit.org/show_bug.cgi?id=133368
Reviewed by Mark Lam.
Source/JavaScriptCore:
* dfg/DFGDCEPhase.cpp:
(JSC::DFG::DCEPhase::fixupBlock): Loop in the right order so that we insert in the right order.
* tests/stress/new-array-dead.js: Added.
(foo):
Source/WTF:
* wtf/Insertion.h:
(WTF::executeInsertions): This algorithm is only correct if insertions are added in the right order. Assert that the order is right.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGDCEPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGDCEPhase.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfInsertionh">trunk/Source/WTF/wtf/Insertion.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressnewarraydeadjs">trunk/Source/JavaScriptCore/tests/stress/new-array-dead.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (169446 => 169447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-05-29 16:05:38 UTC (rev 169446)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-05-29 16:09:55 UTC (rev 169447)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2014-05-28 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ DFG::DCEPhase inserts into an insertion set in reverse, causing hilarious basic block corruption if you kill a lot of NewArrays
+ https://bugs.webkit.org/show_bug.cgi?id=133368
+
+ Reviewed by Mark Lam.
+
+ * dfg/DFGDCEPhase.cpp:
+ (JSC::DFG::DCEPhase::fixupBlock): Loop in the right order so that we insert in the right order.
+ * tests/stress/new-array-dead.js: Added.
+ (foo):
+
+2014-05-28 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> Unreviewed, fix not-x86 32-bit.
</span><span class="cx">
</span><span class="cx"> * llint/LowLevelInterpreter32_64.asm:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGDCEPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGDCEPhase.cpp (169446 => 169447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGDCEPhase.cpp 2014-05-29 16:05:38 UTC (rev 169446)
+++ trunk/Source/JavaScriptCore/dfg/DFGDCEPhase.cpp 2014-05-29 16:09:55 UTC (rev 169447)
</span><span class="lines">@@ -187,15 +187,17 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (unsigned indexInBlock = block->size(); indexInBlock--;) {
</del><ins>+ // This has to be a forward loop because we are using the insertion set.
+ for (unsigned indexInBlock = 0; indexInBlock < block->size(); ++indexInBlock) {
</ins><span class="cx"> Node* node = block->at(indexInBlock);
</span><span class="cx"> if (node->shouldGenerate())
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> switch (node->op()) {
</span><span class="cx"> case MovHint: {
</span><del>- ASSERT(node->child1().useKind() == node->child1()->defaultUseKind());
- if (!node->child1()->shouldGenerate()) {
</del><ins>+ // Check if the child is dead. MovHint's child would only be a Phantom
+ // if we had just killed it.
+ if (node->child1()->op() == Phantom) {
</ins><span class="cx"> node->setOpAndDefaultFlags(ZombieHint);
</span><span class="cx"> node->child1() = Edge();
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressnewarraydeadjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/new-array-dead.js (0 => 169447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/new-array-dead.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/new-array-dead.js 2014-05-29 16:09:55 UTC (rev 169447)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+// Tests when we have a dead NewArray that we end up killing and there are other things in the basic block.
+
+function foo(a, b, c) {
+ var d = a + b;
+ var e = b + c;
+ var f = c + a;
+ var g = a - b;
+ var h = b - c;
+ var i = c - a;
+ var j = [a + 1, b + 2, c + 3, d + 4, e + 5, f + 6, g + 7, h + 8, i + 9];
+ var d = a * b;
+ var e = b * c;
+ var f = c * a;
+ var g = a / b;
+ var h = b / c;
+ var i = c / a;
+ var j = [a + 10, b + 11, c + 12, d + 13, e + 14, f + 15, g + 16, h + 17, i + 18];
+ var d = a % b;
+ var e = b % c;
+ var f = c % a;
+ var g = b - a;
+ var h = c - b;
+ var i = a - c;
+ var j = [a + 19, b + 20, c + 21, d + 22, e + 23, f + 24, g + 25, h + 26, i + 27];
+ var d = b / a;
+ var e = c / b;
+ var f = a + c;
+ var g = b % a;
+ var h = c % b;
+ var i = a % c;
+ var j = [a + 28, b + 29, c + 30, d + 31, e + 32, f + 33, g + 34, h + 35, i + 36];
+ return 42;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo(1.5, 2.5, 3.5);
+ if (result != 42)
+ throw "Error: bad result: " + result;
+}
+
</ins></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (169446 => 169447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-05-29 16:05:38 UTC (rev 169446)
+++ trunk/Source/WTF/ChangeLog 2014-05-29 16:09:55 UTC (rev 169447)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-05-28 Filip Pizlo <fpizlo@apple.com>
+
+ DFG::DCEPhase inserts into an insertion set in reverse, causing hilarious basic block corruption if you kill a lot of NewArrays
+ https://bugs.webkit.org/show_bug.cgi?id=133368
+
+ Reviewed by Mark Lam.
+
+ * wtf/Insertion.h:
+ (WTF::executeInsertions): This algorithm is only correct if insertions are added in the right order. Assert that the order is right.
+
</ins><span class="cx"> 2014-05-27 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Update ENABLE(MEDIA_SOURCE) on Mac
</span></span></pre></div>
<a id="trunkSourceWTFwtfInsertionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Insertion.h (169446 => 169447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Insertion.h 2014-05-29 16:05:38 UTC (rev 169446)
+++ trunk/Source/WTF/wtf/Insertion.h 2014-05-29 16:09:55 UTC (rev 169447)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> target.grow(target.size() + insertions.size());
</span><span class="cx"> size_t lastIndex = target.size();
</span><span class="cx"> for (size_t indexInInsertions = insertions.size(); indexInInsertions--;) {
</span><ins>+ ASSERT(!indexInInsertions || insertions[indexInInsertions].index() >= insertions[indexInInsertions - 1].index());
</ins><span class="cx"> size_t firstIndex = insertions[indexInInsertions].index() + indexInInsertions;
</span><span class="cx"> size_t indexOffset = indexInInsertions + 1;
</span><span class="cx"> for (size_t i = lastIndex; --i > firstIndex;)
</span></span></pre>
</div>
</div>
</body>
</html>