<!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>[192457] 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/192457">192457</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2015-11-14 13:13:02 -0800 (Sat, 14 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/190370">r190370</a>): CrashTracer: [USER] com.apple.WebKit.WebContent at com.apple.JavaScriptCore: JSC::JITCode::execute + 158
https://bugs.webkit.org/show_bug.cgi?id=151279
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
We need to restore callee saves even when we take the slow path in a polymorphic call stub.
Move the restoration to the top of the stub so that it is done for all paths.
* jit/Repatch.cpp:
(JSC::linkPolymorphicCall):
LayoutTests:
New regression test.
* js/regress-151279-expected.txt: Added.
* js/regress-151279.html: Added.
* js/script-tests/regress-151279.js: Added.</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="#trunkSourceJavaScriptCorejitRepatchcpp">trunk/Source/JavaScriptCore/jit/Repatch.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregress151279expectedtxt">trunk/LayoutTests/js/regress-151279-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregress151279html">trunk/LayoutTests/js/regress-151279.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsregress151279js">trunk/LayoutTests/js/script-tests/regress-151279.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192456 => 192457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-14 09:39:28 UTC (rev 192456)
+++ trunk/LayoutTests/ChangeLog 2015-11-14 21:13:02 UTC (rev 192457)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-11-14 Michael Saboff <msaboff@apple.com>
+
+ REGRESSION (r190370): CrashTracer: [USER] com.apple.WebKit.WebContent at com.apple.JavaScriptCore: JSC::JITCode::execute + 158
+ https://bugs.webkit.org/show_bug.cgi?id=151279
+
+ Reviewed by Geoffrey Garen.
+
+ New regression test.
+
+ * js/regress-151279-expected.txt: Added.
+ * js/regress-151279.html: Added.
+ * js/script-tests/regress-151279.js: Added.
+
</ins><span class="cx"> 2015-11-14 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: add a new trait for elements in fieldset on iOS
</span></span></pre></div>
<a id="trunkLayoutTestsjsregress151279expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-151279-expected.txt (0 => 192457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-151279-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress-151279-expected.txt 2015-11-14 21:13:02 UTC (rev 192457)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Regression test for https://webkit.org/b/151279.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Properly handled megamorphic tail call from a JS entry function
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregress151279html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-151279.html (0 => 192457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-151279.html (rev 0)
+++ trunk/LayoutTests/js/regress-151279.html 2015-11-14 21:13:02 UTC (rev 192457)
</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-151279.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsregress151279js"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/regress-151279.js (0 => 192457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/regress-151279.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/regress-151279.js 2015-11-14 21:13:02 UTC (rev 192457)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+description("Regression test for https://webkit.org/b/151279.");
+
+// This test verifies that a megamorphic tail call from the first callee from C++ code
+// works without crashing.
+
+function bar() {
+ return 11;
+}
+
+noInline(bar);
+
+function foo(thisArgument)
+{
+ "use strict";
+
+ return this.call(...arguments);
+}
+
+var fixedDate = new Date(2011, 11, 11, 11, 11, 11);
+var boundFuncs = [];
+
+boundFuncs[0] = foo.bind(Date.prototype.getSeconds, fixedDate);
+boundFuncs[1] = foo.bind(Date.prototype.getMinutes, fixedDate);
+boundFuncs[2] = foo.bind(Date.prototype.getHours, fixedDate);
+boundFuncs[3] = foo.bind(Date.prototype.getDate, fixedDate);
+boundFuncs[4] = foo.bind(Date.prototype.getMonth, fixedDate);
+boundFuncs[5] = foo.bind(bar, 0);
+
+function test()
+{
+ for (var i = 0; i < 200000; i++) {
+ got = boundFuncs[i % 6]();
+ if (got != 11)
+ testFailed("Function returned " + got + " but expected 11!");
+ }
+}
+
+noInline(test);
+
+test();
+
+testPassed("Properly handled megamorphic tail call from a JS entry function");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192456 => 192457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-11-14 09:39:28 UTC (rev 192456)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-11-14 21:13:02 UTC (rev 192457)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-11-14 Michael Saboff <msaboff@apple.com>
+
+ REGRESSION (r190370): CrashTracer: [USER] com.apple.WebKit.WebContent at com.apple.JavaScriptCore: JSC::JITCode::execute + 158
+ https://bugs.webkit.org/show_bug.cgi?id=151279
+
+ Reviewed by Geoffrey Garen.
+
+ We need to restore callee saves even when we take the slow path in a polymorphic call stub.
+ Move the restoration to the top of the stub so that it is done for all paths.
+
+ * jit/Repatch.cpp:
+ (JSC::linkPolymorphicCall):
+
</ins><span class="cx"> 2015-11-13 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r192416 and r192443.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRepatchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/Repatch.cpp (192456 => 192457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/Repatch.cpp 2015-11-14 09:39:28 UTC (rev 192456)
+++ trunk/Source/JavaScriptCore/jit/Repatch.cpp 2015-11-14 21:13:02 UTC (rev 192457)
</span><span class="lines">@@ -800,7 +800,8 @@
</span><span class="cx"> AssemblyHelpers::selectScratchGPR(calleeGPR, comparisonValueGPR, GPRInfo::regT3);
</span><span class="cx"> }
</span><span class="cx"> stubJit.move(CCallHelpers::TrustedImmPtr(fastCounts.get()), fastCountsBaseGPR);
</span><del>-
</del><ins>+ if (!frameShuffler && callLinkInfo.isTailCall())
+ stubJit.emitRestoreCalleeSaves();
</ins><span class="cx"> BinarySwitch binarySwitch(comparisonValueGPR, caseValues, BinarySwitch::IntPtr);
</span><span class="cx"> CCallHelpers::JumpList done;
</span><span class="cx"> while (binarySwitch.advance(stubJit)) {
</span><span class="lines">@@ -821,7 +822,6 @@
</span><span class="cx"> CallFrameShuffler(stubJit, frameShuffler->snapshot()).prepareForTailCall();
</span><span class="cx"> calls[caseIndex].call = stubJit.nearTailCall();
</span><span class="cx"> } else if (callLinkInfo.isTailCall()) {
</span><del>- stubJit.emitRestoreCalleeSaves();
</del><span class="cx"> stubJit.prepareForTailCallSlow();
</span><span class="cx"> calls[caseIndex].call = stubJit.nearTailCall();
</span><span class="cx"> } else
</span></span></pre>
</div>
</div>
</body>
</html>