[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [74454] trunk/JavaScriptCore
From: barraclough () apple ! com
Date: 2010-12-22 4:19:03
Message-ID: 20101222041903.C68806065D93 () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[74454] trunk/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/74454">74454</a></dd> \
<dt>Author</dt> <dd>barraclough@apple.com</dd> <dt>Date</dt> <dd>2010-12-21 20:18:58 \
-0800 (Tue, 21 Dec 2010)</dd> </dl>
<h3>Log Message</h3>
<pre> Reviewed by Geoff Garen.
<rdar://problem/8765333> CRASH running out of executable memory, loading \
io9.com https://bugs.webkit.org/show_bug.cgi?id=51443
The problem here is that each page uses a reasonable amount of memory, (~4Mb),
and that when miultiple pages are open we keep all JIT code for all functions
in all pages alive.
Add a check to detect high memory pressure situations in the executable allocator
(>50% of available memory allocated), and upon a top level entry into JSC (no code
running on the stack) in this situation throw away all JIT code.
* JavaScriptCore.exp:
* debugger/Debugger.cpp:
(JSC::Debugger::recompileAllJSFunctions): stop passing exec to recompile.
* jit/ExecutableAllocator.h:
* jit/ExecutableAllocatorFixedVMPool.cpp:
(JSC::ExecutablePool::systemAlloc): Count allocations.
(JSC::ExecutablePool::systemRelease): Count deallocations.
(JSC::ExecutablePool::underMemoryPressure): Check memory pressure.
* jit/ExecutableAllocatorPosix.cpp:
(JSC::ExecutablePool::underMemoryPressure): Stub out; only meaningful with \
FixedVMPool.
* jit/ExecutableAllocatorWin.cpp:
(JSC::ExecutablePool::underMemoryPressure): Stub out; only meaningful with \
FixedVMPool.
* runtime/Executable.cpp:
(JSC::FunctionExecutable::recompile): Remove ExecState argument to recompile.
* runtime/Executable.h:
* runtime/JSGlobalData.cpp:
(JSC::JSGlobalData::recompileAllJSFunctions): throws away all JIT code.
* runtime/JSGlobalData.h:
* runtime/JSGlobalObject.h:
(JSC::DynamicGlobalObjectScope::DynamicGlobalObjectScope): add check / call to throw \
away.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCoreJavaScriptCoreexp">trunk/JavaScriptCore/JavaScriptCore.exp</a></li>
<li><a href="#trunkJavaScriptCoredebuggerDebuggercpp">trunk/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#trunkJavaScriptCorejitExecutableAllocatorcpp">trunk/JavaScriptCore/jit/ExecutableAllocator.cpp</a></li>
<li><a href="#trunkJavaScriptCorejitExecutableAllocatorh">trunk/JavaScriptCore/jit/ExecutableAllocator.h</a></li>
<li><a href="#trunkJavaScriptCorejitExecutableAllocatorFixedVMPoolcpp">trunk/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeExecutablecpp">trunk/JavaScriptCore/runtime/Executable.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeExecutableh">trunk/JavaScriptCore/runtime/Executable.h</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSGlobalDatacpp">trunk/JavaScriptCore/runtime/JSGlobalData.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSGlobalDatah">trunk/JavaScriptCore/runtime/JSGlobalData.h</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSGlobalObjecth">trunk/JavaScriptCore/runtime/JSGlobalObject.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (74453 => \
74454)</h4> <pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog 2010-12-22 04:10:36 UTC (rev \
74453)
+++ trunk/JavaScriptCore/ChangeLog 2010-12-22 04:18:58 UTC (rev 74454)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2010-12-21 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><ins>+ Reviewed by Geoff Garen.
+
+ <rdar://problem/8765333> CRASH running out of executable memory, \
loading io9.com + https://bugs.webkit.org/show_bug.cgi?id=51443
+
+ The problem here is that each page uses a reasonable amount of memory, \
(~4Mb), + and that when miultiple pages are open we keep all JIT code for all \
functions + in all pages alive.
+
+ Add a check to detect high memory pressure situations in the executable \
allocator + (>50% of available memory allocated), and upon a top level \
entry into JSC (no code + running on the stack) in this situation throw away \
all JIT code. +
+ * JavaScriptCore.exp:
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::recompileAllJSFunctions): stop passing exec to recompile.
+ * jit/ExecutableAllocator.h:
+ * jit/ExecutableAllocatorFixedVMPool.cpp:
+ (JSC::ExecutablePool::systemAlloc): Count allocations.
+ (JSC::ExecutablePool::systemRelease): Count deallocations.
+ (JSC::ExecutablePool::underMemoryPressure): Check memory pressure.
+ * jit/ExecutableAllocatorPosix.cpp:
+ (JSC::ExecutablePool::underMemoryPressure): Stub out; only meaningful with \
FixedVMPool. + * jit/ExecutableAllocatorWin.cpp:
+ (JSC::ExecutablePool::underMemoryPressure): Stub out; only meaningful with \
FixedVMPool. + * runtime/Executable.cpp:
+ (JSC::FunctionExecutable::recompile): Remove ExecState argument to \
recompile. + * runtime/Executable.h:
+ * runtime/JSGlobalData.cpp:
+ (JSC::JSGlobalData::recompileAllJSFunctions): throws away all JIT code.
+ * runtime/JSGlobalData.h:
+ * runtime/JSGlobalObject.h:
+ (JSC::DynamicGlobalObjectScope::DynamicGlobalObjectScope): add check / call \
to throw away. +
+2010-12-21 Gavin Barraclough <barraclough@apple.com>
+
</ins><span class="cx"> Reviewed by Geoff Garen.
</span><span class="cx">
</span><span class="cx"> <rdar://problem/8241425> JIT executable memory \
excessive usage due to regex caching </span></span></pre></div>
<a id="trunkJavaScriptCoreJavaScriptCoreexp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/JavaScriptCore.exp (74453 => \
74454)</h4> <pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/JavaScriptCore.exp 2010-12-22 04:10:36 \
UTC (rev 74453)
+++ trunk/JavaScriptCore/JavaScriptCore.exp 2010-12-22 04:18:58 UTC (rev 74454)
</span><span class="lines">@@ -200,6 +200,7 @@
</span><span class="cx"> __ZN3JSC23AbstractSamplingCounter4dumpEv
</span><span class="cx"> __ZN3JSC23objectProtoFuncToStringEPNS_9ExecStateE
</span><span class="cx"> \
__ZN3JSC23setUpStaticFunctionSlotEPNS_9ExecStateEPKNS_9HashEntryEPNS_8JSObjectERKNS_10IdentifierERNS_12PropertySlotE
</span><ins>+__ZN3JSC24DynamicGlobalObjectScopeC1EPNS_9ExecStateEPNS_14JSGlobalObjectE
</ins><span class="cx"> \
__ZN3JSC24JSObjectWithGlobalObjectC2EPNS_14JSGlobalObjectEN3WTF17NonNullPassRefPtrINS_9StructureEEE
</span><span class="cx"> __ZN3JSC24createStackOverflowErrorEPNS_9ExecStateE
</span><span class="cx"> __ZN3JSC24createStackOverflowErrorEPNS_9ExecStateE
</span></span></pre></div>
<a id="trunkJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/debugger/Debugger.cpp (74453 \
=> 74454)</h4> <pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/debugger/Debugger.cpp 2010-12-22 04:10:36 \
UTC (rev 74453)
+++ trunk/JavaScriptCore/debugger/Debugger.cpp 2010-12-22 04:18:58 UTC (rev 74454)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> ExecState* exec = \
function->scope().globalObject()->JSGlobalObject::globalExec(); </span><del>- \
executable->recompile(exec); </del><ins>+ executable->discardCode();
</ins><span class="cx"> if \
(function->scope().globalObject()->debugger() == this) </span><span class="cx"> \
sourceProviders.add(executable->source().provider(), exec); </span><span \
class="cx"> } </span></span></pre></div>
<a id="trunkJavaScriptCorejitExecutableAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/jit/ExecutableAllocator.cpp \
(74453 => 74454)</h4> <pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/jit/ExecutableAllocator.cpp 2010-12-22 \
04:10:36 UTC (rev 74453)
+++ trunk/JavaScriptCore/jit/ExecutableAllocator.cpp 2010-12-22 04:18:58 UTC (rev \
74454) </span><span class="lines">@@ -67,6 +67,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool ExecutableAllocator::underMemoryPressure() const
+{
+ return false;
+}
+
</ins><span class="cx"> size_t ExecutableAllocator::committedByteCount()
</span><span class="cx"> {
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkJavaScriptCorejitExecutableAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/jit/ExecutableAllocator.h \
(74453 => 74454)</h4> <pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/jit/ExecutableAllocator.h 2010-12-22 \
04:10:36 UTC (rev 74453)
+++ trunk/JavaScriptCore/jit/ExecutableAllocator.h 2010-12-22 04:18:58 UTC (rev \
74454) </span><span class="lines">@@ -184,7 +184,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isValid() const;
</span><del>-
</del><ins>+
+ static bool underMemoryPressure();
+
</ins><span class="cx"> PassRefPtr<ExecutablePool> poolForSize(size_t n)
</span><span class="cx"> {
</span><span class="cx"> // Try to fit in the existing small allocator
</span></span></pre></div>
<a id="trunkJavaScriptCorejitExecutableAllocatorFixedVMPoolcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp (74453 => 74454)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp 2010-12-22 04:10:36 UTC \
(rev 74453)
+++ trunk/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp 2010-12-22 04:18:58 \
UTC (rev 74454) </span><span class="lines">@@ -431,7 +431,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static FixedVMPoolAllocator* allocator = 0;
</span><del>-
</del><ins>+static size_t allocatedCount = 0;
+
</ins><span class="cx"> bool ExecutableAllocator::isValid() const
</span><span class="cx"> {
</span><span class="cx"> SpinLockHolder lock_holder(&spinlock);
</span><span class="lines">@@ -440,10 +441,18 @@
</span><span class="cx"> return allocator->isValid();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool ExecutableAllocator::underMemoryPressure()
+{
+ // Technically we should take the spin lock here, but we don't care if we get \
stale data. + // This is only really a heuristic anyway.
+ return allocatedCount > (VM_POOL_SIZE / 2);
+}
+
</ins><span class="cx"> ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t \
size) </span><span class="cx"> {
</span><span class="cx"> SpinLockHolder lock_holder(&spinlock);
</span><span class="cx"> ASSERT(allocator);
</span><ins>+ allocatedCount += size;
</ins><span class="cx"> return allocator->alloc(size);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -451,6 +460,7 @@
</span><span class="cx"> {
</span><span class="cx"> SpinLockHolder lock_holder(&spinlock);
</span><span class="cx"> ASSERT(allocator);
</span><ins>+ allocatedCount -= allocation.size();
</ins><span class="cx"> allocator->free(allocation);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeExecutablecpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/Executable.cpp (74453 \
=> 74454)</h4> <pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/Executable.cpp 2010-12-22 \
04:10:36 UTC (rev 74453)
+++ trunk/JavaScriptCore/runtime/Executable.cpp 2010-12-22 04:18:58 UTC (rev 74454)
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> \
m_codeBlockForConstruct->markAggregate(markStack); </span><span class="cx"> }
</span><span class="cx">
</span><del>-void FunctionExecutable::recompile(ExecState*)
</del><ins>+void FunctionExecutable::discardCode()
</ins><span class="cx"> {
</span><span class="cx"> m_codeBlockForCall.clear();
</span><span class="cx"> m_codeBlockForConstruct.clear();
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeExecutableh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/Executable.h (74453 \
=> 74454)</h4> <pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/Executable.h 2010-12-22 04:10:36 \
UTC (rev 74453)
+++ trunk/JavaScriptCore/runtime/Executable.h 2010-12-22 04:18:58 UTC (rev 74454)
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx"> UString paramString() const;
</span><span class="cx"> SharedSymbolTable* symbolTable() const { return \
m_symbolTable; } </span><span class="cx">
</span><del>- void recompile(ExecState*);
</del><ins>+ void discardCode();
</ins><span class="cx"> void markAggregate(MarkStack&);
</span><span class="cx"> static PassRefPtr<FunctionExecutable> \
fromGlobalCode(const Identifier&, ExecState*, Debugger*, const SourceCode&, \
JSObject** exception); </span><span class="cx">
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSGlobalDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSGlobalData.cpp \
(74453 => 74454)</h4> <pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSGlobalData.cpp 2010-12-22 \
04:10:36 UTC (rev 74453)
+++ trunk/JavaScriptCore/runtime/JSGlobalData.cpp 2010-12-22 04:18:58 UTC (rev 74454)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ArgList.h"
</span><span class="cx"> #include "Collector.h"
</span><ins>+#include "CollectorHeapIterator.h"
</ins><span class="cx"> #include "CommonIdentifiers.h"
</span><span class="cx"> #include "FunctionConstructor.h"
</span><span class="cx"> #include "GetterSetter.h"
</span><span class="lines">@@ -311,7 +312,23 @@
</span><span class="cx"> interpreter->dumpSampleData(exec);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void JSGlobalData::recompileAllJSFunctions()
+{
+ // If JavaScript is running, it's not safe to recompile, since we'll end
+ // up throwing away code that is live on the stack.
+ ASSERT(!dynamicGlobalObject);
</ins><span class="cx">
</span><ins>+ LiveObjectIterator it = heap.primaryHeapBegin();
+ LiveObjectIterator heapEnd = heap.primaryHeapEnd();
+ for ( ; it != heapEnd; ++it) {
+ if ((*it)->inherits(&JSFunction::info)) {
+ JSFunction* function = asFunction(*it);
+ if (!function->executable()->isHostFunction())
+ function->jsExecutable()->discardCode();
+ }
+ }
+}
+
</ins><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><span class="cx"> void JSGlobalData::addRegExpToTrace(PassRefPtr<RegExp> \
regExp) </span><span class="cx"> {
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSGlobalDatah"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSGlobalData.h (74453 \
=> 74454)</h4> <pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSGlobalData.h 2010-12-22 \
04:10:36 UTC (rev 74453)
+++ trunk/JavaScriptCore/runtime/JSGlobalData.h 2010-12-22 04:18:58 UTC (rev 74454)
</span><span class="lines">@@ -248,6 +248,7 @@
</span><span class="cx"> void startSampling();
</span><span class="cx"> void stopSampling();
</span><span class="cx"> void dumpSampleData(ExecState* exec);
</span><ins>+ void recompileAllJSFunctions();
</ins><span class="cx"> RegExpCache* regExpCache() { return m_regExpCache; }
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><span class="cx"> void addRegExpToTrace(PassRefPtr<RegExp> \
regExp); </span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSGlobalObject.cpp \
(74453 => 74454)</h4> <pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSGlobalObject.cpp 2010-12-22 \
04:10:36 UTC (rev 74453)
+++ trunk/JavaScriptCore/runtime/JSGlobalObject.cpp 2010-12-22 04:18:58 UTC (rev \
74454) </span><span class="lines">@@ -455,4 +455,22 @@
</span><span class="cx"> delete \
static_cast<JSGlobalObjectData*>(jsGlobalObjectData); </span><span class="cx"> \
} </span><span class="cx">
</span><ins>+DynamicGlobalObjectScope::DynamicGlobalObjectScope(CallFrame* callFrame, \
JSGlobalObject* dynamicGlobalObject) + : \
m_dynamicGlobalObjectSlot(callFrame->globalData().dynamicGlobalObject) + , \
m_savedDynamicGlobalObject(m_dynamicGlobalObjectSlot) +{
+ if (!m_dynamicGlobalObjectSlot) {
+#if ENABLE(ASSEMBLER)
+ if (ExecutableAllocator::underMemoryPressure())
+ callFrame->globalData().recompileAllJSFunctions();
+#endif
+
+ m_dynamicGlobalObjectSlot = dynamicGlobalObject;
+
+ // Reset the date cache between JS invocations to force the VM
+ // to observe time zone changes.
+ callFrame->globalData().resetDateCache();
+ }
+}
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSGlobalObject.h \
(74453 => 74454)</h4> <pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSGlobalObject.h 2010-12-22 \
04:10:36 UTC (rev 74453)
+++ trunk/JavaScriptCore/runtime/JSGlobalObject.h 2010-12-22 04:18:58 UTC (rev 74454)
</span><span class="lines">@@ -467,19 +467,8 @@
</span><span class="cx">
</span><span class="cx"> class DynamicGlobalObjectScope : public Noncopyable {
</span><span class="cx"> public:
</span><del>- DynamicGlobalObjectScope(CallFrame* callFrame, JSGlobalObject* \
dynamicGlobalObject)
- : m_dynamicGlobalObjectSlot(callFrame->globalData().dynamicGlobalObject)
- , m_savedDynamicGlobalObject(m_dynamicGlobalObjectSlot)
- {
- if (!m_dynamicGlobalObjectSlot) {
- m_dynamicGlobalObjectSlot = dynamicGlobalObject;
</del><ins>+ DynamicGlobalObjectScope(CallFrame* callFrame, JSGlobalObject* \
dynamicGlobalObject); </ins><span class="cx">
</span><del>- // Reset the date cache between JS invocations to force \
the VM
- // to observe time zone changes.
- callFrame->globalData().resetDateCache();
- }
- }
-
</del><span class="cx"> ~DynamicGlobalObjectScope()
</span><span class="cx"> {
</span><span class="cx"> m_dynamicGlobalObjectSlot = \
m_savedDynamicGlobalObject; </span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic