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

Timestamp:

Nov 14, 2011, 10:58:19 PM (14 years ago)

Author:

[email protected]

Message:

Weak reference harvesters should run to fixpoint
​https://bugs.webkit.org/show_bug.cgi?id=72346

Reviewed by Oliver Hunt.

• heap/Heap.cpp:

(JSC::Heap::markRoots):

• heap/ListableHandler.h:

(JSC::ListableHandler::next):
(JSC::ListableHandler::List::head):
(JSC::ListableHandler::List::removeNext):
(JSC::ListableHandler::List::removeAll):

• heap/MarkStack.cpp:

(JSC::MarkStackThreadSharedData::reset):
(JSC::SlotVisitor::harvestWeakReferences):

• heap/MarkStack.h:

(JSC::MarkStack::isEmpty):

File:

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

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -685 +685 @@
     {
         GCPHASE(VisitingWeakHandles);
-        int lastOpaqueRootCount;
-        do {
-            lastOpaqueRootCount = visitor.opaqueRootCount();
+        while (true) {
             m_handleHeap.visitWeakHandles(heapRootVisitor);
+            harvestWeakReferences();
+            if (visitor.isEmpty())
+                break;
             {
                 ParallelModeEnabler enabler(visitor);
@@ -696 +697 @@
 #endif
             }
-            // If the set of opaque roots has grown, more weak handles may have become reachable.
-        } while (lastOpaqueRootCount != visitor.opaqueRootCount());
+        }
     }
     GCCOUNTER(VisitedValueCount, visitor.visitCount());
-
-    {
-        GCPHASE(HarvestWeakReferences);
-        harvestWeakReferences();
-    }
 
     visitor.reset();