Changeset 118868 in webkit

Timestamp:

May 29, 2012, 6:05:35 PM (14 years ago)

Author:

ggaren@apple.com

Message:

Rolled back in r118646, now that
​https://bugs.webkit.org/show_bug.cgi?id=87784 is fixed.

​http://trac.webkit.org/changeset/118646
​https://bugs.webkit.org/show_bug.cgi?id=87599

• heap/Heap.cpp:

(JSC::Heap::collect):

• heap/MarkedBlock.cpp:

(JSC::MarkedBlock::sweep):

• heap/MarkedBlock.h:

(JSC):

• heap/MarkedSpace.cpp:

(JSC):

• heap/MarkedSpace.h:

(MarkedSpace):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/Heap.cpp (modified) (1 diff)
• heap/MarkedBlock.cpp (modified) (1 diff)
• heap/MarkedBlock.h (modified) (2 diffs)
• heap/MarkedSpace.cpp (modified) (2 diffs)
• heap/MarkedSpace.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-05-29  Geoffrey Garen  <ggaren@apple.com>
+
+        Rolled back in r118646, now that
+        https://bugs.webkit.org/show_bug.cgi?id=87784 is fixed.
+
+        http://trac.webkit.org/changeset/118646
+        https://bugs.webkit.org/show_bug.cgi?id=87599
+
+        * heap/Heap.cpp:
+        (JSC::Heap::collect):
+        * heap/MarkedBlock.cpp:
+        (JSC::MarkedBlock::sweep):
+        * heap/MarkedBlock.h:
+        (JSC):
+        * heap/MarkedSpace.cpp:
+        (JSC):
+        * heap/MarkedSpace.h:
+        (MarkedSpace):
+
 2012-05-29  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -688 +688 @@
     {
         GCPHASE(FinalizeWeakHandles);
-        m_objectSpace.sweepWeakSets();
         m_globalData->smallStrings.finalizeSmallStrings();
     }

trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp

@@ -115 +115 @@
     HEAP_LOG_BLOCK_STATE_TRANSITION(this);
 
+    m_weakSet.sweep();
+
     if (sweepMode == SweepOnly && !m_cellsNeedDestruction)
         return FreeList();

trunk/Source/JavaScriptCore/heap/MarkedBlock.h

@@ -134 +134 @@
         void visitWeakSet(HeapRootVisitor&);
         void reapWeakSet();
-        void sweepWeakSet();
 
         // While allocating from a free list, MarkedBlock temporarily has bogus
@@ -286 +285 @@
     {
         m_weakSet.reap();
-    }
-
-    inline void MarkedBlock::sweepWeakSet()
-    {
-        m_weakSet.sweep();
     }
 

trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp

@@ -78 +78 @@
 };
 
-struct SweepWeakSet : MarkedBlock::VoidFunctor {
-    void operator()(MarkedBlock* block) { block->sweepWeakSet(); }
-};
-
 MarkedSpace::MarkedSpace(Heap* heap)
     : m_heap(heap)
@@ -141 +137 @@
 {
     forEachBlock<ReapWeakSet>();
-}
-
-void MarkedSpace::sweepWeakSets()
-{
-    forEachBlock<SweepWeakSet>();
 }
 

trunk/Source/JavaScriptCore/heap/MarkedSpace.h

@@ -86 +86 @@
     void visitWeakSets(HeapRootVisitor&);
     void reapWeakSets();
-    void sweepWeakSets();
 
     MarkedBlockSet& blocks() { return m_blocks; }