<!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>[202862] trunk/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/202862">202862</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-07-06 10:19:20 -0700 (Wed, 06 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename VM stack limit fields to better describe their purpose.
https://bugs.webkit.org/show_bug.cgi?id=159451
Reviewed by Keith Miller.
This is in preparation for an upcoming patch that changes what stack limit values
are used under various circumstances. This patch aims to do some minimal work to
rename the fields so that it will be easier to reason about the upcoming patch.
In this patch, we make the following changes:
1. Rename VM::m_stackLimit to VM::m_jsCPUStackLimit.
2. VM::m_jsStackLimit used to have an overloaded meaning:
a. For JIT builds, m_jsStackLimit is synonymous with m_stackLimit.
b. For C Loop builds, m_jsStackLimit is a separate pointer that points to the
emulated JS stack that the C Loop uses.
In place of m_jsStackLimit, this patch introduces 2 new fields:
VM::m_jsEmulatedStackLimit and VM::m_llintStackLimit.
m_llintStackLimit is the limit that the LLInt assembly uses for its stack
check. m_llintStackLimit behaves like the old m_jsStackLimit in that:
a. For JIT builds, m_llintStackLimit is synonymous with m_jsCPUStackLimit.
b. For C Loop builds, m_llintStackLimit is synonymous with m_jsEmulatedStackLimit.
m_jsEmulatedStackLimit is used for the emulated stack that the C Loop uses.
3. Rename the following methods to match the above:
VM::stackLimit() ==> VM::jsCPUStackLimit()
VM::addressOfStackLimit() ==> VM::addressOfJSCPUStackLimit()
VM::jsStackLimit() ==> VM::jsEmulatedStackLimit()
VM::setJSStackLimit() ==> VM::setJSEmulatedStackLimit()
JSStack::setStackLimit() ==> JSStack::setEmulatedStackLimit()
4. With change (2) and (3), the limits will be used as follows:
a. VM code doing stack recursion checks will only use m_jsCPUStackLimit.
b. JIT code will only use m_jsCPUStackLimit.
c. C Loop emulated stack code in JSStack will only use m_jsEmulatedStackLimit.
Note: the part of JSStack that operates on a JIT build will use
m_jsCPUStackLimit as expected.
d. LLINT assembly code will only use m_llintStackLimit.
This patch only contains the above refactoring changes. There is no behavior
change.
* dfg/DFGJITCompiler.cpp:
(JSC::DFG::JITCompiler::compile):
(JSC::DFG::JITCompiler::compileFunction):
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::lower):
* interpreter/JSStack.cpp:
(JSC::JSStack::JSStack):
(JSC::JSStack::growSlowCase):
(JSC::JSStack::lowAddress):
(JSC::JSStack::highAddress):
* interpreter/JSStack.h:
* interpreter/JSStackInlines.h:
(JSC::JSStack::ensureCapacityFor):
(JSC::JSStack::shrink):
(JSC::JSStack::grow):
(JSC::JSStack::setJSEmulatedStackLimit):
(JSC::JSStack::setStackLimit): Deleted.
* jit/JIT.cpp:
(JSC::JIT::compileWithoutLinking):
* jit/SetupVarargsFrame.cpp:
(JSC::emitSetupVarargsFrameFastCase):
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
* llint/LowLevelInterpreter.asm:
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
* runtime/RegExp.cpp:
(JSC::RegExp::finishCreation):
(JSC::RegExp::compile):
(JSC::RegExp::compileMatchOnly):
* runtime/VM.cpp:
(JSC::VM::VM):
(JSC::VM::updateStackLimit):
* runtime/VM.h:
(JSC::VM::reservedZoneSize):
(JSC::VM::jsCPUStackLimit):
(JSC::VM::addressOfJSCPUStackLimit):
(JSC::VM::jsEmulatedStackLimit):
(JSC::VM::setJSEmulatedStackLimit):
(JSC::VM::isSafeToRecurse):
(JSC::VM::jsStackLimit): Deleted.
(JSC::VM::setJSStackLimit): Deleted.
(JSC::VM::stackLimit): Deleted.
(JSC::VM::addressOfStackLimit): Deleted.
* wasm/WASMFunctionCompiler.h:
(JSC::WASMFunctionCompiler::startFunction):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGJITCompilercpp">trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterJSStackcpp">trunk/Source/JavaScriptCore/interpreter/JSStack.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterJSStackh">trunk/Source/JavaScriptCore/interpreter/JSStack.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterJSStackInlinesh">trunk/Source/JavaScriptCore/interpreter/JSStackInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITcpp">trunk/Source/JavaScriptCore/jit/JIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitSetupVarargsFramecpp">trunk/Source/JavaScriptCore/jit/SetupVarargsFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathscpp">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreterasm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpcpp">trunk/Source/JavaScriptCore/runtime/RegExp.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMcpp">trunk/Source/JavaScriptCore/runtime/VM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMFunctionCompilerh">trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202861 => 202862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-07-06 17:04:28 UTC (rev 202861)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-07-06 17:19:20 UTC (rev 202862)
</span><span class="lines">@@ -1,3 +1,98 @@
</span><ins>+2016-07-05 Mark Lam <mark.lam@apple.com>
+
+ Rename VM stack limit fields to better describe their purpose.
+ https://bugs.webkit.org/show_bug.cgi?id=159451
+
+ Reviewed by Keith Miller.
+
+ This is in preparation for an upcoming patch that changes what stack limit values
+ are used under various circumstances. This patch aims to do some minimal work to
+ rename the fields so that it will be easier to reason about the upcoming patch.
+
+ In this patch, we make the following changes:
+
+ 1. Rename VM::m_stackLimit to VM::m_jsCPUStackLimit.
+
+ 2. VM::m_jsStackLimit used to have an overloaded meaning:
+ a. For JIT builds, m_jsStackLimit is synonymous with m_stackLimit.
+ b. For C Loop builds, m_jsStackLimit is a separate pointer that points to the
+ emulated JS stack that the C Loop uses.
+
+ In place of m_jsStackLimit, this patch introduces 2 new fields:
+ VM::m_jsEmulatedStackLimit and VM::m_llintStackLimit.
+
+ m_llintStackLimit is the limit that the LLInt assembly uses for its stack
+ check. m_llintStackLimit behaves like the old m_jsStackLimit in that:
+ a. For JIT builds, m_llintStackLimit is synonymous with m_jsCPUStackLimit.
+ b. For C Loop builds, m_llintStackLimit is synonymous with m_jsEmulatedStackLimit.
+
+ m_jsEmulatedStackLimit is used for the emulated stack that the C Loop uses.
+
+ 3. Rename the following methods to match the above:
+ VM::stackLimit() ==> VM::jsCPUStackLimit()
+ VM::addressOfStackLimit() ==> VM::addressOfJSCPUStackLimit()
+ VM::jsStackLimit() ==> VM::jsEmulatedStackLimit()
+ VM::setJSStackLimit() ==> VM::setJSEmulatedStackLimit()
+ JSStack::setStackLimit() ==> JSStack::setEmulatedStackLimit()
+
+ 4. With change (2) and (3), the limits will be used as follows:
+ a. VM code doing stack recursion checks will only use m_jsCPUStackLimit.
+ b. JIT code will only use m_jsCPUStackLimit.
+ c. C Loop emulated stack code in JSStack will only use m_jsEmulatedStackLimit.
+ Note: the part of JSStack that operates on a JIT build will use
+ m_jsCPUStackLimit as expected.
+ d. LLINT assembly code will only use m_llintStackLimit.
+
+ This patch only contains the above refactoring changes. There is no behavior
+ change.
+
+ * dfg/DFGJITCompiler.cpp:
+ (JSC::DFG::JITCompiler::compile):
+ (JSC::DFG::JITCompiler::compileFunction):
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::lower):
+ * interpreter/JSStack.cpp:
+ (JSC::JSStack::JSStack):
+ (JSC::JSStack::growSlowCase):
+ (JSC::JSStack::lowAddress):
+ (JSC::JSStack::highAddress):
+ * interpreter/JSStack.h:
+ * interpreter/JSStackInlines.h:
+ (JSC::JSStack::ensureCapacityFor):
+ (JSC::JSStack::shrink):
+ (JSC::JSStack::grow):
+ (JSC::JSStack::setJSEmulatedStackLimit):
+ (JSC::JSStack::setStackLimit): Deleted.
+ * jit/JIT.cpp:
+ (JSC::JIT::compileWithoutLinking):
+ * jit/SetupVarargsFrame.cpp:
+ (JSC::emitSetupVarargsFrameFastCase):
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+ * llint/LowLevelInterpreter.asm:
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+ * runtime/RegExp.cpp:
+ (JSC::RegExp::finishCreation):
+ (JSC::RegExp::compile):
+ (JSC::RegExp::compileMatchOnly):
+ * runtime/VM.cpp:
+ (JSC::VM::VM):
+ (JSC::VM::updateStackLimit):
+ * runtime/VM.h:
+ (JSC::VM::reservedZoneSize):
+ (JSC::VM::jsCPUStackLimit):
+ (JSC::VM::addressOfJSCPUStackLimit):
+ (JSC::VM::jsEmulatedStackLimit):
+ (JSC::VM::setJSEmulatedStackLimit):
+ (JSC::VM::isSafeToRecurse):
+ (JSC::VM::jsStackLimit): Deleted.
+ (JSC::VM::setJSStackLimit): Deleted.
+ (JSC::VM::stackLimit): Deleted.
+ (JSC::VM::addressOfStackLimit): Deleted.
+ * wasm/WASMFunctionCompiler.h:
+ (JSC::WASMFunctionCompiler::startFunction):
+
</ins><span class="cx"> 2016-07-05 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> StackVisitor::unwindToMachineCodeBlockFrame() may unwind past a VM entry frame when catching an exception and the frame has inlined tail calls
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGJITCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp (202861 => 202862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp 2016-07-06 17:04:28 UTC (rev 202861)
+++ trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp 2016-07-06 17:19:20 UTC (rev 202862)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011, 2013-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx">
</span><span class="cx"> // Plant a check that sufficient space is available in the JSStack.
</span><span class="cx"> addPtr(TrustedImm32(virtualRegisterForLocal(m_graph.requiredRegisterCountForExecutionAndExit() - 1).offset() * sizeof(Register)), GPRInfo::callFrameRegister, GPRInfo::regT1);
</span><del>- Jump stackOverflow = branchPtr(Above, AbsoluteAddress(m_vm->addressOfStackLimit()), GPRInfo::regT1);
</del><ins>+ Jump stackOverflow = branchPtr(Above, AbsoluteAddress(m_vm->addressOfJSCPUStackLimit()), GPRInfo::regT1);
</ins><span class="cx">
</span><span class="cx"> addPtr(TrustedImm32(m_graph.stackPointerOffset() * sizeof(Register)), GPRInfo::callFrameRegister, stackPointerRegister);
</span><span class="cx"> checkStackPointerAlignment();
</span><span class="lines">@@ -405,7 +405,7 @@
</span><span class="cx"> Label fromArityCheck(this);
</span><span class="cx"> // Plant a check that sufficient space is available in the JSStack.
</span><span class="cx"> addPtr(TrustedImm32(virtualRegisterForLocal(m_graph.requiredRegisterCountForExecutionAndExit() - 1).offset() * sizeof(Register)), GPRInfo::callFrameRegister, GPRInfo::regT1);
</span><del>- Jump stackOverflow = branchPtr(Above, AbsoluteAddress(m_vm->addressOfStackLimit()), GPRInfo::regT1);
</del><ins>+ Jump stackOverflow = branchPtr(Above, AbsoluteAddress(m_vm->addressOfJSCPUStackLimit()), GPRInfo::regT1);
</ins><span class="cx">
</span><span class="cx"> // Move the stack pointer down to accommodate locals
</span><span class="cx"> addPtr(TrustedImm32(m_graph.stackPointerOffset() * sizeof(Register)), GPRInfo::callFrameRegister, stackPointerRegister);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp (202861 => 202862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2016-07-06 17:04:28 UTC (rev 202861)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2016-07-06 17:19:20 UTC (rev 202862)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> // Stack Overflow Check.
</span><span class="cx"> unsigned exitFrameSize = m_graph.requiredRegisterCountForExit() * sizeof(Register);
</span><del>- MacroAssembler::AbsoluteAddress addressOfStackLimit(vm().addressOfStackLimit());
</del><ins>+ MacroAssembler::AbsoluteAddress addressOfStackLimit(vm().addressOfJSCPUStackLimit());
</ins><span class="cx"> PatchpointValue* stackOverflowHandler = m_out.patchpoint(Void);
</span><span class="cx"> CallSiteIndex callSiteIndex = callSiteIndexForCodeOrigin(m_ftlState, CodeOrigin(0));
</span><span class="cx"> stackOverflowHandler->appendSomeRegister(m_callFrame);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterJSStackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/JSStack.cpp (202861 => 202862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/JSStack.cpp 2016-07-06 17:04:28 UTC (rev 202861)
+++ trunk/Source/JavaScriptCore/interpreter/JSStack.cpp 2016-07-06 17:19:20 UTC (rev 202862)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2013, 2014, 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008, 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> ASSERT(capacity && isPageAligned(capacity));
</span><span class="cx">
</span><span class="cx"> m_reservation = PageReservation::reserve(WTF::roundUpToMultipleOf(commitSize(), capacity), OSAllocator::JSVMStackPages);
</span><del>- setStackLimit(highAddress());
</del><ins>+ setJSEmulatedStackLimit(highAddress());
</ins><span class="cx"> m_commitTop = highAddress();
</span><span class="cx">
</span><span class="cx"> m_lastStackTop = baseOfStack();
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> // If we have already committed enough memory to satisfy this request,
</span><span class="cx"> // just update the end pointer and return.
</span><span class="cx"> if (newTopOfStackWithReservedZone >= m_commitTop) {
</span><del>- setStackLimit(newTopOfStack);
</del><ins>+ setJSEmulatedStackLimit(newTopOfStack);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> m_reservation.commit(newCommitTop, delta);
</span><span class="cx"> addToCommittedByteCount(delta);
</span><span class="cx"> m_commitTop = newCommitTop;
</span><del>- setStackLimit(newTopOfStack);
</del><ins>+ setJSEmulatedStackLimit(newTopOfStack);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> Register* JSStack::lowAddress() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(wtfThreadData().stack().isGrowingDownward());
</span><del>- return reinterpret_cast<Register*>(m_vm.stackLimit());
</del><ins>+ return reinterpret_cast<Register*>(m_vm.jsCPUStackLimit());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Register* JSStack::highAddress() const
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterJSStackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/JSStack.h (202861 => 202862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/JSStack.h 2016-07-06 17:04:28 UTC (rev 202861)
+++ trunk/Source/JavaScriptCore/interpreter/JSStack.h 2016-07-06 17:19:20 UTC (rev 202862)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2009, 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2009, 2013-2014, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> void releaseExcessCapacity();
</span><span class="cx"> void addToCommittedByteCount(long);
</span><span class="cx">
</span><del>- void setStackLimit(Register* newTopOfStack);
</del><ins>+ void setJSEmulatedStackLimit(Register* newTopOfStack);
</ins><span class="cx"> #endif // !ENABLE(JIT)
</span><span class="cx">
</span><span class="cx"> VM& m_vm;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterJSStackInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/JSStackInlines.h (202861 => 202862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/JSStackInlines.h 2016-07-06 17:04:28 UTC (rev 202861)
+++ trunk/Source/JavaScriptCore/interpreter/JSStackInlines.h 2016-07-06 17:19:20 UTC (rev 202862)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2014, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> return grow(newTopOfStack);
</span><span class="cx"> #else
</span><span class="cx"> ASSERT(wtfThreadData().stack().isGrowingDownward());
</span><del>- return newTopOfStack >= m_vm.stackLimit();
</del><ins>+ return newTopOfStack >= m_vm.jsCPUStackLimit();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> Register* newEnd = newTopOfStack - 1;
</span><span class="cx"> if (newEnd >= m_end)
</span><span class="cx"> return;
</span><del>- setStackLimit(newTopOfStack);
</del><ins>+ setJSEmulatedStackLimit(newTopOfStack);
</ins><span class="cx"> // Note: Clang complains of an unresolved linkage to maxExcessCapacity if
</span><span class="cx"> // invoke std::max() with it as an argument. To work around this, we first
</span><span class="cx"> // assign the constant to a local variable, and use the local instead.
</span><span class="lines">@@ -80,11 +80,11 @@
</span><span class="cx"> return growSlowCase(newTopOfStack);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void JSStack::setStackLimit(Register* newTopOfStack)
</del><ins>+inline void JSStack::setJSEmulatedStackLimit(Register* newTopOfStack)
</ins><span class="cx"> {
</span><span class="cx"> Register* newEnd = newTopOfStack - 1;
</span><span class="cx"> m_end = newEnd;
</span><del>- m_vm.setJSStackLimit(newTopOfStack);
</del><ins>+ m_vm.setJSEmulatedStackLimit(newTopOfStack);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // !ENABLE(JIT)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.cpp (202861 => 202862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.cpp 2016-07-06 17:04:28 UTC (rev 202861)
+++ trunk/Source/JavaScriptCore/jit/JIT.cpp 2016-07-06 17:19:20 UTC (rev 202862)
</span><span class="lines">@@ -599,7 +599,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> addPtr(TrustedImm32(stackPointerOffsetFor(m_codeBlock) * sizeof(Register)), callFrameRegister, regT1);
</span><del>- Jump stackOverflow = branchPtr(Above, AbsoluteAddress(m_vm->addressOfStackLimit()), regT1);
</del><ins>+ Jump stackOverflow = branchPtr(Above, AbsoluteAddress(m_vm->addressOfJSCPUStackLimit()), regT1);
</ins><span class="cx">
</span><span class="cx"> move(regT1, stackPointerRegister);
</span><span class="cx"> checkStackPointerAlignment();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitSetupVarargsFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/SetupVarargsFrame.cpp (202861 => 202862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/SetupVarargsFrame.cpp 2016-07-06 17:04:28 UTC (rev 202861)
+++ trunk/Source/JavaScriptCore/jit/SetupVarargsFrame.cpp 2016-07-06 17:19:20 UTC (rev 202862)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">
</span><span class="cx"> emitSetVarargsFrame(jit, scratchGPR1, true, numUsedSlotsGPR, scratchGPR2);
</span><span class="cx">
</span><del>- slowCase.append(jit.branchPtr(CCallHelpers::Above, CCallHelpers::AbsoluteAddress(jit.vm()->addressOfStackLimit()), scratchGPR2));
</del><ins>+ slowCase.append(jit.branchPtr(CCallHelpers::Above, CCallHelpers::AbsoluteAddress(jit.vm()->addressOfJSCPUStackLimit()), scratchGPR2));
</ins><span class="cx">
</span><span class="cx"> // Initialize ArgumentCount.
</span><span class="cx"> jit.store32(scratchGPR1, CCallHelpers::Address(scratchGPR2, JSStack::ArgumentCount * static_cast<int>(sizeof(Register)) + PayloadOffset));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (202861 => 202862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-07-06 17:04:28 UTC (rev 202861)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-07-06 17:19:20 UTC (rev 202862)
</span><span class="lines">@@ -484,9 +484,9 @@
</span><span class="cx"> dataLogF("Num vars = %u.\n", exec->codeBlock()->m_numVars);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><del>- dataLogF("Current end is at %p.\n", exec->vm().stackLimit());
</del><ins>+ dataLogF("Current end is at %p.\n", exec->vm().jsCPUStackLimit());
</ins><span class="cx"> #else
</span><del>- dataLogF("Current end is at %p.\n", exec->vm().jsStackLimit());
</del><ins>+ dataLogF("Current end is at %p.\n", exec->vm().jsEmulatedStackLimit());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (202861 => 202862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2016-07-06 17:04:28 UTC (rev 202861)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2016-07-06 17:19:20 UTC (rev 202862)
</span><span class="lines">@@ -951,7 +951,7 @@
</span><span class="cx"> getFrameRegisterSizeForCodeBlock(t1, t0)
</span><span class="cx"> subp cfr, t0, t0
</span><span class="cx"> loadp CodeBlock::m_vm[t1], t2
</span><del>- bpbeq VM::m_jsStackLimit[t2], t0, .stackHeightOK
</del><ins>+ bpbeq VM::m_llintStackLimit[t2], t0, .stackHeightOK
</ins><span class="cx">
</span><span class="cx"> # Stack height check failed - need to call a slow_path.
</span><span class="cx"> # Set up temporary stack pointer for call including callee saves
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (202861 => 202862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-07-06 17:04:28 UTC (rev 202861)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-07-06 17:19:20 UTC (rev 202862)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> # Ensure that we have enough additional stack capacity for the incoming args,
</span><span class="cx"> # and the frame for the JS code we're executing. We need to do this check
</span><span class="cx"> # before we start copying the args from the protoCallFrame below.
</span><del>- bpaeq t3, VM::m_jsStackLimit[vm], .stackHeightOK
</del><ins>+ bpaeq t3, VM::m_llintStackLimit[vm], .stackHeightOK
</ins><span class="cx">
</span><span class="cx"> if C_LOOP
</span><span class="cx"> move entry, t4
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (202861 => 202862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2016-07-06 17:04:28 UTC (rev 202861)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2016-07-06 17:19:20 UTC (rev 202862)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> # Ensure that we have enough additional stack capacity for the incoming args,
</span><span class="cx"> # and the frame for the JS code we're executing. We need to do this check
</span><span class="cx"> # before we start copying the args from the protoCallFrame below.
</span><del>- bpaeq t3, VM::m_jsStackLimit[vm], .stackHeightOK
</del><ins>+ bpaeq t3, VM::m_llintStackLimit[vm], .stackHeightOK
</ins><span class="cx">
</span><span class="cx"> if C_LOOP
</span><span class="cx"> move entry, t4
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExp.cpp (202861 => 202862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExp.cpp 2016-07-06 17:04:28 UTC (rev 202861)
+++ trunk/Source/JavaScriptCore/runtime/RegExp.cpp 2016-07-06 17:19:20 UTC (rev 202862)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> void RegExp::finishCreation(VM& vm)
</span><span class="cx"> {
</span><span class="cx"> Base::finishCreation(vm);
</span><del>- Yarr::YarrPattern pattern(m_patternString, m_flags, &m_constructionError, vm.stackLimit());
</del><ins>+ Yarr::YarrPattern pattern(m_patternString, m_flags, &m_constructionError, vm.jsCPUStackLimit());
</ins><span class="cx"> if (m_constructionError)
</span><span class="cx"> m_state = ParseError;
</span><span class="cx"> else
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> {
</span><span class="cx"> ConcurrentJITLocker locker(m_lock);
</span><span class="cx">
</span><del>- Yarr::YarrPattern pattern(m_patternString, m_flags, &m_constructionError, vm->stackLimit());
</del><ins>+ Yarr::YarrPattern pattern(m_patternString, m_flags, &m_constructionError, vm->jsCPUStackLimit());
</ins><span class="cx"> if (m_constructionError) {
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> #if COMPILER_QUIRK(CONSIDERS_UNREACHABLE_CODE)
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> {
</span><span class="cx"> ConcurrentJITLocker locker(m_lock);
</span><span class="cx">
</span><del>- Yarr::YarrPattern pattern(m_patternString, m_flags, &m_constructionError, vm->stackLimit());
</del><ins>+ Yarr::YarrPattern pattern(m_patternString, m_flags, &m_constructionError, vm->jsCPUStackLimit());
</ins><span class="cx"> if (m_constructionError) {
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> #if COMPILER_QUIRK(CONSIDERS_UNREACHABLE_CODE)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (202861 => 202862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2016-07-06 17:04:28 UTC (rev 202861)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2016-07-06 17:19:20 UTC (rev 202862)
</span><span class="lines">@@ -185,10 +185,6 @@
</span><span class="cx"> , m_initializingObjectClass(0)
</span><span class="cx"> #endif
</span><span class="cx"> , m_stackPointerAtVMEntry(0)
</span><del>- , m_stackLimit(0)
-#if !ENABLE(JIT)
- , m_jsStackLimit(0)
-#endif
</del><span class="cx"> , m_codeCache(std::make_unique<CodeCache>())
</span><span class="cx"> , m_builtinExecutables(std::make_unique<BuiltinExecutables>(*this))
</span><span class="cx"> , m_typeProfilerEnabledCount(0)
</span><span class="lines">@@ -654,20 +650,20 @@
</span><span class="cx"> inline void VM::updateStackLimit()
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>- void* lastStackLimit = m_stackLimit;
</del><ins>+ void* lastJSCPUStackLimit = m_jsCPUStackLimit;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (m_stackPointerAtVMEntry) {
</span><span class="cx"> ASSERT(wtfThreadData().stack().isGrowingDownward());
</span><span class="cx"> char* startOfStack = reinterpret_cast<char*>(m_stackPointerAtVMEntry);
</span><del>- m_stackLimit = wtfThreadData().stack().recursionLimit(startOfStack, Options::maxPerThreadStackUsage(), m_reservedZoneSize);
</del><ins>+ m_jsCPUStackLimit = wtfThreadData().stack().recursionLimit(startOfStack, Options::maxPerThreadStackUsage(), m_reservedZoneSize);
</ins><span class="cx"> } else {
</span><del>- m_stackLimit = wtfThreadData().stack().recursionLimit(m_reservedZoneSize);
</del><ins>+ m_jsCPUStackLimit = wtfThreadData().stack().recursionLimit(m_reservedZoneSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>- if (lastStackLimit != m_stackLimit)
- preCommitStackMemory(m_stackLimit);
</del><ins>+ if (lastJSCPUStackLimit != m_jsCPUStackLimit)
+ preCommitStackMemory(m_jsCPUStackLimit);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (202861 => 202862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2016-07-06 17:04:28 UTC (rev 202861)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2016-07-06 17:19:20 UTC (rev 202862)
</span><span class="lines">@@ -461,18 +461,18 @@
</span><span class="cx"> size_t reservedZoneSize() const { return m_reservedZoneSize; }
</span><span class="cx"> size_t updateReservedZoneSize(size_t reservedZoneSize);
</span><span class="cx">
</span><ins>+ void* jsCPUStackLimit() { return m_jsCPUStackLimit; }
+ void** addressOfJSCPUStackLimit() { return &m_jsCPUStackLimit; }
</ins><span class="cx"> #if !ENABLE(JIT)
</span><del>- void* jsStackLimit() { return m_jsStackLimit; }
- void setJSStackLimit(void* limit) { m_jsStackLimit = limit; }
</del><ins>+ void* jsEmulatedStackLimit() { return m_jsEmulatedStackLimit; }
+ void setJSEmulatedStackLimit(void* limit) { m_jsEmulatedStackLimit = limit; }
</ins><span class="cx"> #endif
</span><del>- void* stackLimit() { return m_stackLimit; }
- void** addressOfStackLimit() { return &m_stackLimit; }
</del><span class="cx">
</span><span class="cx"> bool isSafeToRecurse(size_t neededStackInBytes = 0) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(wtfThreadData().stack().isGrowingDownward());
</span><span class="cx"> int8_t* curr = reinterpret_cast<int8_t*>(&curr);
</span><del>- int8_t* limit = reinterpret_cast<int8_t*>(m_stackLimit);
</del><ins>+ int8_t* limit = reinterpret_cast<int8_t*>(m_jsCPUStackLimit);
</ins><span class="cx"> return curr >= limit && static_cast<size_t>(curr - limit) >= neededStackInBytes;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -642,20 +642,23 @@
</span><span class="cx"> #if ENABLE(GC_VALIDATION)
</span><span class="cx"> const ClassInfo* m_initializingObjectClass;
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> void* m_stackPointerAtVMEntry;
</span><span class="cx"> size_t m_reservedZoneSize;
</span><del>-#if !ENABLE(JIT)
- struct {
- void* m_stackLimit;
- void* m_jsStackLimit;
</del><ins>+#if ENABLE(JIT)
+ union {
+ void* m_jsCPUStackLimit { nullptr };
+ void* m_llintStackLimit;
</ins><span class="cx"> };
</span><span class="cx"> #else
</span><ins>+ void* m_jsCPUStackLimit { nullptr };
</ins><span class="cx"> union {
</span><del>- void* m_stackLimit;
- void* m_jsStackLimit;
</del><ins>+ void* m_jsEmulatedStackLimit { nullptr };
+ void* m_llintStackLimit;
</ins><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx"> void* m_lastStackTop;
</span><ins>+
</ins><span class="cx"> Exception* m_exception { nullptr };
</span><span class="cx"> Exception* m_lastException { nullptr };
</span><span class="cx"> bool m_failNextNewCodeBlock { false };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h (202861 => 202862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2016-07-06 17:04:28 UTC (rev 202861)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2016-07-06 17:19:20 UTC (rev 202862)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> m_beginLabel = label();
</span><span class="cx">
</span><span class="cx"> addPtr(TrustedImm32(-m_calleeSaveSpace - WTF::roundUpToMultipleOf(stackAlignmentRegisters(), m_stackHeight) * sizeof(StackSlot) - maxFrameExtentForSlowPathCall), GPRInfo::callFrameRegister, GPRInfo::regT1);
</span><del>- m_stackOverflow = branchPtr(Above, AbsoluteAddress(m_vm->addressOfStackLimit()), GPRInfo::regT1);
</del><ins>+ m_stackOverflow = branchPtr(Above, AbsoluteAddress(m_vm->addressOfJSCPUStackLimit()), GPRInfo::regT1);
</ins><span class="cx">
</span><span class="cx"> move(GPRInfo::regT1, stackPointerRegister);
</span><span class="cx"> checkStackPointerAlignment();
</span></span></pre>
</div>
</div>
</body>
</html>