Changeset 180591 in webkit for trunk/Source/JavaScriptCore/heap/Heap.cpp

Timestamp:

Feb 24, 2015, 4:03:42 PM (10 years ago)

Author:

[email protected]

Message:

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:

File:

• trunk/Source/JavaScriptCore/heap/Heap.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -312 +312 @@
     , m_storageSpace(this)
     , m_extraMemoryUsage(0)
+    , m_machineThreads(this)
     , m_sharedData(vm)
     , m_slotVisitor(m_sharedData)
@@ -340 +341 @@
 #endif
 {
-    m_machineThreads = adoptRef(new MachineThreads(this));
     m_storageSpace.init();
     if (Options::verifyHeap())
@@ -348 +348 @@
 Heap::~Heap()
 {
-    // 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();
 }
 
@@ -591 +588 @@
     GCPHASE(GatherStackRoots);
     m_jitStubRoutines.clearMarks();
-    m_machineThreads->gatherConservativeRoots(roots, m_jitStubRoutines, m_codeBlocks, dummy, registers);
+    m_machineThreads.gatherConservativeRoots(roots, m_jitStubRoutines, m_codeBlocks, dummy, registers);
 }