<!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>[205232] branches/safari-602-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/205232">205232</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-08-31 00:20:16 -0700 (Wed, 31 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/204360">r204360</a>. rdar://problem/27991577</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchJSTestsChangeLog">branches/safari-602-branch/JSTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceJavaScriptCoreChangeLog">branches/safari-602-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceJavaScriptCoredfgDFGByteCodeParsercpp">branches/safari-602-branch/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchJSTestsstressneedbytecodelivenessforunreachableblocksatdfgtimejs">branches/safari-602-branch/JSTests/stress/need-bytecode-liveness-for-unreachable-blocks-at-dfg-time.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/JSTests/ChangeLog (205231 => 205232)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/JSTests/ChangeLog 2016-08-31 07:20:12 UTC (rev 205231)
+++ branches/safari-602-branch/JSTests/ChangeLog 2016-08-31 07:20:16 UTC (rev 205232)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-08-30 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r204360. rdar://problem/27991577
+
+ 2016-08-10 Mark Lam <mark.lam@apple.com>
+
+ DFG's flushForTerminal() needs to add PhantomLocals for bytecode live locals.
+ https://bugs.webkit.org/show_bug.cgi?id=160755
+ <rdar://problem/27488507>
+
+ Reviewed by Filip Pizlo.
+
+ * stress/need-bytecode-liveness-for-unreachable-blocks-at-dfg-time.js: Added.
+
</ins><span class="cx"> 2016-08-02 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename Changelog to ChangeLog
</span></span></pre></div>
<a id="branchessafari602branchJSTestsstressneedbytecodelivenessforunreachableblocksatdfgtimejs"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/JSTests/stress/need-bytecode-liveness-for-unreachable-blocks-at-dfg-time.js (0 => 205232)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/JSTests/stress/need-bytecode-liveness-for-unreachable-blocks-at-dfg-time.js (rev 0)
+++ branches/safari-602-branch/JSTests/stress/need-bytecode-liveness-for-unreachable-blocks-at-dfg-time.js 2016-08-31 07:20:16 UTC (rev 205232)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+//@ run("--useConcurrentJIT=false")
+
+// This test is set up delicately to:
+// 1. cause the test() function to DFG compile with just the right amount of profiling
+// so that ...
+// 2. the DFG identifies the "return Function()" path as dead, and ...
+// 3. the DFG compiled function doesn't OSR exit too many times before ...
+// 4. we change the implementation of the inlined foo() and execute test() again.
+//
+// This test should not crash.
+
+eval("\"use strict\"; var w;");
+foo = function() { throw 0; }
+var x;
+
+(function() {
+ eval("test = function() { ~foo(~(0 ? ~x : x) ? 0 : 0); return Function(); }");
+})();
+
+// This loop count of 2000 was empirically determined to be the right amount to get this
+// this issue to manifest. Dropping or raising it may mask the issue and prevent it from
+// manifesting.
+for (var i = 0; i < 2000; ++i) {
+ try {
+ test();
+ } catch(e) {
+ }
+}
+
+foo = function() { };
+test();
</ins></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/ChangeLog (205231 => 205232)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/ChangeLog 2016-08-31 07:20:12 UTC (rev 205231)
+++ branches/safari-602-branch/Source/JavaScriptCore/ChangeLog 2016-08-31 07:20:16 UTC (rev 205232)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2016-08-30 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r204360. rdar://problem/27991577
+
+ 2016-08-10 Mark Lam <mark.lam@apple.com>
+
+ DFG's flushForTerminal() needs to add PhantomLocals for bytecode live locals.
+ https://bugs.webkit.org/show_bug.cgi?id=160755
+ <rdar://problem/27488507>
+
+ Reviewed by Filip Pizlo.
+
+ If the DFG sees that an inlined function will result in an OSR exit every time,
+ it will treat all downstream blocks as dead. However, it still needs to keep
+ locals that are alive in the bytecode alive for the compiled function so that
+ those locals are properly written to the stack by the OSR exit ramp.
+
+ The existing code neglected to do this. This patch remedies this issue.
+
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::flushDirect):
+ (JSC::DFG::ByteCodeParser::addFlushOrPhantomLocal):
+ (JSC::DFG::ByteCodeParser::phantomLocalDirect):
+ (JSC::DFG::ByteCodeParser::flushForTerminal):
+
+2016-08-30 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203952. rdar://problem/27991571
</span><span class="cx">
</span><span class="cx"> 2016-07-30 Mark Lam <mark.lam@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (205231 => 205232)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2016-08-31 07:20:12 UTC (rev 205231)
+++ branches/safari-602-branch/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2016-08-31 07:20:16 UTC (rev 205232)
</span><span class="lines">@@ -570,9 +570,15 @@
</span><span class="cx"> {
</span><span class="cx"> flushDirect(operand, findArgumentPosition(operand));
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void flushDirect(VirtualRegister operand, ArgumentPosition* argumentPosition)
</span><span class="cx"> {
</span><ins>+ addFlushOrPhantomLocal<Flush>(operand, argumentPosition);
+ }
+
+ template<NodeType nodeType>
+ void addFlushOrPhantomLocal(VirtualRegister operand, ArgumentPosition* argumentPosition)
+ {
</ins><span class="cx"> ASSERT(!operand.isConstant());
</span><span class="cx">
</span><span class="cx"> Node* node = m_currentBlock->variablesAtTail.operand(operand);
</span><span class="lines">@@ -584,12 +590,17 @@
</span><span class="cx"> else
</span><span class="cx"> variable = newVariableAccessData(operand);
</span><span class="cx">
</span><del>- node = addToGraph(Flush, OpInfo(variable));
</del><ins>+ node = addToGraph(nodeType, OpInfo(variable));
</ins><span class="cx"> m_currentBlock->variablesAtTail.operand(operand) = node;
</span><span class="cx"> if (argumentPosition)
</span><span class="cx"> argumentPosition->addVariable(variable);
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ void phantomLocalDirect(VirtualRegister operand)
+ {
+ addFlushOrPhantomLocal<PhantomLocal>(operand, findArgumentPosition(operand));
+ }
+
</ins><span class="cx"> void flush(InlineStackEntry* inlineStackEntry)
</span><span class="cx"> {
</span><span class="cx"> int numArguments;
</span><span class="lines">@@ -610,8 +621,32 @@
</span><span class="cx">
</span><span class="cx"> void flushForTerminal()
</span><span class="cx"> {
</span><del>- for (InlineStackEntry* inlineStackEntry = m_inlineStackTop; inlineStackEntry; inlineStackEntry = inlineStackEntry->m_caller)
</del><ins>+ CodeOrigin origin = currentCodeOrigin();
+ unsigned bytecodeIndex = origin.bytecodeIndex;
+
+ for (InlineStackEntry* inlineStackEntry = m_inlineStackTop; inlineStackEntry; inlineStackEntry = inlineStackEntry->m_caller) {
</ins><span class="cx"> flush(inlineStackEntry);
</span><ins>+
+ ASSERT(origin.inlineCallFrame == inlineStackEntry->m_inlineCallFrame);
+ InlineCallFrame* inlineCallFrame = inlineStackEntry->m_inlineCallFrame;
+ CodeBlock* codeBlock = m_graph.baselineCodeBlockFor(inlineCallFrame);
+ FullBytecodeLiveness& fullLiveness = m_graph.livenessFor(codeBlock);
+ const FastBitVector& livenessAtBytecode = fullLiveness.getLiveness(bytecodeIndex);
+
+ for (unsigned local = codeBlock->m_numCalleeLocals; local--;) {
+ if (livenessAtBytecode.get(local)) {
+ VirtualRegister reg = virtualRegisterForLocal(local);
+ if (inlineCallFrame)
+ reg = inlineStackEntry->remapOperand(reg);
+ phantomLocalDirect(reg);
+ }
+ }
+
+ if (inlineCallFrame) {
+ bytecodeIndex = inlineCallFrame->directCaller.bytecodeIndex;
+ origin = inlineCallFrame->directCaller;
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void flushForReturn()
</span></span></pre>
</div>
</div>
</body>
</html>