Changeset 161557 in webkit for trunk/Source/JavaScriptCore/heap/MarkStack.cpp

Timestamp:

Jan 9, 2014, 9:21:02 AM (11 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r161540.
​http://trac.webkit.org/changeset/161540
​https://bugs.webkit.org/show_bug.cgi?id=126704

Caused assertion failures on multiple tests (Requested by ap
on #webkit).

Source/JavaScriptCore:

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::visitAggregate):

• bytecode/CodeBlock.h:

(JSC::CodeBlockSet::mark):

• dfg/DFGOperations.cpp:
• heap/CodeBlockSet.cpp:

(JSC::CodeBlockSet::add):
(JSC::CodeBlockSet::traceMarked):

• heap/CodeBlockSet.h:
• heap/CopiedBlockInlines.h:

(JSC::CopiedBlock::reportLiveBytes):

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

(JSC::Heap::Heap):
(JSC::Heap::didAbandon):
(JSC::Heap::markRoots):
(JSC::Heap::copyBackingStores):
(JSC::Heap::collectAllGarbage):
(JSC::Heap::collect):
(JSC::Heap::didAllocate):

• heap/Heap.h:

(JSC::Heap::shouldCollect):
(JSC::Heap::isCollecting):
(JSC::Heap::isWriteBarrierEnabled):
(JSC::Heap::writeBarrier):

• heap/HeapOperation.h:
• heap/MarkStack.cpp:

(JSC::MarkStackArray::~MarkStackArray):

• heap/MarkStack.h:
• heap/MarkedAllocator.cpp:

(JSC::MarkedAllocator::isPagedOut):
(JSC::MarkedAllocator::tryAllocateHelper):
(JSC::MarkedAllocator::addBlock):
(JSC::MarkedAllocator::removeBlock):

• heap/MarkedAllocator.h:

(JSC::MarkedAllocator::MarkedAllocator):
(JSC::MarkedAllocator::reset):

• heap/MarkedBlock.cpp:
• heap/MarkedBlock.h:

(JSC::MarkedBlock::lastChanceToFinalize):
(JSC::MarkedBlock::didConsumeEmptyFreeList):
(JSC::MarkedBlock::clearMarks):

• heap/MarkedSpace.cpp:

(JSC::MarkedSpace::~MarkedSpace):
(JSC::MarkedSpace::resetAllocators):
(JSC::MarkedSpace::visitWeakSets):
(JSC::MarkedSpace::reapWeakSets):

• heap/MarkedSpace.h:

(JSC::ClearMarks::operator()):
(JSC::MarkedSpace::clearMarks):

• heap/SlotVisitor.cpp:

(JSC::SlotVisitor::~SlotVisitor):

• heap/SlotVisitor.h:

(JSC::SlotVisitor::sharedData):

• heap/SlotVisitorInlines.h:

(JSC::SlotVisitor::internalAppend):
(JSC::SlotVisitor::copyLater):
(JSC::SlotVisitor::reportExtraMemoryUsage):

• jit/Repatch.cpp:
• runtime/JSGenericTypedArrayViewInlines.h:

(JSC::JSGenericTypedArrayView<Adaptor>::visitChildren):

• runtime/JSPropertyNameIterator.h:

(JSC::StructureRareData::setEnumerationCache):

• runtime/JSString.cpp:

(JSC::JSString::visitChildren):

• runtime/StructureRareDataInlines.h:

(JSC::StructureRareData::setPreviousID):
(JSC::StructureRareData::setObjectToStringValue):

• runtime/WeakMapData.cpp:

(JSC::WeakMapData::visitChildren):

Source/WTF:

• wtf/Bitmap.h:

(WTF::WordType>::count):

File:

• trunk/Source/JavaScriptCore/heap/MarkStack.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/heap/MarkStack.cpp

@@ -58 +58 @@
 MarkStackArray::~MarkStackArray()
 {
-    ASSERT(m_numberOfSegments == 1);
-    ASSERT(m_segments.size() == 1);
+    ASSERT(m_numberOfSegments == 1 && m_segments.size() == 1);
     m_blockAllocator.deallocate(MarkStackSegment::destroy(m_segments.removeHead()));
-    m_numberOfSegments--;
-    ASSERT(!m_numberOfSegments);
-    ASSERT(!m_segments.size());
-}
-
-void MarkStackArray::clear()
-{
-    if (!m_segments.head())
-        return;
-    MarkStackSegment* next;
-    for (MarkStackSegment* current = m_segments.head(); current->next(); current = next) {
-        next = current->next();
-        m_segments.remove(current);
-        m_blockAllocator.deallocate(MarkStackSegment::destroy(current));
-    }
-    m_top = 0;
-    m_numberOfSegments = 1;
-#if !ASSERT_DISABLED
-    m_segments.head()->m_top = 0;
-#endif
 }
 
@@ -189 +168 @@
 }
 
-void MarkStackArray::fillVector(Vector<const JSCell*>& vector)
-{
-    ASSERT(vector.size() == size());
-
-    MarkStackSegment* currentSegment = m_segments.head();
-    if (!currentSegment)
-        return;
-
-    unsigned count = 0;
-    for (unsigned i = 0; i < m_top; ++i) {
-        ASSERT(currentSegment->data()[i]);
-        vector[count++] = currentSegment->data()[i];
-    }
-
-    currentSegment = currentSegment->next();
-    while (currentSegment) {
-        for (unsigned i = 0; i < s_segmentCapacity; ++i) {
-            ASSERT(currentSegment->data()[i]);
-            vector[count++] = currentSegment->data()[i];
-        }
-        currentSegment = currentSegment->next();
-    }
-}
-
 } // namespace JSC