<!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>[191654] branches/safari-601-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/191654">191654</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-27 22:19:25 -0700 (Tue, 27 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/187510">r187510</a>. <rdar://problem/22847057> FaradayDotTwo: Safari crash in com.apple.JavaScriptCore: JSC::DFG::(anonymous namespace)::PutStackSinkingPhase::run + 47593</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceJavaScriptCoreChangeLog">branches/safari-601-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoredfgDFGPutStackSinkingPhasecpp">branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGPutStackSinkingPhase.cpp</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 (191653 => 191654)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/ChangeLog 2015-10-28 05:19:20 UTC (rev 191653)
+++ branches/safari-601-branch/Source/JavaScriptCore/ChangeLog 2015-10-28 05:19:25 UTC (rev 191654)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-10-27 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r187510. rdar://problem/22847057
+
+ 2015-07-28 Filip Pizlo <fpizlo@apple.com>
+
+ DFG::PutStackSinkingPhase should be more aggressive about its "no GetStack until put" rule
+ https://bugs.webkit.org/show_bug.cgi?id=147371
+
+ Reviewed by Mark Lam.
+
+ Two fixes:
+
+ - Make ConflictingFlush really mean that you can't load from the stack slot. This means not
+ using ConflictingFlush for arguments.
+
+ - Assert that a GetStack never sees ConflictingFlush.
+
+ * dfg/DFGPutStackSinkingPhase.cpp:
+
</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="branchessafari601branchSourceJavaScriptCoredfgDFGPutStackSinkingPhasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGPutStackSinkingPhase.cpp (191653 => 191654)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGPutStackSinkingPhase.cpp 2015-10-28 05:19:20 UTC (rev 191653)
+++ branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGPutStackSinkingPhase.cpp 2015-10-28 05:19:25 UTC (rev 191654)
</span><span class="lines">@@ -216,9 +216,10 @@
</span><span class="cx"> deferredAtTail[block] =
</span><span class="cx"> Operands<FlushFormat>(OperandsLike, block->variablesAtHead);
</span><span class="cx"> }
</span><ins>+
+ for (unsigned local = deferredAtHead.atIndex(0).numberOfLocals(); local--;)
+ deferredAtHead.atIndex(0).local(local) = ConflictingFlush;
</ins><span class="cx">
</span><del>- deferredAtHead.atIndex(0).fill(ConflictingFlush);
-
</del><span class="cx"> do {
</span><span class="cx"> changed = false;
</span><span class="cx">
</span><span class="lines">@@ -230,12 +231,18 @@
</span><span class="cx"> dataLog("Deferred at ", node, ":", deferred, "\n");
</span><span class="cx">
</span><span class="cx"> if (node->op() == GetStack) {
</span><ins>+ DFG_ASSERT(
+ m_graph, node,
+ deferred.operand(node->stackAccessData()->local) != ConflictingFlush);
+
</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 class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto escapeHandler = [&] (VirtualRegister operand) {
</span><ins>+ if (verbose)
+ dataLog("For ", node, " escaping ", operand, "\n");
</ins><span class="cx"> if (operand.isHeader())
</span><span class="cx"> return;
</span><span class="cx"> // We will materialize just before any reads.
</span><span class="lines">@@ -406,6 +413,10 @@
</span><span class="cx"> StackAccessData* data = node->stackAccessData();
</span><span class="cx"> FlushFormat format = deferred.operand(data->local);
</span><span class="cx"> if (!isConcrete(format)) {
</span><ins>+ DFG_ASSERT(
+ m_graph, node,
+ deferred.operand(data->local) != ConflictingFlush);
+
</ins><span class="cx"> // This means there is no deferral. No deferral means that the most
</span><span class="cx"> // authoritative value for this stack slot is what is stored in the stack. So,
</span><span class="cx"> // keep the GetStack.
</span><span class="lines">@@ -427,12 +438,18 @@
</span><span class="cx">
</span><span class="cx"> default: {
</span><span class="cx"> auto escapeHandler = [&] (VirtualRegister operand) {
</span><ins>+ if (verbose)
+ dataLog("For ", node, " escaping ", operand, "\n");
+
</ins><span class="cx"> if (operand.isHeader())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> FlushFormat format = deferred.operand(operand);
</span><del>- if (!isConcrete(format))
</del><ins>+ if (!isConcrete(format)) {
+ // It's dead now, rather than conflicting.
+ deferred.operand(operand) = DeadFlush;
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Gotta insert a PutStack.
</span><span class="cx"> if (verbose)
</span></span></pre>
</div>
</div>
</body>
</html>