<!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>[163964] 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/163964">163964</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-02-12 10:40:35 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adjust VM::stackLimit based on the size of the largest FTL stack produced
https://bugs.webkit.org/show_bug.cgi?id=128562
Reviewed by Mark Lam.
Added VM::m_largestFTLStackSize to track the largest stack size of an FTL compiled
function. Added VM::m_ftlStackLimit for FTL functions stack limit. Renamed
VM::updateStackLimitWithReservedZoneSize to VM::updateReservedZoneSize. Renamed
VM::setStackLimit to VM::updateStackLimit and changed it to do the updating of the
stack limits, including taking into account m_largestFTLStackSize.
* ftl/FTLJITFinalizer.cpp:
(JSC::FTL::JITFinalizer::finalizeFunction):
* runtime/ErrorHandlingScope.cpp:
(JSC::ErrorHandlingScope::ErrorHandlingScope):
(JSC::ErrorHandlingScope::~ErrorHandlingScope):
* runtime/JSLock.cpp:
(JSC::JSLock::lock):
(JSC::JSLock::unlock):
(JSC::JSLock::grabAllLocks):
* runtime/VM.cpp:
(JSC::VM::VM):
(JSC::VM::updateReservedZoneSize):
(JSC::VM::updateStackLimit):
(JSC::VM::updateFTLLargestStackSize):
* runtime/VM.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLJITFinalizercpp">trunk/Source/JavaScriptCore/ftl/FTLJITFinalizer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeErrorHandlingScopecpp">trunk/Source/JavaScriptCore/runtime/ErrorHandlingScope.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSLockcpp">trunk/Source/JavaScriptCore/runtime/JSLock.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163963 => 163964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-12 18:17:47 UTC (rev 163963)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-12 18:40:35 UTC (rev 163964)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-02-12 Michael Saboff <msaboff@apple.com>
+
+ Adjust VM::stackLimit based on the size of the largest FTL stack produced
+ https://bugs.webkit.org/show_bug.cgi?id=128562
+
+ Reviewed by Mark Lam.
+
+ Added VM::m_largestFTLStackSize to track the largest stack size of an FTL compiled
+ function. Added VM::m_ftlStackLimit for FTL functions stack limit. Renamed
+ VM::updateStackLimitWithReservedZoneSize to VM::updateReservedZoneSize. Renamed
+ VM::setStackLimit to VM::updateStackLimit and changed it to do the updating of the
+ stack limits, including taking into account m_largestFTLStackSize.
+
+ * ftl/FTLJITFinalizer.cpp:
+ (JSC::FTL::JITFinalizer::finalizeFunction):
+ * runtime/ErrorHandlingScope.cpp:
+ (JSC::ErrorHandlingScope::ErrorHandlingScope):
+ (JSC::ErrorHandlingScope::~ErrorHandlingScope):
+ * runtime/JSLock.cpp:
+ (JSC::JSLock::lock):
+ (JSC::JSLock::unlock):
+ (JSC::JSLock::grabAllLocks):
+ * runtime/VM.cpp:
+ (JSC::VM::VM):
+ (JSC::VM::updateReservedZoneSize):
+ (JSC::VM::updateStackLimit):
+ (JSC::VM::updateFTLLargestStackSize):
+ * runtime/VM.h:
+
</ins><span class="cx"> 2014-02-11 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Make it possible to implement JS builtins in JS
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLJITFinalizercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLJITFinalizer.cpp (163963 => 163964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLJITFinalizer.cpp 2014-02-12 18:17:47 UTC (rev 163963)
+++ trunk/Source/JavaScriptCore/ftl/FTLJITFinalizer.cpp 2014-02-12 18:40:35 UTC (rev 163964)
</span><span class="lines">@@ -136,7 +136,9 @@
</span><span class="cx"> ("FTL entrypoint thunk for %s with LLVM generated code at %p", toCString(CodeBlockWithJITType(m_plan.codeBlock.get(), JITCode::FTLJIT)).data(), function)));
</span><span class="cx">
</span><span class="cx"> m_plan.codeBlock->setJITCode(jitCode);
</span><del>-
</del><ins>+
+ m_plan.vm.updateFTLLargestStackSize(jitCode->stackmaps.stackSize());
+
</ins><span class="cx"> if (m_plan.compilation)
</span><span class="cx"> m_plan.vm.m_perBytecodeProfiler->addCompilation(m_plan.compilation);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeErrorHandlingScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ErrorHandlingScope.cpp (163963 => 163964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ErrorHandlingScope.cpp 2014-02-12 18:17:47 UTC (rev 163963)
+++ trunk/Source/JavaScriptCore/runtime/ErrorHandlingScope.cpp 2014-02-12 18:40:35 UTC (rev 163964)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> if (!m_vm.stackPointerAtVMEntry)
</span><span class="cx"> m_vm.stackPointerAtVMEntry = this;
</span><span class="cx"> size_t newReservedZoneSize = Options::errorModeReservedZoneSize();
</span><del>- m_savedReservedZoneSize = m_vm.updateStackLimitWithReservedZoneSize(newReservedZoneSize);
</del><ins>+ m_savedReservedZoneSize = m_vm.updateReservedZoneSize(newReservedZoneSize);
</ins><span class="cx"> #if ENABLE(LLINT_C_LOOP)
</span><span class="cx"> m_vm.interpreter->stack().setReservedZoneSize(newReservedZoneSize);
</span><span class="cx"> #endif
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_vm.stackPointerAtVMEntry == this)
</span><span class="cx"> m_vm.stackPointerAtVMEntry = nullptr;
</span><del>- m_vm.updateStackLimitWithReservedZoneSize(m_savedReservedZoneSize);
</del><ins>+ m_vm.updateReservedZoneSize(m_savedReservedZoneSize);
</ins><span class="cx"> #if ENABLE(LLINT_C_LOOP)
</span><span class="cx"> m_vm.interpreter->stack().setReservedZoneSize(m_savedReservedZoneSize);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSLockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSLock.cpp (163963 => 163964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSLock.cpp 2014-02-12 18:17:47 UTC (rev 163963)
+++ trunk/Source/JavaScriptCore/runtime/JSLock.cpp 2014-02-12 18:40:35 UTC (rev 163964)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> if (!m_vm->stackPointerAtVMEntry) {
</span><span class="cx"> void* p = &p;
</span><span class="cx"> m_vm->stackPointerAtVMEntry = p; // A proxy for the current stack pointer.
</span><del>- threadData.setSavedReservedZoneSize(m_vm->updateStackLimitWithReservedZoneSize(Options::reservedZoneSize()));
</del><ins>+ threadData.setSavedReservedZoneSize(m_vm->updateReservedZoneSize(Options::reservedZoneSize()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_vm->setLastStackTop(threadData.savedLastStackTop());
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> if (!m_lockCount) {
</span><span class="cx"> if (m_vm) {
</span><span class="cx"> m_vm->stackPointerAtVMEntry = nullptr;
</span><del>- m_vm->updateStackLimitWithReservedZoneSize(wtfThreadData().savedReservedZoneSize());
</del><ins>+ m_vm->updateReservedZoneSize(wtfThreadData().savedReservedZoneSize());
</ins><span class="cx"> }
</span><span class="cx"> setOwnerThread(0);
</span><span class="cx"> m_lock.unlock();
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> WTFThreadData& threadData = wtfThreadData();
</span><span class="cx"> m_vm->stackPointerAtVMEntry = threadData.savedStackPointerAtVMEntry();
</span><span class="cx"> m_vm->setLastStackTop(threadData.savedLastStackTop());
</span><del>- m_vm->updateStackLimitWithReservedZoneSize(threadData.savedReservedZoneSize());
</del><ins>+ m_vm->updateReservedZoneSize(threadData.savedReservedZoneSize());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSLock::DropAllLocks::DropAllLocks(ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (163963 => 163964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2014-02-12 18:17:47 UTC (rev 163963)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2014-02-12 18:40:35 UTC (rev 163964)
</span><span class="lines">@@ -227,6 +227,10 @@
</span><span class="cx"> #if ENABLE(LLINT_C_LOOP)
</span><span class="cx"> , m_jsStackLimit(0)
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(FTL_JIT)
+ , m_ftlStackLimit(0)
+ , m_largestFTLStackSize(0)
+#endif
</ins><span class="cx"> , m_inDefineOwnProperty(false)
</span><span class="cx"> , m_codeCache(CodeCache::create())
</span><span class="cx"> , m_enabledProfiler(nullptr)
</span><span class="lines">@@ -234,7 +238,7 @@
</span><span class="cx"> {
</span><span class="cx"> interpreter = new Interpreter(*this);
</span><span class="cx"> StackBounds stack = wtfThreadData().stack();
</span><del>- updateStackLimitWithReservedZoneSize(Options::reservedZoneSize());
</del><ins>+ updateReservedZoneSize(Options::reservedZoneSize());
</ins><span class="cx"> #if ENABLE(LLINT_C_LOOP)
</span><span class="cx"> interpreter->stack().setReservedZoneSize(Options::reservedZoneSize());
</span><span class="cx"> #endif
</span><span class="lines">@@ -728,23 +732,48 @@
</span><span class="cx"> m_exceptionStack = RefCountedArray<StackFrame>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-size_t VM::updateStackLimitWithReservedZoneSize(size_t reservedZoneSize)
</del><ins>+size_t VM::updateReservedZoneSize(size_t reservedZoneSize)
</ins><span class="cx"> {
</span><span class="cx"> size_t oldReservedZoneSize = m_reservedZoneSize;
</span><span class="cx"> m_reservedZoneSize = reservedZoneSize;
</span><span class="cx">
</span><del>- void* stackLimit;
</del><ins>+ updateStackLimit();
+
+ return oldReservedZoneSize;
+}
+
+inline void VM::updateStackLimit()
+{
</ins><span class="cx"> if (stackPointerAtVMEntry) {
</span><span class="cx"> ASSERT(wtfThreadData().stack().isGrowingDownward());
</span><span class="cx"> char* startOfStack = reinterpret_cast<char*>(stackPointerAtVMEntry);
</span><del>- stackLimit = wtfThreadData().stack().recursionLimit(startOfStack, Options::maxPerThreadStackUsage(), reservedZoneSize);
- } else
- stackLimit = wtfThreadData().stack().recursionLimit(reservedZoneSize);
</del><ins>+#if ENABLE(FTL_JIT)
+ m_stackLimit = wtfThreadData().stack().recursionLimit(startOfStack, Options::maxPerThreadStackUsage(), m_reservedZoneSize + m_largestFTLStackSize);
+ m_ftlStackLimit = wtfThreadData().stack().recursionLimit(startOfStack, Options::maxPerThreadStackUsage(), m_reservedZoneSize + 2 * m_largestFTLStackSize);
+#else
+ m_stackLimit = wtfThreadData().stack().recursionLimit(startOfStack, Options::maxPerThreadStackUsage(), m_reservedZoneSize);
+#endif
+ } else {
+#if ENABLE(FTL_JIT)
+ m_stackLimit = wtfThreadData().stack().recursionLimit(m_reservedZoneSize + m_largestFTLStackSize);
+ m_ftlStackLimit = wtfThreadData().stack().recursionLimit(m_reservedZoneSize + 2 * m_largestFTLStackSize);
+#else
+ m_stackLimit = wtfThreadData().stack().recursionLimit(m_reservedZoneSize);
+#endif
+ }
</ins><span class="cx">
</span><del>- setStackLimit(stackLimit);
- return oldReservedZoneSize;
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(FTL_JIT)
+void VM::updateFTLLargestStackSize(size_t stackSize)
+{
+ if (stackSize > m_largestFTLStackSize) {
+ m_largestFTLStackSize = stackSize;
+ updateStackLimit();
+ }
+}
+#endif
+
</ins><span class="cx"> void releaseExecutableMemory(VM& vm)
</span><span class="cx"> {
</span><span class="cx"> vm.releaseExecutableMemory();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (163963 => 163964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2014-02-12 18:17:47 UTC (rev 163963)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2014-02-12 18:40:35 UTC (rev 163964)
</span><span class="lines">@@ -380,8 +380,12 @@
</span><span class="cx"> JS_EXPORT_PRIVATE JSObject* throwException(ExecState*, JSObject*);
</span><span class="cx">
</span><span class="cx"> size_t reservedZoneSize() const { return m_reservedZoneSize; }
</span><del>- size_t updateStackLimitWithReservedZoneSize(size_t reservedZoneSize);
</del><ins>+ size_t updateReservedZoneSize(size_t reservedZoneSize);
</ins><span class="cx">
</span><ins>+#if ENABLE(FTL_JIT)
+ void updateFTLLargestStackSize(size_t);
+#endif
+
</ins><span class="cx"> void** addressOfJSStackLimit() { return &m_jsStackLimit; }
</span><span class="cx"> #if ENABLE(LLINT_C_LOOP)
</span><span class="cx"> void* jsStackLimit() { return m_jsStackLimit; }
</span><span class="lines">@@ -511,7 +515,7 @@
</span><span class="cx"> static VM*& sharedInstanceInternal();
</span><span class="cx"> void createNativeThunk();
</span><span class="cx">
</span><del>- void setStackLimit(void* limit) { m_stackLimit = limit; }
</del><ins>+ void updateStackLimit();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(ASSEMBLER)
</span><span class="cx"> bool m_canUseAssembler;
</span><span class="lines">@@ -536,7 +540,11 @@
</span><span class="cx"> void* m_stackLimit;
</span><span class="cx"> void* m_jsStackLimit;
</span><span class="cx"> };
</span><ins>+#if ENABLE(FTL_JIT)
+ void* m_ftlStackLimit;
+ size_t m_largestFTLStackSize;
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx"> void* m_lastStackTop;
</span><span class="cx"> JSValue m_exception;
</span><span class="cx"> bool m_inDefineOwnProperty;
</span></span></pre>
</div>
</div>
</body>
</html>