<!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>[188556] 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/188556">188556</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2015-08-17 16:59:03 -0700 (Mon, 17 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>jsc-tailcall: REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/188071">r188071</a>): Crash when handling exception in Release builds
https://bugs.webkit.org/show_bug.cgi?id=147759
Reviewed by Basile Clement.
Fix a couple of issue to properly save and unwind callee save registers.
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::usedRegisters): Need to include the callee save registers in the
set of registers not availble for making thunks.
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::emitCall): Need to restore callee save registers before making
a slow path tail call.
* interpreter/Interpreter.cpp:
(JSC::UnwindFunctor::operator()): We need to copy the current frames callee saves to the VM
callee save register buffer when we have found the frame with the catch block.
* jit/AssemblyHelpers.h: Changed to materialize the VM::calleeSaveRegsiterBuffer with one immediate move.
* llint/LowLevelInterpreter64.asm:
(llint_throw_from_slow_path_trampoline): We need to the current callee saves registers to the
VM::calleeSaveRegsiterBuffer before we process the exception.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsctailcallSourceJavaScriptCoreChangeLog">branches/jsc-tailcall/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoredfgDFGSpeculativeJITcpp">branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoreinterpreterInterpretercpp">branches/jsc-tailcall/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCorejitAssemblyHelpersh">branches/jsc-tailcall/Source/JavaScriptCore/jit/AssemblyHelpers.h</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCorellintLowLevelInterpreter64asm">branches/jsc-tailcall/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</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 (188555 => 188556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/ChangeLog 2015-08-17 23:58:00 UTC (rev 188555)
+++ branches/jsc-tailcall/Source/JavaScriptCore/ChangeLog 2015-08-17 23:59:03 UTC (rev 188556)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-08-17 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><ins>+ jsc-tailcall: REGRESSION(r188071): Crash when handling exception in Release builds
+ https://bugs.webkit.org/show_bug.cgi?id=147759
+
+ Reviewed by Basile Clement.
+
+ Fix a couple of issue to properly save and unwind callee save registers.
+
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::usedRegisters): Need to include the callee save registers in the
+ set of registers not availble for making thunks.
+
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::emitCall): Need to restore callee save registers before making
+ a slow path tail call.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::UnwindFunctor::operator()): We need to copy the current frames callee saves to the VM
+ callee save register buffer when we have found the frame with the catch block.
+
+ * jit/AssemblyHelpers.h: Changed to materialize the VM::calleeSaveRegsiterBuffer with one immediate move.
+
+ * llint/LowLevelInterpreter64.asm:
+ (llint_throw_from_slow_path_trampoline): We need to the current callee saves registers to the
+ VM::calleeSaveRegsiterBuffer before we process the exception.
+
+2015-08-17 Michael Saboff <msaboff@apple.com>
+
</ins><span class="cx"> jsc-tailcall: Handling exception in caller frame cannot unwind past VMEntry frame
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=148076
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (188555 => 188556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-08-17 23:58:00 UTC (rev 188555)
+++ branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-08-17 23:59:03 UTC (rev 188556)
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> result.set(fpr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- result.merge(RegisterSet::specialRegisters());
</del><ins>+ result.merge(RegisterSet::nonTempRegisters());
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (188555 => 188556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-08-17 23:58:00 UTC (rev 188555)
+++ branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-08-17 23:59:03 UTC (rev 188556)
</span><span class="lines">@@ -832,6 +832,9 @@
</span><span class="cx">
</span><span class="cx"> slowPath.link(&m_jit);
</span><span class="cx">
</span><ins>+ if (isTail)
+ m_jit.emitRestoreCalleeSaves();
+
</ins><span class="cx"> m_jit.move(calleeGPR, GPRInfo::regT0); // Callee needs to be in regT0
</span><span class="cx"> m_jit.move(MacroAssembler::TrustedImmPtr(callLinkInfo), GPRInfo::regT2); // Link info needs to be in regT2
</span><span class="cx"> JITCompiler::Call slowCall = m_jit.nearCall();
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/interpreter/Interpreter.cpp (188555 => 188556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/interpreter/Interpreter.cpp 2015-08-17 23:58:00 UTC (rev 188555)
+++ branches/jsc-tailcall/Source/JavaScriptCore/interpreter/Interpreter.cpp 2015-08-17 23:59:03 UTC (rev 188556)
</span><span class="lines">@@ -634,6 +634,9 @@
</span><span class="cx"> if (!unwindCallFrame(visitor)) {
</span><span class="cx"> if (LegacyProfiler* profiler = vm.enabledProfiler())
</span><span class="cx"> profiler->exceptionUnwind(m_callFrame);
</span><ins>+
+ copyCalleeSavesToVMCalleeSavesBuffer(visitor);
+
</ins><span class="cx"> return StackVisitor::Done;
</span><span class="cx"> }
</span><span class="cx"> } else
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCorejitAssemblyHelpersh"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/jit/AssemblyHelpers.h (188555 => 188556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/jit/AssemblyHelpers.h 2015-08-17 23:58:00 UTC (rev 188555)
+++ branches/jsc-tailcall/Source/JavaScriptCore/jit/AssemblyHelpers.h 2015-08-17 23:59:03 UTC (rev 188556)
</span><span class="lines">@@ -289,8 +289,7 @@
</span><span class="cx"> ASSERT(codeBlock());
</span><span class="cx">
</span><span class="cx"> // Copy saved calleeSaves on stack or unsaved calleeSaves in register to vm calleeSave buffer
</span><del>- move(TrustedImmPtr(m_vm), temp1);
- addPtr(TrustedImm32(VM::calleeSaveRegistersBufferOffset()), temp1);
</del><ins>+ move(TrustedImmPtr(m_vm->calleeSaveRegistersBuffer), temp1);
</ins><span class="cx">
</span><span class="cx"> RegisterSaveMap* allCalleeSavesMap = m_vm->getAllCalleeSaveRegistersMap();
</span><span class="cx"> RegisterSaveMap* currentCalleeSaves = codeBlock()->calleeSaveRegisters();
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (188555 => 188556)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2015-08-17 23:58:00 UTC (rev 188555)
+++ branches/jsc-tailcall/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2015-08-17 23:59:03 UTC (rev 188556)
</span><span class="lines">@@ -1808,6 +1808,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> _llint_throw_from_slow_path_trampoline:
</span><ins>+ loadp Callee[cfr], t1
+ andp MarkedBlockMask, t1
+ loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t1], t1
+ copyCalleeSavesToVMCalleeSavesBuffer(t1, t2)
+
</ins><span class="cx"> callSlowPath(_llint_slow_path_handle_exception)
</span><span class="cx">
</span><span class="cx"> # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
</span><span class="lines">@@ -1816,7 +1821,6 @@
</span><span class="cx"> loadp Callee[cfr], t1
</span><span class="cx"> andp MarkedBlockMask, t1
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t1], t1
</span><del>- copyCalleeSavesToVMCalleeSavesBuffer(t1, t2)
</del><span class="cx"> jmp VM::targetMachinePCForThrow[t1]
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>