Changeset 124141 in webkit for trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

Timestamp:

Jul 30, 2012, 6:48:18 PM (13 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r124123.
​http://trac.webkit.org/changeset/124123
​https://bugs.webkit.org/show_bug.cgi?id=92700

ASSERT crashes terminate webkit Layout tests (Requested by
msaboff on #webkit).

Patch by Sheriff Bot <​[email protected]> on 2012-07-30

• heap/Heap.cpp:
• heap/Heap.h:

(Heap):

• heap/IncrementalSweeper.cpp:

(JSC::IncrementalSweeper::doSweep):
(JSC::IncrementalSweeper::startSweeping):
(JSC::IncrementalSweeper::IncrementalSweeper):
(JSC):

• heap/IncrementalSweeper.h:

(IncrementalSweeper):

• heap/MarkedAllocator.cpp:

(JSC::MarkedAllocator::tryAllocateHelper):
(JSC::MarkedAllocator::addBlock):

• heap/MarkedAllocator.h:

(JSC::MarkedAllocator::zapFreeList):

• heap/MarkedBlock.cpp:

(JSC::MarkedBlock::sweepHelper):

• heap/MarkedSpace.cpp:
• heap/MarkedSpace.h:

(JSC::MarkedSpace::sweep):
(JSC):

• runtime/JSGlobalData.cpp:

(JSC::JSGlobalData::~JSGlobalData):

File:

• trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -224 +224 @@
 {
     ASSERT(!m_apiLock.currentThreadIsHoldingLock());
-    heap.didStartVMShutdown();
+    heap.activityCallback()->didStartVMShutdown();
+    heap.sweeper()->didStartVMShutdown();
+    heap.lastChanceToFinalize();
 
     delete interpreter;