<!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>[191655] branches/safari-601-branch</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/191655">191655</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-27 22:19:30 -0700 (Tue, 27 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191395">r191395</a>. rdar://problem/22847057</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceJavaScriptCoreChangeLog">branches/safari-601-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoredfgDFGPlancpp">branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGPlan.cpp</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoredfgDFGPutStackSinkingPhasecpp">branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGPutStackSinkingPhase.cpp</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoreruntimeOptionsh">branches/safari-601-branch/Source/JavaScriptCore/runtime/Options.h</a></li>
<li><a href="#branchessafari601branchToolsChangeLog">branches/safari-601-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari601branchToolsScriptsrunjscstresstests">branches/safari-601-branch/Tools/Scripts/run-jsc-stress-tests</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/ChangeLog (191654 => 191655)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/ChangeLog 2015-10-28 05:19:25 UTC (rev 191654)
+++ branches/safari-601-branch/Source/JavaScriptCore/ChangeLog 2015-10-28 05:19:30 UTC (rev 191655)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-10-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191395. rdar://problem/22847057
+
+ 2015-10-21 Filip Pizlo <fpizlo@apple.com>
+
+ Failures in PutStackSinkingPhase should be less severe
+ https://bugs.webkit.org/show_bug.cgi?id=150400
+
+ Reviewed by Geoffrey Garen.
+
+ Make the PutStackSinkingPhase abort instead of asserting. To test that it's OK to not have
+ PutStackSinkingPhase run, this adds a test mode where we run without PutStackSinkingPhase.
+
+ * dfg/DFGPlan.cpp: Make it possible to not run PutStackSinkingPhase for tests.
+ (JSC::DFG::Plan::compileInThreadImpl):
+ * dfg/DFGPutStackSinkingPhase.cpp: PutStackSinkingPhase should abort instead of asserting, except when validation is enabled.
+ * runtime/Options.h: Add an option for disabling PutStackSinkingPhase.
+
+2015-10-27 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r187510. rdar://problem/22847057
</span><span class="cx">
</span><span class="cx"> 2015-07-28 Filip Pizlo <fpizlo@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoredfgDFGPlancpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGPlan.cpp (191654 => 191655)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGPlan.cpp 2015-10-28 05:19:25 UTC (rev 191654)
+++ branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGPlan.cpp 2015-10-28 05:19:30 UTC (rev 191655)
</span><span class="lines">@@ -354,7 +354,8 @@
</span><span class="cx">
</span><span class="cx"> // Ideally, these would be run to fixpoint with the object allocation sinking phase.
</span><span class="cx"> performArgumentsElimination(dfg);
</span><del>- performPutStackSinking(dfg);
</del><ins>+ if (Options::usePutStackSinking())
+ performPutStackSinking(dfg);
</ins><span class="cx">
</span><span class="cx"> performConstantHoisting(dfg);
</span><span class="cx"> performGlobalCSE(dfg);
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoredfgDFGPutStackSinkingPhasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGPutStackSinkingPhase.cpp (191654 => 191655)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGPutStackSinkingPhase.cpp 2015-10-28 05:19:25 UTC (rev 191654)
+++ branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGPutStackSinkingPhase.cpp 2015-10-28 05:19:30 UTC (rev 191655)
</span><span class="lines">@@ -231,10 +231,39 @@
</span><span class="cx"> dataLog("Deferred at ", node, ":", deferred, "\n");
</span><span class="cx">
</span><span class="cx"> if (node->op() == GetStack) {
</span><del>- DFG_ASSERT(
- m_graph, node,
- deferred.operand(node->stackAccessData()->local) != ConflictingFlush);
</del><ins>+ // Handle the case that the input doesn't match our requirements. This is
+ // really a bug, but it's a benign one if we simply don't run this phase.
+ // It usually arises because of patterns like:
+ //
+ // if (thing)
+ // PutStack()
+ // ...
+ // if (thing)
+ // GetStack()
+ //
+ // Or:
+ //
+ // if (never happens)
+ // GetStack()
+ //
+ // Because this phase runs early in SSA, it should be sensible to enforce
+ // that no such code pattern has arisen yet. So, when validation is
+ // enabled, we assert that we aren't seeing this. But with validation
+ // disabled we silently let this fly and we just abort this phase.
+ // FIXME: Get rid of all remaining cases of conflicting GetStacks.
+ // https://bugs.webkit.org/show_bug.cgi?id=150398
+
+ bool isConflicting =
+ deferred.operand(node->stackAccessData()->local) == ConflictingFlush;
</ins><span class="cx">
</span><ins>+ if (validationEnabled())
+ DFG_ASSERT(m_graph, node, !isConflicting);
+
+ if (isConflicting) {
+ // Oh noes! Abort!!
+ return false;
+ }
+
</ins><span class="cx"> // A GetStack doesn't affect anything, since we know which local we are reading
</span><span class="cx"> // from.
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/runtime/Options.h (191654 => 191655)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/runtime/Options.h 2015-10-28 05:19:25 UTC (rev 191654)
+++ branches/safari-601-branch/Source/JavaScriptCore/runtime/Options.h 2015-10-28 05:19:30 UTC (rev 191655)
</span><span class="lines">@@ -190,6 +190,7 @@
</span><span class="cx"> v(bool, optimizeNativeCalls, false, nullptr) \
</span><span class="cx"> v(bool, enableMovHintRemoval, true, nullptr) \
</span><span class="cx"> v(bool, enableObjectAllocationSinking, true, nullptr) \
</span><ins>+ v(bool, usePutStackSinking, true, nullptr) \
</ins><span class="cx"> \
</span><span class="cx"> v(bool, enableConcurrentJIT, true, "allows the DFG / FTL compilation in threads other than the executing JS thread") \
</span><span class="cx"> v(unsigned, numberOfDFGCompilerThreads, computeNumberOfWorkerThreads(2, 2) - 1, nullptr) \
</span></span></pre></div>
<a id="branchessafari601branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Tools/ChangeLog (191654 => 191655)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Tools/ChangeLog 2015-10-28 05:19:25 UTC (rev 191654)
+++ branches/safari-601-branch/Tools/ChangeLog 2015-10-28 05:19:30 UTC (rev 191655)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-10-27 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r191395. rdar://problem/22847057
+
+ 2015-10-21 Filip Pizlo <fpizlo@apple.com>
+
+ Failures in PutStackSinkingPhase should be less severe
+ https://bugs.webkit.org/show_bug.cgi?id=150400
+
+ Reviewed by Geoffrey Garen.
+
+ Add a test mode for no PutStackSinkingPhase.
+
+ * Scripts/run-jsc-stress-tests:
+
</ins><span class="cx"> 2015-10-26 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r191530. rdar://problem/23206864
</span></span></pre></div>
<a id="branchessafari601branchToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Tools/Scripts/run-jsc-stress-tests (191654 => 191655)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Tools/Scripts/run-jsc-stress-tests 2015-10-28 05:19:25 UTC (rev 191654)
+++ branches/safari-601-branch/Tools/Scripts/run-jsc-stress-tests 2015-10-28 05:19:30 UTC (rev 191655)
</span><span class="lines">@@ -710,6 +710,10 @@
</span><span class="cx"> run("ftl-no-cjit-validate", "--validateGraph=true", *(FTL_OPTIONS + NO_CJIT_OPTIONS)) if $enableFTL
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+def runFTLNoCJITNoPutStackValidate
+ run("ftl-no-cjit-no-put-stack-validate", "--validateGraph=true", "--usePutStackSinking=false", *(FTL_OPTIONS + NO_CJIT_OPTIONS)) if $enableFTL
+end
+
</ins><span class="cx"> def runFTLNoCJITNoInlineValidate
</span><span class="cx"> run("ftl-no-cjit-no-inline-validate", "--validateGraph=true", "--maximumInliningDepth=1", *(FTL_OPTIONS + NO_CJIT_OPTIONS)) if $enableFTL
</span><span class="cx"> end
</span><span class="lines">@@ -773,6 +777,7 @@
</span><span class="cx"> runDefaultFTL
</span><span class="cx"> runFTLNoCJITValidate
</span><span class="cx"> runFTLNoCJITNoInlineValidate
</span><ins>+ runFTLNoCJITNoPutStackValidate
</ins><span class="cx"> runFTLEager
</span><span class="cx"> runFTLEagerNoCJITValidate
</span><span class="cx"> runFTLNoCJITSmallPool
</span></span></pre>
</div>
</div>
</body>
</html>