<!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>[190761] 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/190761">190761</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-10-08 17:13:58 -0700 (Thu, 08 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>DFG SSA should remove unreachable code
https://bugs.webkit.org/show_bug.cgi?id=149931
Reviewed by Geoffrey Garen.
Rolled back in with a call to m_state.reset(), which fixes the debug asserts.
* dfg/DFGConstantFoldingPhase.cpp:
(JSC::DFG::ConstantFoldingPhase::run): Remove unreachable code.
* dfg/DFGObjectAllocationSinkingPhase.cpp: Deal with the CFG changing.
* dfg/DFGPutStackSinkingPhase.cpp: Deal with the CFG changing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGConstantFoldingPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGObjectAllocationSinkingPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPutStackSinkingPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGPutStackSinkingPhase.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (190760 => 190761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-08 23:45:11 UTC (rev 190760)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-09 00:13:58 UTC (rev 190761)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-10-08 Filip Pizlo <fpizlo@apple.com>
+
+ DFG SSA should remove unreachable code
+ https://bugs.webkit.org/show_bug.cgi?id=149931
+
+ Reviewed by Geoffrey Garen.
+
+ Rolled back in with a call to m_state.reset(), which fixes the debug asserts.
+
+ * dfg/DFGConstantFoldingPhase.cpp:
+ (JSC::DFG::ConstantFoldingPhase::run): Remove unreachable code.
+ * dfg/DFGObjectAllocationSinkingPhase.cpp: Deal with the CFG changing.
+ * dfg/DFGPutStackSinkingPhase.cpp: Deal with the CFG changing.
+
</ins><span class="cx"> 2015-10-08 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Add LLVM binaries for iOS 9 device
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGConstantFoldingPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp (190760 => 190761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp 2015-10-08 23:45:11 UTC (rev 190760)
+++ trunk/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp 2015-10-09 00:13:58 UTC (rev 190761)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "DFGAbstractInterpreterInlines.h"
</span><span class="cx"> #include "DFGArgumentsUtilities.h"
</span><del>-#include "DFGBasicBlock.h"
</del><ins>+#include "DFGBasicBlockInlines.h"
</ins><span class="cx"> #include "DFGGraph.h"
</span><span class="cx"> #include "DFGInPlaceAbstractState.h"
</span><span class="cx"> #include "DFGInferredTypeCheck.h"
</span><span class="lines">@@ -55,23 +55,51 @@
</span><span class="cx"> bool run()
</span><span class="cx"> {
</span><span class="cx"> bool changed = false;
</span><del>-
- for (BlockIndex blockIndex = 0; blockIndex < m_graph.numBlocks(); ++blockIndex) {
- BasicBlock* block = m_graph.block(blockIndex);
- if (!block)
- continue;
</del><ins>+
+ for (BasicBlock* block : m_graph.blocksInNaturalOrder()) {
</ins><span class="cx"> if (block->cfaFoundConstants)
</span><span class="cx"> changed |= foldConstants(block);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (changed && m_graph.m_form == SSA) {
</span><span class="cx"> // It's now possible that we have Upsilons pointed at JSConstants. Fix that.
</span><del>- for (BlockIndex blockIndex = m_graph.numBlocks(); blockIndex--;) {
- BasicBlock* block = m_graph.block(blockIndex);
- if (!block)
- continue;
</del><ins>+ for (BasicBlock* block : m_graph.blocksInNaturalOrder())
</ins><span class="cx"> fixUpsilons(block);
</span><ins>+ }
+
+ if (m_graph.m_form == SSA) {
+ // It's now possible to simplify basic blocks by placing an Unreachable terminator right
+ // after anything that invalidates AI.
+ bool didClipBlock = false;
+ for (BasicBlock* block : m_graph.blocksInNaturalOrder()) {
+ m_state.beginBasicBlock(block);
+ for (unsigned nodeIndex = 0; nodeIndex < block->size(); ++nodeIndex) {
+ if (block->at(nodeIndex)->isTerminal()) {
+ // It's possible that we have something after the terminal. It could be a
+ // no-op Check node, for example. We don't want the logic below to turn that
+ // node into Unreachable, since then we'd have two terminators.
+ break;
+ }
+ if (!m_state.isValid()) {
+ NodeOrigin origin = block->at(nodeIndex)->origin;
+ for (unsigned killIndex = nodeIndex; killIndex < block->size(); ++killIndex)
+ m_graph.m_allocator.free(block->at(killIndex));
+ block->resize(nodeIndex);
+ block->appendNode(m_graph, SpecNone, Unreachable, origin);
+ didClipBlock = true;
+ break;
+ }
+ m_interpreter.execute(nodeIndex);
+ }
+ m_state.reset();
</ins><span class="cx"> }
</span><ins>+
+ if (didClipBlock) {
+ changed = true;
+ m_graph.invalidateCFG();
+ m_graph.resetReachability();
+ m_graph.killUnreachableBlocks();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return changed;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGObjectAllocationSinkingPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp (190760 => 190761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp 2015-10-08 23:45:11 UTC (rev 190760)
+++ trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp 2015-10-09 00:13:58 UTC (rev 190761)
</span><span class="lines">@@ -727,6 +727,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_graph.computeRefCounts();
</span><span class="cx"> m_graph.initializeNodeOwners();
</span><ins>+ m_graph.m_dominators.computeIfNecessary(m_graph);
</ins><span class="cx"> performLivenessAnalysis(m_graph);
</span><span class="cx"> performOSRAvailabilityAnalysis(m_graph);
</span><span class="cx"> m_combinedLiveness = CombinedLiveness(m_graph);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPutStackSinkingPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPutStackSinkingPhase.cpp (190760 => 190761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPutStackSinkingPhase.cpp 2015-10-08 23:45:11 UTC (rev 190760)
+++ trunk/Source/JavaScriptCore/dfg/DFGPutStackSinkingPhase.cpp 2015-10-09 00:13:58 UTC (rev 190761)
</span><span class="lines">@@ -75,6 +75,8 @@
</span><span class="cx"> dataLog("Graph before PutStack sinking:\n");
</span><span class="cx"> m_graph.dump();
</span><span class="cx"> }
</span><ins>+
+ m_graph.m_dominators.computeIfNecessary(m_graph);
</ins><span class="cx">
</span><span class="cx"> SSACalculator ssaCalculator(m_graph);
</span><span class="cx"> InsertionSet insertionSet(m_graph);
</span></span></pre>
</div>
</div>
</body>
</html>