<!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>[188282] branches/jsc-tailcall/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/188282">188282</a></dd>
<dt>Author</dt> <dd>basile_clement@apple.com</dd>
<dt>Date</dt> <dd>2015-08-11 13:08:56 -0700 (Tue, 11 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>jsc-tailcall: REGRESSION: DFGByteCodeParser fails when a tail call is inside a ternary
https://bugs.webkit.org/show_bug.cgi?id=147849
Reviewed by Michael Saboff.
We were assuming that a tail call could only be followed by a return.
But it could also be followed by a jump to a return when the tail call
is inside a ternary expression.
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::parseBlock):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsctailcallSourceJavaScriptCoreChangeLog">branches/jsc-tailcall/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoredfgDFGByteCodeParsercpp">branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsctailcallSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/ChangeLog (188281 => 188282)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/ChangeLog 2015-08-11 20:06:34 UTC (rev 188281)
+++ branches/jsc-tailcall/Source/JavaScriptCore/ChangeLog 2015-08-11 20:08:56 UTC (rev 188282)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-08-11 Basile Clement <basile_clement@apple.com>
</span><span class="cx">
</span><ins>+ jsc-tailcall: REGRESSION: DFGByteCodeParser fails when a tail call is inside a ternary
+ https://bugs.webkit.org/show_bug.cgi?id=147849
+
+ Reviewed by Michael Saboff.
+
+ We were assuming that a tail call could only be followed by a return.
+ But it could also be followed by a jump to a return when the tail call
+ is inside a ternary expression.
+
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::parseBlock):
+
+2015-08-11 Basile Clement <basile_clement@apple.com>
+
</ins><span class="cx"> jsc-tailcall: Add more strict mode tests
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147850
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (188281 => 188282)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-08-11 20:06:34 UTC (rev 188281)
+++ branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-08-11 20:08:56 UTC (rev 188282)
</span><span class="lines">@@ -2694,7 +2694,11 @@
</span><span class="cx"> // logic relies on every bytecode resulting in one or more nodes, which would
</span><span class="cx"> // be true anyway except for op_loop_hint, which emits a Phantom to force this
</span><span class="cx"> // to be true.
</span><del>- if (!m_currentBlock->isEmpty())
</del><ins>+ // We also don't insert a jump if the block already has a terminal,
+ // which could happen after a tail call.
+ ASSERT(m_currentBlock->isEmpty() || !m_currentBlock->terminal()
+ || m_currentBlock->terminal()->op() == TailCall || m_currentBlock->terminal()->op() == TailCallVarargs);
+ if (!m_currentBlock->isEmpty() && !m_currentBlock->terminal())
</ins><span class="cx"> addToGraph(Jump, OpInfo(m_currentIndex));
</span><span class="cx"> return shouldContinueParsing;
</span><span class="cx"> }
</span><span class="lines">@@ -3256,6 +3260,12 @@
</span><span class="cx"> // === Block terminators. ===
</span><span class="cx">
</span><span class="cx"> case op_jmp: {
</span><ins>+ if (m_currentBlock->terminal()) {
+ // We could be the dummy jump to a return after a non-inlined, non-emulated tail call in a ternary operator
+ Node* terminal = m_currentBlock->terminal();
+ ASSERT_UNUSED(terminal, terminal->op() == TailCall || terminal->op() == TailCallVarargs);
+ LAST_OPCODE(op_ret);
+ }
</ins><span class="cx"> int relativeOffset = currentInstruction[1].u.operand;
</span><span class="cx"> addToGraph(Jump, OpInfo(m_currentIndex + relativeOffset));
</span><span class="cx"> if (relativeOffset <= 0)
</span><span class="lines">@@ -3428,7 +3438,7 @@
</span><span class="cx"> if (m_currentBlock->terminal()) {
</span><span class="cx"> // We could be the dummy return after a non-inlined, non-emulated tail call
</span><span class="cx"> Node* terminal = m_currentBlock->terminal();
</span><del>- ASSERT_UNUSED(terminal, terminal->op() == Return || terminal->op() == TailCall || terminal->op() == TailCallVarargs);
</del><ins>+ ASSERT_UNUSED(terminal, terminal->op() == TailCall || terminal->op() == TailCallVarargs);
</ins><span class="cx"> LAST_OPCODE(op_ret);
</span><span class="cx"> }
</span><span class="cx"> if (inlineCallFrame()) {
</span></span></pre>
</div>
</div>
</body>
</html>