JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / heap / WeakSet.cpp

diff --git a/heap/WeakSet.cpp b/heap/WeakSet.cpp
index 556c8515bd23a71117cf866b81dec8a19ec55bb6..1eed8c37ac0a7927e5904d6b122179b327088c78 100644 (file)
--- a/heap/WeakSet.cpp
+++ b/heap/WeakSet.cpp
@@ -37,15 +37,26 @@ WeakSet::~WeakSet()
     WeakBlock* next = 0;
     for (WeakBlock* block = m_blocks.head(); block; block = next) {
         next = block->next();
     WeakBlock* next = 0;
     for (WeakBlock* block = m_blocks.head(); block; block = next) {
         next = block->next();

-        heap()->blockAllocator().deallocate(WeakBlock::destroy(block));
+        WeakBlock::destroy(block);

     }
     m_blocks.clear();
 }
 
 void WeakSet::sweep()
 {
     }
     m_blocks.clear();
 }
 
 void WeakSet::sweep()
 {

-    for (WeakBlock* block = m_blocks.head(); block; block = block->next())
+    for (WeakBlock* block = m_blocks.head(); block;) {
+        WeakBlock* nextBlock = block->next();

         block->sweep();
         block->sweep();

+        if (block->isLogicallyEmptyButNotFree()) {
+            // If this WeakBlock is logically empty, but still has Weaks pointing into it,
+            // we can't destroy it just yet. Detach it from the WeakSet and hand ownership
+            // to the Heap so we don't pin down the entire 64kB MarkedBlock.
+            m_blocks.remove(block);
+            heap()->addLogicallyEmptyWeakBlock(block);
+            block->disconnectMarkedBlock();
+        }
+        block = nextBlock;
+    }

 
     resetAllocator();
 }
 
     resetAllocator();
 }


@@ -74,7 +85,7 @@ WeakBlock::FreeCell* WeakSet::tryFindAllocator()
 
 WeakBlock::FreeCell* WeakSet::addAllocator()
 {
 
 WeakBlock::FreeCell* WeakSet::addAllocator()
 {

-    WeakBlock* block = WeakBlock::create(heap()->blockAllocator().allocate<WeakBlock>());
+    WeakBlock* block = WeakBlock::create(m_markedBlock);

     heap()->didAllocate(WeakBlock::blockSize);
     m_blocks.append(block);
     WeakBlock::SweepResult sweepResult = block->takeSweepResult();
     heap()->didAllocate(WeakBlock::blockSize);
     m_blocks.append(block);
     WeakBlock::SweepResult sweepResult = block->takeSweepResult();


@@ -85,7 +96,7 @@ WeakBlock::FreeCell* WeakSet::addAllocator()
 void WeakSet::removeAllocator(WeakBlock* block)
 {
     m_blocks.remove(block);
 void WeakSet::removeAllocator(WeakBlock* block)
 {
     m_blocks.remove(block);

-    heap()->blockAllocator().deallocate(WeakBlock::destroy(block));
+    WeakBlock::destroy(block);

 }
 
 } // namespace JSC
 }
 
 } // namespace JSC