<!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>[202141] 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/202141">202141</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-06-16 15:18:06 -0700 (Thu, 16 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Kraken/stanford-crypto-pbkdf2.js sometimes crashes with an OSR assertion in FTL
https://bugs.webkit.org/show_bug.cgi?id=158850
Reviewed by Keith Miller.
Bytecode liveness was incorrectly claiming that all tail-deleted locals are live! That's
crazy! We never noticed this because extending OSR liveness is usually not a showstopper and
until recently we didn't have a lot of tail-call test cases to play with. Well, we do now,
thanks to the increasing reliance on tail calls in our builtins.
* dfg/DFGGraph.cpp:
(JSC::DFG::Graph::localsLiveInBytecode): Fix the bug and add some optional tracing. Also restructure the code so that we don't break to return true, since that's counterintuitive.
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::buildExitArguments): Make this assertion print more useful information.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGGraphcpp">trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202140 => 202141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-16 22:06:57 UTC (rev 202140)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-16 22:18:06 UTC (rev 202141)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-06-16 Filip Pizlo <fpizlo@apple.com>
+
+ Kraken/stanford-crypto-pbkdf2.js sometimes crashes with an OSR assertion in FTL
+ https://bugs.webkit.org/show_bug.cgi?id=158850
+
+ Reviewed by Keith Miller.
+
+ Bytecode liveness was incorrectly claiming that all tail-deleted locals are live! That's
+ crazy! We never noticed this because extending OSR liveness is usually not a showstopper and
+ until recently we didn't have a lot of tail-call test cases to play with. Well, we do now,
+ thanks to the increasing reliance on tail calls in our builtins.
+
+ * dfg/DFGGraph.cpp:
+ (JSC::DFG::Graph::localsLiveInBytecode): Fix the bug and add some optional tracing. Also restructure the code so that we don't break to return true, since that's counterintuitive.
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::buildExitArguments): Make this assertion print more useful information.
+
</ins><span class="cx"> 2016-06-16 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Add collecting of LLINT slow path stats.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp (202140 => 202141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2016-06-16 22:06:57 UTC (rev 202140)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2016-06-16 22:18:06 UTC (rev 202141)
</span><span class="lines">@@ -997,48 +997,72 @@
</span><span class="cx">
</span><span class="cx"> bool Graph::isLiveInBytecode(VirtualRegister operand, CodeOrigin codeOrigin)
</span><span class="cx"> {
</span><ins>+ static const bool verbose = false;
+
+ if (verbose)
+ dataLog("Checking of operand is live: ", operand, "\n");
</ins><span class="cx"> CodeOrigin* codeOriginPtr = &codeOrigin;
</span><span class="cx"> for (;;) {
</span><span class="cx"> VirtualRegister reg = VirtualRegister(
</span><span class="cx"> operand.offset() - codeOriginPtr->stackOffset());
</span><span class="cx">
</span><ins>+ if (verbose)
+ dataLog("reg = ", reg, "\n");
+
</ins><span class="cx"> if (operand.offset() < codeOriginPtr->stackOffset() + JSStack::CallFrameHeaderSize) {
</span><span class="cx"> if (reg.isArgument()) {
</span><span class="cx"> RELEASE_ASSERT(reg.offset() < JSStack::CallFrameHeaderSize);
</span><span class="cx">
</span><span class="cx"> if (codeOriginPtr->inlineCallFrame->isClosureCall
</span><del>- && reg.offset() == JSStack::Callee)
</del><ins>+ && reg.offset() == JSStack::Callee) {
+ if (verbose)
+ dataLog("Looks like a callee.\n");
</ins><span class="cx"> return true;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if (codeOriginPtr->inlineCallFrame->isVarargs()
</span><del>- && reg.offset() == JSStack::ArgumentCount)
</del><ins>+ && reg.offset() == JSStack::ArgumentCount) {
+ if (verbose)
+ dataLog("Looks like the argument count.\n");
</ins><span class="cx"> return true;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ if (verbose)
+ dataLog("Asking the bytecode liveness.\n");
</ins><span class="cx"> return livenessFor(codeOriginPtr->inlineCallFrame).operandIsLive(
</span><span class="cx"> reg.offset(), codeOriginPtr->bytecodeIndex);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InlineCallFrame* inlineCallFrame = codeOriginPtr->inlineCallFrame;
</span><del>- if (!inlineCallFrame)
- break;
</del><ins>+ if (!inlineCallFrame) {
+ if (verbose)
+ dataLog("Ran out of stack, returning true.\n");
+ return true;
+ }
</ins><span class="cx">
</span><span class="cx"> // Arguments are always live. This would be redundant if it wasn't for our
</span><span class="cx"> // op_call_varargs inlining.
</span><span class="cx"> if (reg.isArgument()
</span><del>- && static_cast<size_t>(reg.toArgument()) < inlineCallFrame->arguments.size())
</del><ins>+ && static_cast<size_t>(reg.toArgument()) < inlineCallFrame->arguments.size()) {
+ if (verbose)
+ dataLog("Argument is live.\n");
</ins><span class="cx"> return true;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> codeOriginPtr = inlineCallFrame->getCallerSkippingTailCalls();
</span><span class="cx">
</span><span class="cx"> // The first inline call frame could be an inline tail call
</span><del>- if (!codeOriginPtr)
- break;
</del><ins>+ if (!codeOriginPtr) {
+ if (verbose)
+ dataLog("Dead because of tail inlining.\n");
+ return false;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return true;
</del><ins>+ RELEASE_ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BitVector Graph::localsLiveInBytecode(CodeOrigin codeOrigin)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp (202140 => 202141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2016-06-16 22:06:57 UTC (rev 202140)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2016-06-16 22:18:06 UTC (rev 202141)
</span><span class="lines">@@ -10810,10 +10810,11 @@
</span><span class="cx">
</span><span class="cx"> Availability availability = availabilityMap.m_locals[i];
</span><span class="cx">
</span><del>- if (Options::validateFTLOSRExitLiveness()) {
- DFG_ASSERT(
- m_graph, m_node,
- (!(availability.isDead() && m_graph.isLiveInBytecode(VirtualRegister(operand), exitOrigin))) || m_graph.m_plan.mode == FTLForOSREntryMode);
</del><ins>+ if (Options::validateFTLOSRExitLiveness()
+ && m_graph.m_plan.mode != FTLForOSREntryMode) {
+
+ if (availability.isDead() && m_graph.isLiveInBytecode(VirtualRegister(operand), exitOrigin))
+ DFG_CRASH(m_graph, m_node, toCString("Live bytecode local not available: operand = ", VirtualRegister(operand), ", availability = ", availability, ", origin = ", exitOrigin).data());
</ins><span class="cx"> }
</span><span class="cx"> ExitValue exitValue = exitValueForAvailability(arguments, map, availability);
</span><span class="cx"> if (exitValue.hasIndexInStackmapLocations())
</span></span></pre>
</div>
</div>
</body>
</html>