<!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>[185627] trunk</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/185627">185627</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2015-06-16 17:06:14 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Inlining in the DFG trashes ByteCodeParser::m_currentInstruction for the calling function
https://bugs.webkit.org/show_bug.cgi?id=146029
Reviewed by Benjamin Poulain.
Source/JavaScriptCore:
Save and restore m_currentInstruction around call to ByteCodeParser::inlineCall() as it will
use m_currentInstruction during its own parsing. This happens because inlineCall() parses the
inlined callee's bytecodes by calling parseCodeBlock() which calls parseBlock() on each block.
It is in parseBlock() that we set m_currentInstruction to an instruction before we parse it.
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::attemptToInlineCall):
(JSC::DFG::ByteCodeParser::parseBlock): Added an ASSERT to catch this issue.
LayoutTests:
New regression test.
* js/regress-146029-expected.txt: Added.
* js/regress-146029.html: Added.
* js/script-tests/regress-146029.js: Added.
(myPush):
(myPop):
(foo):
(test):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregress146029expectedtxt">trunk/LayoutTests/js/regress-146029-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregress146029html">trunk/LayoutTests/js/regress-146029.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsregress146029js">trunk/LayoutTests/js/script-tests/regress-146029.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185626 => 185627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-16 23:43:26 UTC (rev 185626)
+++ trunk/LayoutTests/ChangeLog 2015-06-17 00:06:14 UTC (rev 185627)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-06-16 Michael Saboff <msaboff@apple.com>
+
+ Inlining in the DFG trashes ByteCodeParser::m_currentInstruction for the calling function
+ https://bugs.webkit.org/show_bug.cgi?id=146029
+
+ Reviewed by Benjamin Poulain.
+
+ New regression test.
+
+ * js/regress-146029-expected.txt: Added.
+ * js/regress-146029.html: Added.
+ * js/script-tests/regress-146029.js: Added.
+ (myPush):
+ (myPop):
+ (foo):
+ (test):
+
</ins><span class="cx"> 2015-06-16 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed test update: Add multiple scroll-snap-coordinate test.
</span></span></pre></div>
<a id="trunkLayoutTestsjsregress146029expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-146029-expected.txt (0 => 185627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-146029-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress-146029-expected.txt 2015-06-17 00:06:14 UTC (rev 185627)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Verify that we don't trash m_currentInstruction with an inlined function.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Correctly inlined callee and used m_currentInstruction in caller
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregress146029html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-146029.html (0 => 185627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-146029.html (rev 0)
+++ trunk/LayoutTests/js/regress-146029.html 2015-06-17 00:06:14 UTC (rev 185627)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/regress-146029.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsregress146029js"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/regress-146029.js (0 => 185627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/regress-146029.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/regress-146029.js 2015-06-17 00:06:14 UTC (rev 185627)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+description("Verify that we don't trash m_currentInstruction with an inlined function.");
+
+function myPush(a, o) {
+ a.push(o);
+}
+
+function myPop(a) {
+ a.pop();
+}
+
+function foo(a) {
+ myPush(a, 42);
+ myPop(a);
+ return a.length;
+}
+
+noInline(foo);
+
+function test() {
+ var myArray = ["one", "two", "three"];
+
+ for (var i = 0; i < 10000; ++i) {
+ if (foo(myArray) != 3) {
+ testFailed("Array changed unexpectedly");
+ return false;
+ }
+ }
+ return true;
+}
+
+if (test())
+ testPassed("Correctly inlined callee and used m_currentInstruction in caller");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (185626 => 185627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-06-16 23:43:26 UTC (rev 185626)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-06-17 00:06:14 UTC (rev 185627)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-06-16 Michael Saboff <msaboff@apple.com>
+
+ Inlining in the DFG trashes ByteCodeParser::m_currentInstruction for the calling function
+ https://bugs.webkit.org/show_bug.cgi?id=146029
+
+ Reviewed by Benjamin Poulain.
+
+ Save and restore m_currentInstruction around call to ByteCodeParser::inlineCall() as it will
+ use m_currentInstruction during its own parsing. This happens because inlineCall() parses the
+ inlined callee's bytecodes by calling parseCodeBlock() which calls parseBlock() on each block.
+ It is in parseBlock() that we set m_currentInstruction to an instruction before we parse it.
+
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::attemptToInlineCall):
+ (JSC::DFG::ByteCodeParser::parseBlock): Added an ASSERT to catch this issue.
+
</ins><span class="cx"> 2015-06-16 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, roll out unintended JSC change from https://trac.webkit.org/changeset/185425.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (185626 => 185627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-06-16 23:43:26 UTC (rev 185626)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-06-17 00:06:14 UTC (rev 185627)
</span><span class="lines">@@ -1487,8 +1487,10 @@
</span><span class="cx"> if (myInliningCost > inliningBalance)
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ Instruction* savedCurrentInstruction = m_currentInstruction;
</ins><span class="cx"> inlineCall(callTargetNode, resultOperand, callee, registerOffset, argumentCountIncludingThis, nextOffset, kind, callerLinkability, insertChecks);
</span><span class="cx"> inliningBalance -= myInliningCost;
</span><ins>+ m_currentInstruction = savedCurrentInstruction;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3397,6 +3399,8 @@
</span><span class="cx">
</span><span class="cx"> case op_call:
</span><span class="cx"> handleCall(currentInstruction, Call, CodeForCall);
</span><ins>+ // Verify that handleCall(), which could have inlined the callee, didn't trash m_currentInstruction
+ ASSERT(m_currentInstruction == currentInstruction);
</ins><span class="cx"> NEXT_OPCODE(op_call);
</span><span class="cx">
</span><span class="cx"> case op_construct:
</span></span></pre>
</div>
</div>
</body>
</html>