<!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>[163219] tags/Safari-538.15/Source</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/163219">163219</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-01-31 16:36:31 -0800 (Fri, 31 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/163214">r163214</a>.  &lt;rdar://problem/15939497&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari53815SourceJavaScriptCoreChangeLog">tags/Safari-538.15/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#tagsSafari53815SourceJavaScriptCoreruntimeInitializeThreadingcpp">tags/Safari-538.15/Source/JavaScriptCore/runtime/InitializeThreading.cpp</a></li>
<li><a href="#tagsSafari53815SourceJavaScriptCoreruntimeJSLockcpp">tags/Safari-538.15/Source/JavaScriptCore/runtime/JSLock.cpp</a></li>
<li><a href="#tagsSafari53815SourceJavaScriptCoreruntimeJSLockh">tags/Safari-538.15/Source/JavaScriptCore/runtime/JSLock.h</a></li>
<li><a href="#tagsSafari53815SourceJavaScriptCoreruntimeVMEntryScopecpp">tags/Safari-538.15/Source/JavaScriptCore/runtime/VMEntryScope.cpp</a></li>
<li><a href="#tagsSafari53815SourceJavaScriptCoreruntimeVMEntryScopeh">tags/Safari-538.15/Source/JavaScriptCore/runtime/VMEntryScope.h</a></li>
<li><a href="#tagsSafari53815SourceWTFChangeLog">tags/Safari-538.15/Source/WTF/ChangeLog</a></li>
<li><a href="#tagsSafari53815SourceWTFwtfWTFThreadDatacpp">tags/Safari-538.15/Source/WTF/wtf/WTFThreadData.cpp</a></li>
<li><a href="#tagsSafari53815SourceWTFwtfWTFThreadDatah">tags/Safari-538.15/Source/WTF/wtf/WTFThreadData.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari53815SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.15/Source/JavaScriptCore/ChangeLog (163218 => 163219)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.15/Source/JavaScriptCore/ChangeLog        2014-02-01 00:34:12 UTC (rev 163218)
+++ tags/Safari-538.15/Source/JavaScriptCore/ChangeLog        2014-02-01 00:36:31 UTC (rev 163219)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-01-31  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
+        Merge r163214
+
+    2014-01-31  Michael Saboff  &lt;msaboff@apple.com&gt;
+
+            REGRESSION: Crash in sanitizeStackForVMImpl when scrolling @ lifehacker.com.au
+            https://bugs.webkit.org/show_bug.cgi?id=128017
+
+            Reviewed by Filip Pizlo.
+
+            Moved the setting and saving of VM::stackPointerAtVMEntry and the corresponding stack limit
+            to JSLock and JSLock::DropAllLocks.  The saved data is now stored in per-thread in
+            WTFThreadData.
+
+            * runtime/InitializeThreading.cpp:
+            (JSC::initializeThreading):
+            * runtime/JSLock.cpp:
+            (JSC::JSLock::lock):
+            (JSC::JSLock::unlock):
+            (JSC::JSLock::DropAllLocks::DropAllLocks):
+            (JSC::JSLock::DropAllLocks::~DropAllLocks):
+            * runtime/JSLock.h:
+            * runtime/VMEntryScope.cpp:
+            (JSC::VMEntryScope::VMEntryScope):
+            (JSC::VMEntryScope::~VMEntryScope):
+            * runtime/VMEntryScope.h:
+
</ins><span class="cx"> 2014-01-30  Andreas Kling  &lt;akling@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         CodeBlock's cloned SymbolTables only need the captured names.
</span></span></pre></div>
<a id="tagsSafari53815SourceJavaScriptCoreruntimeInitializeThreadingcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.15/Source/JavaScriptCore/runtime/InitializeThreading.cpp (163218 => 163219)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.15/Source/JavaScriptCore/runtime/InitializeThreading.cpp        2014-02-01 00:34:12 UTC (rev 163218)
+++ tags/Safari-538.15/Source/JavaScriptCore/runtime/InitializeThreading.cpp        2014-02-01 00:36:31 UTC (rev 163219)
</span><span class="lines">@@ -72,6 +72,10 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx">         DisallowGC::initialize();
</span><span class="cx"> #endif
</span><ins>+        WTFThreadData&amp; threadData = wtfThreadData();
+        
+        threadData.setSavedLastStackTop(threadData.stack().origin());
+        threadData.setSavedReservedZoneSize(Options::reservedZoneSize());
</ins><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="tagsSafari53815SourceJavaScriptCoreruntimeJSLockcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.15/Source/JavaScriptCore/runtime/JSLock.cpp (163218 => 163219)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.15/Source/JavaScriptCore/runtime/JSLock.cpp        2014-02-01 00:34:12 UTC (rev 163218)
+++ tags/Safari-538.15/Source/JavaScriptCore/runtime/JSLock.cpp        2014-02-01 00:36:31 UTC (rev 163219)
</span><span class="lines">@@ -121,6 +121,16 @@
</span><span class="cx">         m_ownerThread = currentThread;
</span><span class="cx">         ASSERT(!m_lockCount);
</span><span class="cx">         m_lockCount = 1;
</span><ins>+
+        WTFThreadData&amp; threadData = wtfThreadData();
+
+        if (!m_vm-&gt;stackPointerAtVMEntry) {
+            entryStackPointer = &amp;holder; // A proxy for the current stack pointer.
+            m_vm-&gt;stackPointerAtVMEntry = entryStackPointer;
+            threadData.setSavedReservedZoneSize(m_vm-&gt;updateStackLimitWithReservedZoneSize(Options::reservedZoneSize()));
+        }
+
+        m_vm-&gt;setLastStackTop(threadData.savedLastStackTop());
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -131,8 +141,13 @@
</span><span class="cx"> 
</span><span class="cx">     m_lockCount--;
</span><span class="cx"> 
</span><del>-    if (!m_lockCount)
</del><ins>+    if (!m_lockCount) {
+        if (m_vm &amp;&amp; m_vm-&gt;stackPointerAtVMEntry == entryStackPointer) {
+            m_vm-&gt;stackPointerAtVMEntry = nullptr;
+            m_vm-&gt;updateStackLimitWithReservedZoneSize(wtfThreadData().savedReservedZoneSize());
+        }
</ins><span class="cx">         m_lock.unlock();
</span><ins>+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void JSLock::lock(ExecState* exec)
</span><span class="lines">@@ -290,8 +305,13 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">     SpinLockHolder holder(&amp;spinLock);
</span><span class="cx"> #endif
</span><del>-    m_savedReservedZoneSize = m_vm-&gt;reservedZoneSize();
-    m_savedStackPointerAtVMEntry = m_vm-&gt;stackPointerAtVMEntry;
</del><ins>+
+    WTFThreadData&amp; threadData = wtfThreadData();
+    
+    threadData.setSavedStackPointerAtVMEntry(m_vm-&gt;stackPointerAtVMEntry);
+    threadData.setSavedLastStackTop(m_vm-&gt;lastStackTop());
+    threadData.setSavedReservedZoneSize(m_vm-&gt;reservedZoneSize());
+
</ins><span class="cx">     m_vm-&gt;stackPointerAtVMEntry = nullptr;
</span><span class="cx"> 
</span><span class="cx">     if (alwaysDropLocks)
</span><span class="lines">@@ -310,8 +330,13 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">     SpinLockHolder holder(&amp;spinLock);
</span><span class="cx"> #endif
</span><del>-    m_savedReservedZoneSize = m_vm-&gt;reservedZoneSize();
-    m_savedStackPointerAtVMEntry = m_vm-&gt;stackPointerAtVMEntry;
</del><ins>+
+    WTFThreadData&amp; threadData = wtfThreadData();
+    
+    threadData.setSavedStackPointerAtVMEntry(m_vm-&gt;stackPointerAtVMEntry);
+    threadData.setSavedLastStackTop(m_vm-&gt;lastStackTop());
+    threadData.setSavedReservedZoneSize(m_vm-&gt;reservedZoneSize());
+
</ins><span class="cx">     m_vm-&gt;stackPointerAtVMEntry = nullptr;
</span><span class="cx"> 
</span><span class="cx">     if (alwaysDropLocks)
</span><span class="lines">@@ -330,8 +355,11 @@
</span><span class="cx"> #endif
</span><span class="cx">     m_vm-&gt;apiLock().grabAllLocks(m_lockCount, spinLock);
</span><span class="cx"> 
</span><del>-    m_vm-&gt;stackPointerAtVMEntry = m_savedStackPointerAtVMEntry;
-    m_vm-&gt;updateStackLimitWithReservedZoneSize(m_savedReservedZoneSize);
</del><ins>+    WTFThreadData&amp; threadData = wtfThreadData();
+
+    m_vm-&gt;stackPointerAtVMEntry = threadData.savedStackPointerAtVMEntry();
+    m_vm-&gt;setLastStackTop(threadData.savedLastStackTop());
+    m_vm-&gt;updateStackLimitWithReservedZoneSize(threadData.savedReservedZoneSize());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="tagsSafari53815SourceJavaScriptCoreruntimeJSLockh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.15/Source/JavaScriptCore/runtime/JSLock.h (163218 => 163219)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.15/Source/JavaScriptCore/runtime/JSLock.h        2014-02-01 00:34:12 UTC (rev 163218)
+++ tags/Safari-538.15/Source/JavaScriptCore/runtime/JSLock.h        2014-02-01 00:36:31 UTC (rev 163219)
</span><span class="lines">@@ -110,8 +110,6 @@
</span><span class="cx">         private:
</span><span class="cx">             intptr_t m_lockCount;
</span><span class="cx">             RefPtr&lt;VM&gt; m_vm;
</span><del>-            size_t m_savedReservedZoneSize;
-            void* m_savedStackPointerAtVMEntry;
</del><span class="cx">         };
</span><span class="cx"> 
</span><span class="cx">     private:
</span><span class="lines">@@ -125,6 +123,7 @@
</span><span class="cx">         intptr_t m_lockCount;
</span><span class="cx">         unsigned m_lockDropDepth;
</span><span class="cx">         VM* m_vm;
</span><ins>+        void* entryStackPointer;
</ins><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx"> } // namespace
</span></span></pre></div>
<a id="tagsSafari53815SourceJavaScriptCoreruntimeVMEntryScopecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.15/Source/JavaScriptCore/runtime/VMEntryScope.cpp (163218 => 163219)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.15/Source/JavaScriptCore/runtime/VMEntryScope.cpp        2014-02-01 00:34:12 UTC (rev 163218)
+++ tags/Safari-538.15/Source/JavaScriptCore/runtime/VMEntryScope.cpp        2014-02-01 00:36:31 UTC (rev 163219)
</span><span class="lines">@@ -51,31 +51,20 @@
</span><span class="cx">         vm.resetDateCache();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (!vm.stackPointerAtVMEntry) {
-        vm.stackPointerAtVMEntry = this;
-        m_savedReservedZoneSize = vm.updateStackLimitWithReservedZoneSize(Options::reservedZoneSize());
-    }
-
</del><span class="cx">     // Clear the captured exception stack between entries
</span><span class="cx">     vm.clearExceptionStack();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> VMEntryScope::~VMEntryScope()
</span><span class="cx"> {
</span><del>-    if (m_vm.entryScope == this)
-        m_vm.entryScope = nullptr;
-    if (m_vm.stackPointerAtVMEntry == this) {
-        m_vm.stackPointerAtVMEntry = nullptr;
-        m_vm.updateStackLimitWithReservedZoneSize(m_savedReservedZoneSize);
-    }
</del><ins>+    if (m_vm.entryScope != this)
+        return;
</ins><span class="cx"> 
</span><ins>+    m_vm.entryScope = nullptr;
+
</ins><span class="cx">     if (m_recompilationNeeded) {
</span><del>-        if (m_vm.entryScope)
-            m_vm.entryScope-&gt;setRecompilationNeeded(true);
-        else {
-            if (Debugger* debugger = m_globalObject-&gt;debugger())
-                debugger-&gt;recompileAllJSFunctions(&amp;m_vm);
-        }
</del><ins>+        if (Debugger* debugger = m_globalObject-&gt;debugger())
+            debugger-&gt;recompileAllJSFunctions(&amp;m_vm);
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="tagsSafari53815SourceJavaScriptCoreruntimeVMEntryScopeh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.15/Source/JavaScriptCore/runtime/VMEntryScope.h (163218 => 163219)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.15/Source/JavaScriptCore/runtime/VMEntryScope.h        2014-02-01 00:34:12 UTC (rev 163218)
+++ tags/Safari-538.15/Source/JavaScriptCore/runtime/VMEntryScope.h        2014-02-01 00:36:31 UTC (rev 163219)
</span><span class="lines">@@ -46,13 +46,10 @@
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     VM&amp; m_vm;
</span><del>-    StackStats::CheckPoint m_stackCheckPoint;
</del><span class="cx">     JSGlobalObject* m_globalObject;
</span><del>-    size_t m_savedReservedZoneSize;
</del><span class="cx">     bool m_recompilationNeeded;
</span><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace JSC
</span><span class="cx"> 
</span><span class="cx"> #endif // VMEntryScope_h
</span><del>-
</del></span></pre></div>
<a id="tagsSafari53815SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.15/Source/WTF/ChangeLog (163218 => 163219)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.15/Source/WTF/ChangeLog        2014-02-01 00:34:12 UTC (rev 163218)
+++ tags/Safari-538.15/Source/WTF/ChangeLog        2014-02-01 00:36:31 UTC (rev 163219)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-01-31  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
+        Merge r163214
+
+    2014-01-31  Michael Saboff  &lt;msaboff@apple.com&gt;
+
+            REGRESSION: Crash in sanitizeStackForVMImpl when scrolling @ lifehacker.com.au
+            https://bugs.webkit.org/show_bug.cgi?id=128017
+
+            Reviewed by Filip Pizlo.
+
+            Moved the setting and saving of VM::stackPointerAtVMEntry and the corresponding stack limit
+            to JSLock and JSLock::DropAllLocks.  The saved data is now stored in per-thread in
+            WTFThreadData.
+
+            * wtf/WTFThreadData.cpp:
+            (WTF::WTFThreadData::WTFThreadData):
+            * wtf/WTFThreadData.h:
+            (WTF::WTFThreadData::savedStackPointerAtVMEntry):
+            (WTF::WTFThreadData::setSavedStackPointerAtVMEntry):
+            (WTF::WTFThreadData::savedLastStackTop):
+            (WTF::WTFThreadData::setSavedLastStackTop):
+            (WTF::WTFThreadData::savedReservedZoneSize):
+            (WTF::WTFThreadData::setSavedReservedZoneSize):
+
</ins><span class="cx"> 2014-01-30  Andrei Bucur  &lt;abucur@adobe.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove the ACCELERATED_COMPOSITING flag
</span></span></pre></div>
<a id="tagsSafari53815SourceWTFwtfWTFThreadDatacpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.15/Source/WTF/wtf/WTFThreadData.cpp (163218 => 163219)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.15/Source/WTF/wtf/WTFThreadData.cpp        2014-02-01 00:34:12 UTC (rev 163218)
+++ tags/Safari-538.15/Source/WTF/wtf/WTFThreadData.cpp        2014-02-01 00:36:31 UTC (rev 163219)
</span><span class="lines">@@ -49,6 +49,9 @@
</span><span class="cx"> #if ENABLE(STACK_STATS)
</span><span class="cx">     , m_stackStats()
</span><span class="cx"> #endif
</span><ins>+    , m_savedStackPointerAtVMEntry(0)
+    , m_savedLastStackTop(stack().origin())
+    , m_savedReservedZoneSize(0)
</ins><span class="cx"> {
</span><span class="cx"> #if USE(WEB_THREAD)
</span><span class="cx">     static JSC::IdentifierTable* sharedIdentifierTable = new JSC::IdentifierTable();
</span></span></pre></div>
<a id="tagsSafari53815SourceWTFwtfWTFThreadDatah"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.15/Source/WTF/wtf/WTFThreadData.h (163218 => 163219)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.15/Source/WTF/wtf/WTFThreadData.h        2014-02-01 00:34:12 UTC (rev 163218)
+++ tags/Safari-538.15/Source/WTF/wtf/WTFThreadData.h        2014-02-01 00:36:31 UTC (rev 163219)
</span><span class="lines">@@ -106,6 +106,36 @@
</span><span class="cx">     }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+    void* savedStackPointerAtVMEntry()
+    {
+        return m_savedStackPointerAtVMEntry;
+    }
+
+    void setSavedStackPointerAtVMEntry(void* stackPointerAtVMEntry)
+    {
+        m_savedStackPointerAtVMEntry = stackPointerAtVMEntry;
+    }
+
+    void* savedLastStackTop()
+    {
+        return m_savedLastStackTop;
+    }
+
+    void setSavedLastStackTop(void* lastStackTop)
+    {
+        m_savedLastStackTop = lastStackTop;
+    }
+
+    size_t savedReservedZoneSize()
+    {
+        return m_savedReservedZoneSize;
+    }
+
+    void setSavedReservedZoneSize(size_t reservedZoneSize)
+    {
+        m_savedReservedZoneSize = reservedZoneSize;
+    }
+
</ins><span class="cx">     void* m_apiData;
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="lines">@@ -118,6 +148,9 @@
</span><span class="cx"> #if ENABLE(STACK_STATS)
</span><span class="cx">     StackStats::PerThreadStats m_stackStats;
</span><span class="cx"> #endif
</span><ins>+    void* m_savedStackPointerAtVMEntry;
+    void* m_savedLastStackTop;
+    size_t m_savedReservedZoneSize;
</ins><span class="cx"> 
</span><span class="cx">     static WTF_EXPORTDATA ThreadSpecific&lt;WTFThreadData&gt;* staticData;
</span><span class="cx">     friend WTFThreadData&amp; wtfThreadData();
</span></span></pre>
</div>
</div>

</body>
</html>