<!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>[187767] 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/187767">187767</a></dd>
<dt>Author</dt> <dd>basile_clement@apple.com</dd>
<dt>Date</dt> <dd>2015-08-03 14:39:27 -0700 (Mon, 03 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>jsc-tailcall: Kraken/stanford-crypto-ccm crashes
https://bugs.webkit.org/show_bug.cgi?id=147561
Reviewed by Michael Saboff.
When performing a tail call, we assume that if the top of the tail
caller's frame is not stack-aligned, we can use the stack slot above it
in case we need to move the top of the frame. However, we don't enforce
this when actually performing a call, which leads to interesting (and
crashing) situations. We are already enforcing this in the "special
call" cases (calls from native code, inlined cache calls, etc.), so
this is just a matter of making sure the bytecode generator, DFG and
FTL ensure proper padding.
* bytecompiler/NodesCodegen.cpp:
(JSC::CallArguments::CallArguments):
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::addCallWithoutSettingResult):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::compileCallOrConstruct):
* tests/stress/mutual-tail-call-no-stack-overflow.js:
(odd):
(even):
* tests/stress/tail-calls-dont-overwrite-live-stack.js: Added.
(tail):
(obj.method):
(obj.get fromNative):
(getThis):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsctailcallSourceJavaScriptCoreChangeLog">branches/jsc-tailcall/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCorebytecompilerNodesCodegencpp">branches/jsc-tailcall/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoredfgDFGByteCodeParsercpp">branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">branches/jsc-tailcall/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoretestsstressmutualtailcallnostackoverflowjs">branches/jsc-tailcall/Source/JavaScriptCore/tests/stress/mutual-tail-call-no-stack-overflow.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchesjsctailcallSourceJavaScriptCoretestsstresstailcallsdontoverwritelivestackjs">branches/jsc-tailcall/Source/JavaScriptCore/tests/stress/tail-calls-dont-overwrite-live-stack.js</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 (187766 => 187767)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/ChangeLog 2015-08-03 21:37:36 UTC (rev 187766)
+++ branches/jsc-tailcall/Source/JavaScriptCore/ChangeLog 2015-08-03 21:39:27 UTC (rev 187767)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2015-08-03 Basile Clement <basile_clement@apple.com>
</span><span class="cx">
</span><ins>+ jsc-tailcall: Kraken/stanford-crypto-ccm crashes
+ https://bugs.webkit.org/show_bug.cgi?id=147561
+
+ Reviewed by Michael Saboff.
+
+ When performing a tail call, we assume that if the top of the tail
+ caller's frame is not stack-aligned, we can use the stack slot above it
+ in case we need to move the top of the frame. However, we don't enforce
+ this when actually performing a call, which leads to interesting (and
+ crashing) situations. We are already enforcing this in the "special
+ call" cases (calls from native code, inlined cache calls, etc.), so
+ this is just a matter of making sure the bytecode generator, DFG and
+ FTL ensure proper padding.
+
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::CallArguments::CallArguments):
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::addCallWithoutSettingResult):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileCallOrConstruct):
+ * tests/stress/mutual-tail-call-no-stack-overflow.js:
+ (odd):
+ (even):
+ * tests/stress/tail-calls-dont-overwrite-live-stack.js: Added.
+ (tail):
+ (obj.method):
+ (obj.get fromNative):
+ (getThis):
+
+2015-08-03 Basile Clement <basile_clement@apple.com>
+
</ins><span class="cx"> jsc-tailcall: Get and put inline caches are not properly restoring the stack pointer
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147583
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (187766 => 187767)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-08-03 21:37:36 UTC (rev 187766)
+++ branches/jsc-tailcall/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-08-03 21:39:27 UTC (rev 187767)
</span><span class="lines">@@ -675,6 +675,12 @@
</span><span class="cx"> m_argv[i] = generator.newTemporary();
</span><span class="cx"> ASSERT(static_cast<size_t>(i) == m_argv.size() - 1 || m_argv[i]->index() == m_argv[i + 1]->index() - 1);
</span><span class="cx"> }
</span><ins>+
+ // We need to ensure that the frame size is stack-aligned
+ while ((JSStack::CallFrameHeaderSize + m_argv.size()) % stackAlignmentRegisters()) {
+ m_argv.insert(0, generator.newTemporary());
+ m_padding++;
+ }
</ins><span class="cx">
</span><span class="cx"> while (stackOffset() % stackAlignmentRegisters()) {
</span><span class="cx"> m_argv.insert(0, generator.newTemporary());
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (187766 => 187767)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-08-03 21:37:36 UTC (rev 187766)
+++ branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-08-03 21:39:27 UTC (rev 187767)
</span><span class="lines">@@ -683,7 +683,10 @@
</span><span class="cx"> SpeculatedType prediction)
</span><span class="cx"> {
</span><span class="cx"> addVarArgChild(callee);
</span><del>- size_t parameterSlots = JSStack::CallFrameHeaderSize - JSStack::CallerFrameAndPCSize + argCount;
</del><ins>+ size_t frameSize = JSStack::CallFrameHeaderSize + argCount;
+ size_t alignedFrameSize = WTF::roundUpToMultipleOf(stackAlignmentRegisters(), frameSize);
+ size_t parameterSlots = alignedFrameSize - JSStack::CallerFrameAndPCSize;
+
</ins><span class="cx"> if (parameterSlots > m_parameterSlots)
</span><span class="cx"> m_parameterSlots = parameterSlots;
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (187766 => 187767)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-08-03 21:37:36 UTC (rev 187766)
+++ branches/jsc-tailcall/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-08-03 21:39:27 UTC (rev 187767)
</span><span class="lines">@@ -4320,24 +4320,29 @@
</span><span class="cx">
</span><span class="cx"> void compileCallOrConstruct()
</span><span class="cx"> {
</span><del>- int numPassedArgs = m_node->numChildren() - 1;
- int numArgs = numPassedArgs;
</del><ins>+ int numArgs = m_node->numChildren() - 1;
</ins><span class="cx">
</span><span class="cx"> LValue jsCallee = lowJSValue(m_graph.varArgChild(m_node, 0));
</span><span class="cx">
</span><span class="cx"> unsigned stackmapID = m_stackmapIDs++;
</span><del>-
</del><ins>+
+ unsigned frameSize = JSStack::CallFrameHeaderSize + numArgs;
+ unsigned alignedFrameSize = WTF::roundUpToMultipleOf(stackAlignmentRegisters(), frameSize);
+ unsigned padding = alignedFrameSize - frameSize;
+
</ins><span class="cx"> Vector<LValue> arguments;
</span><span class="cx"> arguments.append(m_out.constInt64(stackmapID));
</span><span class="cx"> arguments.append(m_out.constInt32(sizeOfCall()));
</span><span class="cx"> arguments.append(constNull(m_out.ref8));
</span><del>- arguments.append(m_out.constInt32(1 + JSStack::CallFrameHeaderSize - JSStack::CallerFrameAndPCSize + numArgs));
</del><ins>+ arguments.append(m_out.constInt32(1 + alignedFrameSize - JSStack::CallerFrameAndPCSize));
</ins><span class="cx"> arguments.append(jsCallee); // callee -> %rax
</span><span class="cx"> arguments.append(getUndef(m_out.int64)); // code block
</span><span class="cx"> arguments.append(jsCallee); // callee -> stack
</span><span class="cx"> arguments.append(m_out.constInt64(numArgs)); // argument count and zeros for the tag
</span><del>- for (int i = 0; i < numPassedArgs; ++i)
</del><ins>+ for (int i = 0; i < numArgs; ++i)
</ins><span class="cx"> arguments.append(lowJSValue(m_graph.varArgChild(m_node, 1 + i)));
</span><ins>+ for (unsigned i = 0; i < padding; ++i)
+ arguments.append(getUndef(m_out.int64));
</ins><span class="cx">
</span><span class="cx"> callPreflight();
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoretestsstressmutualtailcallnostackoverflowjs"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/tests/stress/mutual-tail-call-no-stack-overflow.js (187766 => 187767)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/tests/stress/mutual-tail-call-no-stack-overflow.js 2015-08-03 21:37:36 UTC (rev 187766)
+++ branches/jsc-tailcall/Source/JavaScriptCore/tests/stress/mutual-tail-call-no-stack-overflow.js 2015-08-03 21:39:27 UTC (rev 187767)
</span><span class="lines">@@ -55,3 +55,17 @@
</span><span class="cx">
</span><span class="cx"> shouldThrow(function () { sloppyCountdown(100000); }, "RangeError: Maximum call stack size exceeded.");
</span><span class="cx"> strictCountdown(100000);
</span><ins>+
+// Parity alterning
+function odd(n) {
+ "use strict";
+ if (n > 0)
+ return even(n, 0);
+}
+
+function even(n) {
+ "use strict";
+ return odd(n - 1);
+}
+
+odd(100000);
</ins></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoretestsstresstailcallsdontoverwritelivestackjs"></a>
<div class="addfile"><h4>Added: branches/jsc-tailcall/Source/JavaScriptCore/tests/stress/tail-calls-dont-overwrite-live-stack.js (0 => 187767)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/tests/stress/tail-calls-dont-overwrite-live-stack.js (rev 0)
+++ branches/jsc-tailcall/Source/JavaScriptCore/tests/stress/tail-calls-dont-overwrite-live-stack.js 2015-08-03 21:39:27 UTC (rev 187767)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+"use strict";
+
+function tail(a, b) { }
+noInline(tail);
+
+var obj = {
+ method: function (x) {
+ return tail(x, x);
+ },
+
+ get fromNative() { return tail(0, 0); }
+};
+noInline(obj.method);
+
+function getThis(x) { return this; }
+noInline(getThis);
+
+for (var i = 0; i < 10000; ++i) {
+ var that = getThis(obj.method(42));
+
+ if (!Object.is(that, undefined))
+ throw new Error("Wrong 'this' value in call, expected undefined but got " + that);
+
+ that = getThis(obj.method(...[42]));
+ if (!Object.is(that, undefined))
+ throw new Error("Wrong 'this' value in varargs call, expected undefined but got " + that);
+
+ if (!Object.is(obj.fromNative, undefined))
+ throw new Error("Wrong 'fromNative' value, expected undefined but got " + obj.fromNative);
+}
</ins></span></pre>
</div>
</div>
</body>
</html>