<!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>[180831] releases/WebKitGTK/webkit-2.8/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/180831">180831</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-28 03:52:56 -0800 (Sat, 28 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/180591">r180591</a> - Rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/179753">r179753</a>. The fix was invalid.
<https://webkit.org/b/141990>
Not reviewed.
* API/tests/testapi.mm:
(threadMain):
(useVMFromOtherThread): Deleted.
(useVMFromOtherThreadAndOutliveVM): Deleted.
* heap/Heap.cpp:
(JSC::Heap::Heap):
(JSC::Heap::~Heap):
(JSC::Heap::gatherStackRoots):
* heap/Heap.h:
(JSC::Heap::machineThreads):
* heap/MachineStackMarker.cpp:
(JSC::MachineThreads::Thread::Thread):
(JSC::MachineThreads::MachineThreads):
(JSC::MachineThreads::~MachineThreads):
(JSC::MachineThreads::addCurrentThread):
(JSC::MachineThreads::removeThread):
(JSC::MachineThreads::removeCurrentThread):
* heap/MachineStackMarker.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoreAPIteststestapimm">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/API/tests/testapi.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoreheapHeapcpp">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoreheapHeaph">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/heap/Heap.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoreheapMachineStackMarkercpp">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/heap/MachineStackMarker.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoreheapMachineStackMarkerh">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/heap/MachineStackMarker.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoreAPIteststestapimm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/API/tests/testapi.mm (180830 => 180831)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/API/tests/testapi.mm 2015-02-28 11:49:20 UTC (rev 180830)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/API/tests/testapi.mm 2015-02-28 11:52:56 UTC (rev 180831)
</span><span class="lines">@@ -472,7 +472,7 @@
</span><span class="cx"> return containsClass;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void* useVMFromOtherThread(void* contextPtr)
</del><ins>+static void* threadMain(void* contextPtr)
</ins><span class="cx"> {
</span><span class="cx"> JSContext *context = (__bridge JSContext*)contextPtr;
</span><span class="cx">
</span><span class="lines">@@ -482,32 +482,6 @@
</span><span class="cx"> pthread_exit(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-struct ThreadArgs {
- JSContext* context;
- volatile bool* mainThreadIsReadyToJoin;
- volatile bool* otherThreadIsDoneWithJSWork;
-};
-
-static void* useVMFromOtherThreadAndOutliveVM(void* data)
-{
- ThreadArgs* args = reinterpret_cast<ThreadArgs*>(data);
- volatile bool& mainThreadIsReadyToJoin = *args->mainThreadIsReadyToJoin;
- volatile bool& otherThreadIsDoneWithJSWork = *args->otherThreadIsDoneWithJSWork;
-
- @autoreleasepool {
- JSContext *context = args->context;
-
- // Do something to enter the VM.
- TestObject *testObject = [TestObject testObject];
- context[@"testObject"] = testObject;
- }
- otherThreadIsDoneWithJSWork = true;
-
- while (!mainThreadIsReadyToJoin)
- usleep(10000);
- pthread_exit(nullptr);
-}
-
</del><span class="cx"> void testObjectiveCAPI()
</span><span class="cx"> {
</span><span class="cx"> NSLog(@"Testing Objective-C API");
</span><span class="lines">@@ -1401,33 +1375,13 @@
</span><span class="cx"> JSContext *context = [[JSContext alloc] init];
</span><span class="cx">
</span><span class="cx"> pthread_t threadID;
</span><del>- pthread_create(&threadID, NULL, &useVMFromOtherThread, (__bridge void*)context);
</del><ins>+ pthread_create(&threadID, NULL, &threadMain, (__bridge void*)context);
</ins><span class="cx"> pthread_join(threadID, nullptr);
</span><span class="cx"> JSSynchronousGarbageCollectForDebugging([context JSGlobalContextRef]);
</span><span class="cx">
</span><span class="cx"> checkResult(@"Did not crash after entering the VM from another thread", true);
</span><span class="cx"> }
</span><del>-
- @autoreleasepool {
- pthread_t threadID;
- volatile bool mainThreadIsReadyToJoin = false;
- volatile bool otherThreadIsDoneWithJSWork = false;
- @autoreleasepool {
- JSContext *context = [[JSContext alloc] init];
- ThreadArgs args = { context, &mainThreadIsReadyToJoin, &otherThreadIsDoneWithJSWork };
-
- pthread_create(&threadID, NULL, &useVMFromOtherThreadAndOutliveVM, &args);
- JSSynchronousGarbageCollectForDebugging([context JSGlobalContextRef]);
-
- while (!otherThreadIsDoneWithJSWork)
- usleep(10000);
- }
-
- mainThreadIsReadyToJoin = true;
- pthread_join(threadID, nullptr);
- checkResult(@"Did not crash if the VM is destructed before another thread using the VM ends", true);
- }
-
</del><ins>+
</ins><span class="cx"> currentThisInsideBlockGetterTest();
</span><span class="cx"> runDateTests();
</span><span class="cx"> runJSExportTests();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog (180830 => 180831)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog 2015-02-28 11:49:20 UTC (rev 180830)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog 2015-02-28 11:52:56 UTC (rev 180831)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-02-24 Mark Lam <mark.lam@apple.com>
+
+ Rolling out r179753. The fix was invalid.
+ <https://webkit.org/b/141990>
+
+ Not reviewed.
+
+ * API/tests/testapi.mm:
+ (threadMain):
+ (useVMFromOtherThread): Deleted.
+ (useVMFromOtherThreadAndOutliveVM): Deleted.
+ * heap/Heap.cpp:
+ (JSC::Heap::Heap):
+ (JSC::Heap::~Heap):
+ (JSC::Heap::gatherStackRoots):
+ * heap/Heap.h:
+ (JSC::Heap::machineThreads):
+ * heap/MachineStackMarker.cpp:
+ (JSC::MachineThreads::Thread::Thread):
+ (JSC::MachineThreads::MachineThreads):
+ (JSC::MachineThreads::~MachineThreads):
+ (JSC::MachineThreads::addCurrentThread):
+ (JSC::MachineThreads::removeThread):
+ (JSC::MachineThreads::removeCurrentThread):
+ * heap/MachineStackMarker.h:
+
</ins><span class="cx"> 2015-02-24 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r179429): Can't type comments in Facebook
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/heap/Heap.cpp (180830 => 180831)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/heap/Heap.cpp 2015-02-28 11:49:20 UTC (rev 180830)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/heap/Heap.cpp 2015-02-28 11:52:56 UTC (rev 180831)
</span><span class="lines">@@ -311,6 +311,7 @@
</span><span class="cx"> , m_objectSpace(this)
</span><span class="cx"> , m_storageSpace(this)
</span><span class="cx"> , m_extraMemoryUsage(0)
</span><ins>+ , m_machineThreads(this)
</ins><span class="cx"> , m_sharedData(vm)
</span><span class="cx"> , m_slotVisitor(m_sharedData)
</span><span class="cx"> , m_copyVisitor(m_sharedData)
</span><span class="lines">@@ -339,7 +340,6 @@
</span><span class="cx"> , m_delayedReleaseRecursionCount(0)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>- m_machineThreads = adoptRef(new MachineThreads(this));
</del><span class="cx"> m_storageSpace.init();
</span><span class="cx"> if (Options::verifyHeap())
</span><span class="cx"> m_verifier = std::make_unique<HeapVerifier>(this, Options::numberOfGCCyclesToRecordForVerification());
</span><span class="lines">@@ -347,9 +347,6 @@
</span><span class="cx">
</span><span class="cx"> Heap::~Heap()
</span><span class="cx"> {
</span><del>- // We need to remove the main thread explicitly here because the main thread
- // may not terminate for a while though the Heap (and VM) is being shut down.
- m_machineThreads->removeCurrentThread();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Heap::isPagedOut(double deadline)
</span><span class="lines">@@ -590,7 +587,7 @@
</span><span class="cx"> {
</span><span class="cx"> GCPHASE(GatherStackRoots);
</span><span class="cx"> m_jitStubRoutines.clearMarks();
</span><del>- m_machineThreads->gatherConservativeRoots(roots, m_jitStubRoutines, m_codeBlocks, dummy, registers);
</del><ins>+ m_machineThreads.gatherConservativeRoots(roots, m_jitStubRoutines, m_codeBlocks, dummy, registers);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Heap::gatherJSStackRoots(ConservativeRoots& roots)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoreheapHeaph"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/heap/Heap.h (180830 => 180831)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/heap/Heap.h 2015-02-28 11:49:20 UTC (rev 180830)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/heap/Heap.h 2015-02-28 11:52:56 UTC (rev 180831)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx">
</span><span class="cx"> VM* vm() const { return m_vm; }
</span><span class="cx"> MarkedSpace& objectSpace() { return m_objectSpace; }
</span><del>- MachineThreads& machineThreads() { return *m_machineThreads; }
</del><ins>+ MachineThreads& machineThreads() { return m_machineThreads; }
</ins><span class="cx">
</span><span class="cx"> const SlotVisitor& slotVisitor() const { return m_slotVisitor; }
</span><span class="cx">
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx"> Vector<Vector<ValueStringPair, 0, UnsafeVectorOverflow>*> m_tempSortingVectors;
</span><span class="cx"> std::unique_ptr<HashSet<MarkedArgumentBuffer*>> m_markListSet;
</span><span class="cx">
</span><del>- RefPtr<MachineThreads> m_machineThreads;
</del><ins>+ MachineThreads m_machineThreads;
</ins><span class="cx">
</span><span class="cx"> GCThreadSharedData m_sharedData;
</span><span class="cx"> SlotVisitor m_slotVisitor;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoreheapMachineStackMarkercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/heap/MachineStackMarker.cpp (180830 => 180831)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2015-02-28 11:49:20 UTC (rev 180830)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2015-02-28 11:52:56 UTC (rev 180831)
</span><span class="lines">@@ -91,10 +91,9 @@
</span><span class="cx"> class MachineThreads::Thread {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- Thread(PassRefPtr<MachineThreads> machineThreads, const PlatformThread& platThread, void* base)
</del><ins>+ Thread(const PlatformThread& platThread, void* base)
</ins><span class="cx"> : platformThread(platThread)
</span><span class="cx"> , stackBase(base)
</span><del>- , m_machineThreads(machineThreads)
</del><span class="cx"> {
</span><span class="cx"> #if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) && defined(SA_RESTART)
</span><span class="cx"> // if we have SA_RESTART, enable SIGUSR2 debugging mechanism
</span><span class="lines">@@ -114,7 +113,6 @@
</span><span class="cx"> Thread* next;
</span><span class="cx"> PlatformThread platformThread;
</span><span class="cx"> void* stackBase;
</span><del>- RefPtr<MachineThreads> m_machineThreads;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> MachineThreads::MachineThreads(Heap* heap)
</span><span class="lines">@@ -122,7 +120,6 @@
</span><span class="cx"> , m_threadSpecific(0)
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> , m_heap(heap)
</span><del>- , m_magicNumber(0x1234567890abcdef)
</del><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(heap);
</span><span class="lines">@@ -139,9 +136,6 @@
</span><span class="cx"> delete t;
</span><span class="cx"> t = next;
</span><span class="cx"> }
</span><del>-#if !ASSERT_DISABLED
- m_magicNumber = 0xbaddbeefdeadbeef;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline PlatformThread getCurrentPlatformThread()
</span><span class="lines">@@ -176,7 +170,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> threadSpecificSet(m_threadSpecific, this);
</span><del>- Thread* thread = new Thread(this, getCurrentPlatformThread(), wtfThreadData().stack().origin());
</del><ins>+ Thread* thread = new Thread(getCurrentPlatformThread(), wtfThreadData().stack().origin());
</ins><span class="cx">
</span><span class="cx"> MutexLocker lock(m_registeredThreadsMutex);
</span><span class="cx">
</span><span class="lines">@@ -186,7 +180,6 @@
</span><span class="cx">
</span><span class="cx"> void MachineThreads::removeThread(void* p)
</span><span class="cx"> {
</span><del>- ASSERT(static_cast<MachineThreads*>(p)->m_magicNumber == 0x1234567890abcdef);
</del><span class="cx"> static_cast<MachineThreads*>(p)->removeCurrentThread();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -194,21 +187,6 @@
</span><span class="cx"> {
</span><span class="cx"> PlatformThread currentPlatformThread = getCurrentPlatformThread();
</span><span class="cx">
</span><del>- // This thread could be the last entity that holds a RefPtr to the
- // MachineThreads registry. We don't want the registry to be deleted while
- // we're deleting the the Thread entry, because:
- //
- // 1. ~MachineThread() will attempt to lock its m_registeredThreadsMutex
- // and we already hold it here. m_registeredThreadsMutex is not
- // re-entrant.
- // 2. The MutexLocker will unlock m_registeredThreadsMutex at the end of
- // this function. We can't let it be destructed until before then.
- //
- // Using this RefPtr here will defer destructing the registry till after
- // MutexLocker releases its m_registeredThreadsMutex.
- RefPtr<MachineThreads> retainMachineThreadsRegistryUntilDoneRemovingThread = this;
-
- ASSERT(m_magicNumber == 0x1234567890abcdef);
</del><span class="cx"> MutexLocker lock(m_registeredThreadsMutex);
</span><span class="cx"> if (equalThread(currentPlatformThread, m_registeredThreads->platformThread)) {
</span><span class="cx"> Thread* t = m_registeredThreads;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoreheapMachineStackMarkerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/heap/MachineStackMarker.h (180830 => 180831)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/heap/MachineStackMarker.h 2015-02-28 11:49:20 UTC (rev 180830)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/heap/MachineStackMarker.h 2015-02-28 11:52:56 UTC (rev 180831)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx">
</span><span class="cx"> #include <setjmp.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/ThreadSafeRefCounted.h>
</del><span class="cx"> #include <wtf/ThreadSpecific.h>
</span><span class="cx"> #include <wtf/ThreadingPrimitives.h>
</span><span class="cx">
</span><span class="lines">@@ -35,7 +34,7 @@
</span><span class="cx"> class Heap;
</span><span class="cx"> class JITStubRoutineSet;
</span><span class="cx">
</span><del>- class MachineThreads : public ThreadSafeRefCounted<MachineThreads> {
</del><ins>+ class MachineThreads {
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(MachineThreads);
</span><span class="cx"> public:
</span><span class="cx"> typedef jmp_buf RegisterState;
</span><span class="lines">@@ -47,8 +46,6 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE void addCurrentThread(); // Only needs to be called by clients that can use the same heap from multiple threads.
</span><span class="cx">
</span><del>- void removeCurrentThread();
-
</del><span class="cx"> private:
</span><span class="cx"> class Thread;
</span><span class="cx">
</span><span class="lines">@@ -58,13 +55,13 @@
</span><span class="cx"> bool tryCopyOtherThreadStacks(MutexLocker&, void*, size_t capacity, size_t*);
</span><span class="cx">
</span><span class="cx"> static void removeThread(void*);
</span><ins>+ void removeCurrentThread();
</ins><span class="cx">
</span><span class="cx"> Mutex m_registeredThreadsMutex;
</span><span class="cx"> Thread* m_registeredThreads;
</span><span class="cx"> WTF::ThreadSpecificKey m_threadSpecific;
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> Heap* m_heap;
</span><del>- uint64_t m_magicNumber; // Only used for detecting use after free.
</del><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>