<!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>[203130] 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/203130">203130</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-07-12 15:06:20 -0700 (Tue, 12 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>More stack limit and reserved zone renaming.
https://bugs.webkit.org/show_bug.cgi?id=159690
Rubber-stamped by Geoffrey Garen.
We should rename the following:
osStackLimitWithReserve => softStackLimit
reservedZoneSize => softReservedZoneSize
errorModeReservedZoneSize => reservedZoneSize
* API/tests/PingPongStackOverflowTest.cpp:
(testPingPongStackOverflow):
* dfg/DFGJITCompiler.cpp:
(JSC::DFG::JITCompiler::compile):
(JSC::DFG::JITCompiler::compileFunction):
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::lower):
* interpreter/CLoopStack.cpp:
(JSC::CLoopStack::CLoopStack):
(JSC::CLoopStack::grow):
(JSC::CLoopStack::releaseExcessCapacity):
(JSC::CLoopStack::addToCommittedByteCount):
(JSC::CLoopStack::setSoftReservedZoneSize):
(JSC::CLoopStack::setReservedZoneSize): Deleted.
* interpreter/CLoopStack.h:
(JSC::CLoopStack::size):
* interpreter/CLoopStackInlines.h:
(JSC::CLoopStack::shrink):
* 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/ErrorHandlingScope.cpp:
(JSC::ErrorHandlingScope::ErrorHandlingScope):
(JSC::ErrorHandlingScope::~ErrorHandlingScope):
* runtime/ErrorHandlingScope.h:
* runtime/Options.h:
* runtime/RegExp.cpp:
(JSC::RegExp::finishCreation):
(JSC::RegExp::compile):
(JSC::RegExp::compileMatchOnly):
* runtime/VM.cpp:
(JSC::VM::VM):
(JSC::VM::setStackPointerAtVMEntry):
(JSC::VM::updateSoftReservedZoneSize):
(JSC::VM::updateStackLimit):
(JSC::VM::updateReservedZoneSize): Deleted.
* runtime/VM.h:
(JSC::VM::stackPointerAtVMEntry):
(JSC::VM::softReservedZoneSize):
(JSC::VM::softStackLimit):
(JSC::VM::addressOfSoftStackLimit):
(JSC::VM::cloopStackLimit):
(JSC::VM::setCLoopStackLimit):
(JSC::VM::isSafeToRecurse):
(JSC::VM::reservedZoneSize): Deleted.
(JSC::VM::osStackLimitWithReserve): Deleted.
(JSC::VM::addressOfOSStackLimitWithReserve): Deleted.
* runtime/VMInlines.h:
(JSC::VM::ensureStackCapacityFor):
* wasm/WASMFunctionCompiler.h:
(JSC::WASMFunctionCompiler::startFunction):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPItestsPingPongStackOverflowTestcpp">trunk/Source/JavaScriptCore/API/tests/PingPongStackOverflowTest.cpp</a></li>
<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="#trunkSourceJavaScriptCoreinterpreterCLoopStackcpp">trunk/Source/JavaScriptCore/interpreter/CLoopStack.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterCLoopStackh">trunk/Source/JavaScriptCore/interpreter/CLoopStack.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterCLoopStackInlinesh">trunk/Source/JavaScriptCore/interpreter/CLoopStackInlines.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="#trunkSourceJavaScriptCoreruntimeErrorHandlingScopecpp">trunk/Source/JavaScriptCore/runtime/ErrorHandlingScope.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeErrorHandlingScopeh">trunk/Source/JavaScriptCore/runtime/ErrorHandlingScope.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionsh">trunk/Source/JavaScriptCore/runtime/Options.h</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="#trunkSourceJavaScriptCoreruntimeVMInlinesh">trunk/Source/JavaScriptCore/runtime/VMInlines.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="trunkSourceJavaScriptCoreAPItestsPingPongStackOverflowTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/tests/PingPongStackOverflowTest.cpp (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/tests/PingPongStackOverflowTest.cpp 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/API/tests/PingPongStackOverflowTest.cpp 2016-07-12 22:06:20 UTC (rev 203130)
</span><span class="lines">@@ -120,13 +120,13 @@
</span><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> Options::initialize(); // Ensure options is initialized first.
</span><span class="cx">
</span><ins>+ auto origSoftReservedZoneSize = Options::softReservedZoneSize();
</ins><span class="cx"> auto origReservedZoneSize = Options::reservedZoneSize();
</span><del>- auto origErrorModeReservedZoneSize = Options::errorModeReservedZoneSize();
</del><span class="cx"> auto origUseLLInt = Options::useLLInt();
</span><span class="cx"> auto origMaxPerThreadStackUsage = Options::maxPerThreadStackUsage();
</span><span class="cx">
</span><del>- Options::reservedZoneSize() = 128 * KB;
- Options::errorModeReservedZoneSize() = 64 * KB;
</del><ins>+ Options::softReservedZoneSize() = 128 * KB;
+ Options::reservedZoneSize() = 64 * KB;
</ins><span class="cx"> #if ENABLE(JIT)
</span><span class="cx"> // Normally, we want to disable the LLINT to force the use of JITted code which is necessary for
</span><span class="cx"> // reproducing the regression in https://bugs.webkit.org/show_bug.cgi?id=148749. However, we only
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> JSStringRelease(PingPongStackOverflowObjectString);
</span><span class="cx">
</span><span class="cx"> unsigned stackSize = 32 * KB;
</span><del>- Options::maxPerThreadStackUsage() = stackSize + Options::reservedZoneSize();
</del><ins>+ Options::maxPerThreadStackUsage() = stackSize + Options::softReservedZoneSize();
</ins><span class="cx">
</span><span class="cx"> exception = nullptr;
</span><span class="cx"> scriptResult = JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception);
</span><span class="lines">@@ -173,8 +173,8 @@
</span><span class="cx"> printf("PASS: PingPongStackOverflow test.\n");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ Options::softReservedZoneSize() = origSoftReservedZoneSize;
</ins><span class="cx"> Options::reservedZoneSize() = origReservedZoneSize;
</span><del>- Options::errorModeReservedZoneSize() = origErrorModeReservedZoneSize;
</del><span class="cx"> Options::useLLInt() = origUseLLInt;
</span><span class="cx"> Options::maxPerThreadStackUsage() = origMaxPerThreadStackUsage;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-07-12 22:06:20 UTC (rev 203130)
</span><span class="lines">@@ -1,3 +1,73 @@
</span><ins>+2016-07-12 Mark Lam <mark.lam@apple.com>
+
+ More stack limit and reserved zone renaming.
+ https://bugs.webkit.org/show_bug.cgi?id=159690
+
+ Rubber-stamped by Geoffrey Garen.
+
+ We should rename the following:
+ osStackLimitWithReserve => softStackLimit
+ reservedZoneSize => softReservedZoneSize
+ errorModeReservedZoneSize => reservedZoneSize
+
+ * API/tests/PingPongStackOverflowTest.cpp:
+ (testPingPongStackOverflow):
+ * dfg/DFGJITCompiler.cpp:
+ (JSC::DFG::JITCompiler::compile):
+ (JSC::DFG::JITCompiler::compileFunction):
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::lower):
+ * interpreter/CLoopStack.cpp:
+ (JSC::CLoopStack::CLoopStack):
+ (JSC::CLoopStack::grow):
+ (JSC::CLoopStack::releaseExcessCapacity):
+ (JSC::CLoopStack::addToCommittedByteCount):
+ (JSC::CLoopStack::setSoftReservedZoneSize):
+ (JSC::CLoopStack::setReservedZoneSize): Deleted.
+ * interpreter/CLoopStack.h:
+ (JSC::CLoopStack::size):
+ * interpreter/CLoopStackInlines.h:
+ (JSC::CLoopStack::shrink):
+ * 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/ErrorHandlingScope.cpp:
+ (JSC::ErrorHandlingScope::ErrorHandlingScope):
+ (JSC::ErrorHandlingScope::~ErrorHandlingScope):
+ * runtime/ErrorHandlingScope.h:
+ * runtime/Options.h:
+ * runtime/RegExp.cpp:
+ (JSC::RegExp::finishCreation):
+ (JSC::RegExp::compile):
+ (JSC::RegExp::compileMatchOnly):
+ * runtime/VM.cpp:
+ (JSC::VM::VM):
+ (JSC::VM::setStackPointerAtVMEntry):
+ (JSC::VM::updateSoftReservedZoneSize):
+ (JSC::VM::updateStackLimit):
+ (JSC::VM::updateReservedZoneSize): Deleted.
+ * runtime/VM.h:
+ (JSC::VM::stackPointerAtVMEntry):
+ (JSC::VM::softReservedZoneSize):
+ (JSC::VM::softStackLimit):
+ (JSC::VM::addressOfSoftStackLimit):
+ (JSC::VM::cloopStackLimit):
+ (JSC::VM::setCLoopStackLimit):
+ (JSC::VM::isSafeToRecurse):
+ (JSC::VM::reservedZoneSize): Deleted.
+ (JSC::VM::osStackLimitWithReserve): Deleted.
+ (JSC::VM::addressOfOSStackLimitWithReserve): Deleted.
+ * runtime/VMInlines.h:
+ (JSC::VM::ensureStackCapacityFor):
+ * wasm/WASMFunctionCompiler.h:
+ (JSC::WASMFunctionCompiler::startFunction):
+
</ins><span class="cx"> 2016-07-12 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE_CSS3_TEXT_LINE_BREAK flag
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGJITCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp 2016-07-12 22:06:20 UTC (rev 203130)
</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->addressOfOSStackLimitWithReserve()), GPRInfo::regT1);
</del><ins>+ Jump stackOverflow = branchPtr(Above, AbsoluteAddress(m_vm->addressOfSoftStackLimit()), 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->addressOfOSStackLimitWithReserve()), GPRInfo::regT1);
</del><ins>+ Jump stackOverflow = branchPtr(Above, AbsoluteAddress(m_vm->addressOfSoftStackLimit()), 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 (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2016-07-12 22:06:20 UTC (rev 203130)
</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().addressOfOSStackLimitWithReserve());
</del><ins>+ MacroAssembler::AbsoluteAddress addressOfStackLimit(vm().addressOfSoftStackLimit());
</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="trunkSourceJavaScriptCoreinterpreterCLoopStackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/CLoopStack.cpp (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/CLoopStack.cpp 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/interpreter/CLoopStack.cpp 2016-07-12 22:06:20 UTC (rev 203130)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> : m_vm(vm)
</span><span class="cx"> , m_topCallFrame(vm.topCallFrame)
</span><span class="cx"> , m_end(0)
</span><del>- , m_reservedZoneSizeInRegisters(0)
</del><ins>+ , m_softReservedZoneSizeInRegisters(0)
</ins><span class="cx"> {
</span><span class="cx"> size_t capacity = Options::maxPerThreadStackUsage();
</span><span class="cx"> ASSERT(capacity && isPageAligned(capacity));
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> bool CLoopStack::grow(Register* newTopOfStack)
</span><span class="cx"> {
</span><del>- Register* newTopOfStackWithReservedZone = newTopOfStack - m_reservedZoneSizeInRegisters;
</del><ins>+ Register* newTopOfStackWithReservedZone = newTopOfStack - m_softReservedZoneSizeInRegisters;
</ins><span class="cx">
</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="lines">@@ -126,7 +126,7 @@
</span><span class="cx">
</span><span class="cx"> void CLoopStack::releaseExcessCapacity()
</span><span class="cx"> {
</span><del>- Register* highAddressWithReservedZone = highAddress() - m_reservedZoneSizeInRegisters;
</del><ins>+ Register* highAddressWithReservedZone = highAddress() - m_softReservedZoneSizeInRegisters;
</ins><span class="cx"> ptrdiff_t delta = reinterpret_cast<char*>(highAddressWithReservedZone) - reinterpret_cast<char*>(m_commitTop);
</span><span class="cx"> m_reservation.decommit(m_commitTop, delta);
</span><span class="cx"> addToCommittedByteCount(-delta);
</span><span class="lines">@@ -140,10 +140,10 @@
</span><span class="cx"> committedBytesCount += byteCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CLoopStack::setReservedZoneSize(size_t reservedZoneSize)
</del><ins>+void CLoopStack::setSoftReservedZoneSize(size_t reservedZoneSize)
</ins><span class="cx"> {
</span><del>- m_reservedZoneSizeInRegisters = reservedZoneSize / sizeof(Register);
- if (m_commitTop >= (m_end + 1) - m_reservedZoneSizeInRegisters)
</del><ins>+ m_softReservedZoneSizeInRegisters = reservedZoneSize / sizeof(Register);
+ if (m_commitTop >= (m_end + 1) - m_softReservedZoneSizeInRegisters)
</ins><span class="cx"> grow(m_end + 1);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterCLoopStackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/CLoopStack.h (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/CLoopStack.h 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/interpreter/CLoopStack.h 2016-07-12 22:06:20 UTC (rev 203130)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> size_t size() const { return highAddress() - lowAddress(); }
</span><span class="cx">
</span><del>- void setReservedZoneSize(size_t);
</del><ins>+ void setSoftReservedZoneSize(size_t);
</ins><span class="cx">
</span><span class="cx"> inline Register* topOfStack();
</span><span class="cx">
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> Register* m_commitTop;
</span><span class="cx"> PageReservation m_reservation;
</span><span class="cx"> Register* m_lastStackTop;
</span><del>- ptrdiff_t m_reservedZoneSizeInRegisters;
</del><ins>+ ptrdiff_t m_softReservedZoneSizeInRegisters;
</ins><span class="cx">
</span><span class="cx"> friend class LLIntOffsetsExtractor;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterCLoopStackInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/CLoopStackInlines.h (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/CLoopStackInlines.h 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/interpreter/CLoopStackInlines.h 2016-07-12 22:06:20 UTC (rev 203130)
</span><span class="lines">@@ -64,7 +64,7 @@
</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="cx"> ptrdiff_t maxExcessCapacity = CLoopStack::maxExcessCapacity;
</span><del>- ptrdiff_t maxExcessInRegisters = std::max(maxExcessCapacity, m_reservedZoneSizeInRegisters);
</del><ins>+ ptrdiff_t maxExcessInRegisters = std::max(maxExcessCapacity, m_softReservedZoneSizeInRegisters);
</ins><span class="cx"> if (m_end == baseOfStack() && (highAddress() - m_commitTop) >= maxExcessInRegisters)
</span><span class="cx"> releaseExcessCapacity();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.cpp (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.cpp 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/jit/JIT.cpp 2016-07-12 22:06:20 UTC (rev 203130)
</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->addressOfOSStackLimitWithReserve()), regT1);
</del><ins>+ Jump stackOverflow = branchPtr(Above, AbsoluteAddress(m_vm->addressOfSoftStackLimit()), 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 (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/SetupVarargsFrame.cpp 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/jit/SetupVarargsFrame.cpp 2016-07-12 22:06:20 UTC (rev 203130)
</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()->addressOfOSStackLimitWithReserve()), scratchGPR2));
</del><ins>+ slowCase.append(jit.branchPtr(CCallHelpers::Above, CCallHelpers::AbsoluteAddress(jit.vm()->addressOfSoftStackLimit()), scratchGPR2));
</ins><span class="cx">
</span><span class="cx"> // Initialize ArgumentCount.
</span><span class="cx"> jit.store32(scratchGPR1, CCallHelpers::Address(scratchGPR2, CallFrameSlot::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 (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-07-12 22:06:20 UTC (rev 203130)
</span><span class="lines">@@ -483,7 +483,7 @@
</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().osStackLimitWithReserve());
</del><ins>+ dataLogF("Current end is at %p.\n", exec->vm().softStackLimit());
</ins><span class="cx"> #else
</span><span class="cx"> dataLogF("Current end is at %p.\n", exec->vm().cloopStackLimit());
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2016-07-12 22:06:20 UTC (rev 203130)
</span><span class="lines">@@ -954,7 +954,7 @@
</span><span class="cx"> if C_LOOP
</span><span class="cx"> bpbeq VM::m_cloopStackLimit[t2], t0, .stackHeightOK
</span><span class="cx"> else
</span><del>- bpbeq VM::m_osStackLimitWithReserve[t2], t0, .stackHeightOK
</del><ins>+ bpbeq VM::m_softStackLimit[t2], t0, .stackHeightOK
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> # Stack height check failed - need to call a slow_path.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-07-12 22:06:20 UTC (rev 203130)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> if C_LOOP
</span><span class="cx"> bpaeq t3, VM::m_cloopStackLimit[vm], .stackHeightOK
</span><span class="cx"> else
</span><del>- bpaeq t3, VM::m_osStackLimitWithReserve[vm], .stackHeightOK
</del><ins>+ bpaeq t3, VM::m_softStackLimit[vm], .stackHeightOK
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> if C_LOOP
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2016-07-12 22:06:20 UTC (rev 203130)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> if C_LOOP
</span><span class="cx"> bpaeq t3, VM::m_cloopStackLimit[vm], .stackHeightOK
</span><span class="cx"> else
</span><del>- bpaeq t3, VM::m_osStackLimitWithReserve[vm], .stackHeightOK
</del><ins>+ bpaeq t3, VM::m_softStackLimit[vm], .stackHeightOK
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> if C_LOOP
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeErrorHandlingScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ErrorHandlingScope.cpp (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ErrorHandlingScope.cpp 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/runtime/ErrorHandlingScope.cpp 2016-07-12 22:06:20 UTC (rev 203130)
</span><span class="lines">@@ -35,14 +35,14 @@
</span><span class="cx"> : m_vm(vm)
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(m_vm.stackPointerAtVMEntry());
</span><del>- size_t newReservedZoneSize = Options::errorModeReservedZoneSize();
- m_savedReservedZoneSize = m_vm.updateReservedZoneSize(newReservedZoneSize);
</del><ins>+ size_t newSoftReservedZoneSize = Options::reservedZoneSize();
+ m_savedSoftReservedZoneSize = m_vm.updateSoftReservedZoneSize(newSoftReservedZoneSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ErrorHandlingScope::~ErrorHandlingScope()
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(m_vm.stackPointerAtVMEntry());
</span><del>- m_vm.updateReservedZoneSize(m_savedReservedZoneSize);
</del><ins>+ m_vm.updateSoftReservedZoneSize(m_savedSoftReservedZoneSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeErrorHandlingScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ErrorHandlingScope.h (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ErrorHandlingScope.h 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/runtime/ErrorHandlingScope.h 2016-07-12 22:06:20 UTC (rev 203130)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> JS_EXPORT_PRIVATE ~ErrorHandlingScope();
</span><span class="cx"> private:
</span><span class="cx"> VM& m_vm;
</span><del>- size_t m_savedReservedZoneSize;
</del><ins>+ size_t m_savedSoftReservedZoneSize;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2016-07-12 22:06:20 UTC (rev 203130)
</span><span class="lines">@@ -112,9 +112,9 @@
</span><span class="cx"> \
</span><span class="cx"> v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
</span><span class="cx"> \
</span><del>- v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, nullptr) \
- v(unsigned, reservedZoneSize, 128 * KB, Normal, nullptr) \
- v(unsigned, errorModeReservedZoneSize, 64 * KB, Normal, nullptr) \
</del><ins>+ v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \
+ v(unsigned, softReservedZoneSize, 128 * KB, Normal, "The amount of stack JSC usually reserves for host code.") \
+ v(unsigned, reservedZoneSize, 64 * KB, Normal, "This is the amount of stack JSC guarantees for client and VM code.") \
</ins><span class="cx"> \
</span><span class="cx"> v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
</span><span class="cx"> v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExp.cpp (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExp.cpp 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/runtime/RegExp.cpp 2016-07-12 22:06:20 UTC (rev 203130)
</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.osStackLimitWithReserve());
</del><ins>+ Yarr::YarrPattern pattern(m_patternString, m_flags, &m_constructionError, vm.softStackLimit());
</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->osStackLimitWithReserve());
</del><ins>+ Yarr::YarrPattern pattern(m_patternString, m_flags, &m_constructionError, vm->softStackLimit());
</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->osStackLimitWithReserve());
</del><ins>+ Yarr::YarrPattern pattern(m_patternString, m_flags, &m_constructionError, vm->softStackLimit());
</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 (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2016-07-12 22:06:20 UTC (rev 203130)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> {
</span><span class="cx"> interpreter = new Interpreter(*this);
</span><span class="cx"> StackBounds stack = wtfThreadData().stack();
</span><del>- updateReservedZoneSize(Options::reservedZoneSize());
</del><ins>+ updateSoftReservedZoneSize(Options::softReservedZoneSize());
</ins><span class="cx"> setLastStackTop(stack.origin());
</span><span class="cx">
</span><span class="cx"> // Need to be careful to keep everything consistent here
</span><span class="lines">@@ -613,17 +613,17 @@
</span><span class="cx"> updateStackLimit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-size_t VM::updateReservedZoneSize(size_t reservedZoneSize)
</del><ins>+size_t VM::updateSoftReservedZoneSize(size_t softReservedZoneSize)
</ins><span class="cx"> {
</span><del>- size_t oldReservedZoneSize = m_reservedZoneSize;
- m_reservedZoneSize = reservedZoneSize;
</del><ins>+ size_t oldSoftReservedZoneSize = m_currentSoftReservedZoneSize;
+ m_currentSoftReservedZoneSize = softReservedZoneSize;
</ins><span class="cx"> #if !ENABLE(JIT)
</span><del>- interpreter->cloopStack().setReservedZoneSize(reservedZoneSize);
</del><ins>+ interpreter->cloopStack().setSoftReservedZoneSize(softReservedZoneSize);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> updateStackLimit();
</span><span class="cx">
</span><del>- return oldReservedZoneSize;
</del><ins>+ return oldSoftReservedZoneSize;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="lines">@@ -654,20 +654,20 @@
</span><span class="cx"> inline void VM::updateStackLimit()
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>- void* lastOSStackLimitWithReserve = m_osStackLimitWithReserve;
</del><ins>+ void* lastSoftStackLimit = m_softStackLimit;
</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_osStackLimitWithReserve = wtfThreadData().stack().recursionLimit(startOfStack, Options::maxPerThreadStackUsage(), m_reservedZoneSize);
</del><ins>+ m_softStackLimit = wtfThreadData().stack().recursionLimit(startOfStack, Options::maxPerThreadStackUsage(), m_currentSoftReservedZoneSize);
</ins><span class="cx"> } else {
</span><del>- m_osStackLimitWithReserve = wtfThreadData().stack().recursionLimit(m_reservedZoneSize);
</del><ins>+ m_softStackLimit = wtfThreadData().stack().recursionLimit(m_currentSoftReservedZoneSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>- if (lastOSStackLimitWithReserve != m_osStackLimitWithReserve)
- preCommitStackMemory(m_osStackLimitWithReserve);
</del><ins>+ if (lastSoftStackLimit != m_softStackLimit)
+ preCommitStackMemory(m_softStackLimit);
</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 (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2016-07-12 22:06:20 UTC (rev 203130)
</span><span class="lines">@@ -459,14 +459,14 @@
</span><span class="cx"> void* stackPointerAtVMEntry() const { return m_stackPointerAtVMEntry; }
</span><span class="cx"> void setStackPointerAtVMEntry(void*);
</span><span class="cx">
</span><del>- size_t reservedZoneSize() const { return m_reservedZoneSize; }
- size_t updateReservedZoneSize(size_t reservedZoneSize);
</del><ins>+ size_t softReservedZoneSize() const { return m_currentSoftReservedZoneSize; }
+ size_t updateSoftReservedZoneSize(size_t softReservedZoneSize);
</ins><span class="cx">
</span><span class="cx"> static size_t committedStackByteCount();
</span><span class="cx"> inline bool ensureStackCapacityFor(Register* newTopOfStack);
</span><span class="cx">
</span><del>- void* osStackLimitWithReserve() { return m_osStackLimitWithReserve; }
- void** addressOfOSStackLimitWithReserve() { return &m_osStackLimitWithReserve; }
</del><ins>+ void* softStackLimit() { return m_softStackLimit; }
+ void** addressOfSoftStackLimit() { return &m_softStackLimit; }
</ins><span class="cx"> #if !ENABLE(JIT)
</span><span class="cx"> void* cloopStackLimit() { return m_cloopStackLimit; }
</span><span class="cx"> void setCLoopStackLimit(void* limit) { m_cloopStackLimit = limit; }
</span><span class="lines">@@ -476,7 +476,7 @@
</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_osStackLimitWithReserve);
</del><ins>+ int8_t* limit = reinterpret_cast<int8_t*>(m_softStackLimit);
</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">@@ -648,8 +648,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void* m_stackPointerAtVMEntry;
</span><del>- size_t m_reservedZoneSize;
- void* m_osStackLimitWithReserve { nullptr };
</del><ins>+ size_t m_currentSoftReservedZoneSize;
+ void* m_softStackLimit { nullptr };
</ins><span class="cx"> #if !ENABLE(JIT)
</span><span class="cx"> void* m_cloopStackLimit { nullptr };
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VMInlines.h (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VMInlines.h 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/runtime/VMInlines.h 2016-07-12 22:06:20 UTC (rev 203130)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx"> ASSERT(wtfThreadData().stack().isGrowingDownward());
</span><del>- return newTopOfStack >= m_osStackLimitWithReserve;
</del><ins>+ return newTopOfStack >= m_softStackLimit;
</ins><span class="cx"> #else
</span><span class="cx"> return interpreter->cloopStack().ensureCapacityFor(newTopOfStack);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h (203129 => 203130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2016-07-12 21:51:19 UTC (rev 203129)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2016-07-12 22:06:20 UTC (rev 203130)
</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->addressOfOSStackLimitWithReserve()), GPRInfo::regT1);
</del><ins>+ m_stackOverflow = branchPtr(Above, AbsoluteAddress(m_vm->addressOfSoftStackLimit()), 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>