Changeset 115538 in webkit for trunk/Source/JavaScriptCore/heap/WeakSet.cpp

Timestamp:

Apr 27, 2012, 9:26:01 PM (13 years ago)

Author:

[email protected]

Message:

Stop using aligned allocation for WeakBlock
​https://bugs.webkit.org/show_bug.cgi?id=85124

Reviewed by Anders Carlsson.

We don't actually use the alignment for anything.

• heap/WeakBlock.cpp:

(JSC::WeakBlock::create):
(JSC::WeakBlock::WeakBlock): Switched from aligned allocation to regular
allocation.

• heap/WeakBlock.h:

(WeakBlock): Don't use HeapBlock because HeapBlock requires aligned
allocation. This change required me to add some declarations that we used
to inherit from HeapBlock.

(WeakBlock::blockFor): Removed. This function relied on aligned allocation
but didn't do anything for us.

(WeakBlock::deallocate): Removed. WeakBlock doesn't own any of the deallocation
logic, so it shouldn't own the function.

• heap/WeakSet.cpp:

(JSC::WeakSet::~WeakSet):
(JSC::WeakSet::finalizeAll):
(JSC::WeakSet::visitLiveWeakImpls):
(JSC::WeakSet::visitDeadWeakImpls):
(JSC::WeakSet::sweep):
(JSC::WeakSet::shrink):
(JSC::WeakSet::resetAllocator):
(JSC::WeakSet::tryFindAllocator):

• heap/WeakSet.h:

(WeakSet): Updated declarations to reflect WeakBlock not inheriting from
HeapBlock. This allowed me to remove some casts, which was nice.

(JSC::WeakSet::deallocate): Directly set the deallocated flag instead of
asking WeakBlock to do it for us. We don't need to have a WeakBlock
pointer to set the flag, so stop asking for one.

File:

• trunk/Source/JavaScriptCore/heap/WeakSet.cpp (modified) (8 diffs)

trunk/Source/JavaScriptCore/heap/WeakSet.cpp

@@ -34 +34 @@
 {
     WeakBlock* next = 0;
-    for (WeakBlock* block = static_cast<WeakBlock*>(m_blocks.head()); block; block = next) {
-        next = static_cast<WeakBlock*>(block->next());
+    for (WeakBlock* block = m_blocks.head(); block; block = next) {
+        next = block->next();
         WeakBlock::destroy(block);
     }
@@ -43 +43 @@
 void WeakSet::finalizeAll()
 {
-    for (WeakBlock* block = static_cast<WeakBlock*>(m_blocks.head()); block; block = static_cast<WeakBlock*>(block->next()))
+    for (WeakBlock* block = m_blocks.head(); block; block = block->next())
         block->finalizeAll();
 }
@@ -49 +49 @@
 void WeakSet::visitLiveWeakImpls(HeapRootVisitor& visitor)
 {
-    for (WeakBlock* block = static_cast<WeakBlock*>(m_blocks.head()); block; block = static_cast<WeakBlock*>(block->next()))
+    for (WeakBlock* block = m_blocks.head(); block; block = block->next())
         block->visitLiveWeakImpls(visitor);
 }
@@ -55 +55 @@
 void WeakSet::visitDeadWeakImpls(HeapRootVisitor& visitor)
 {
-    for (WeakBlock* block = static_cast<WeakBlock*>(m_blocks.head()); block; block = static_cast<WeakBlock*>(block->next()))
+    for (WeakBlock* block = m_blocks.head(); block; block = block->next())
         block->visitDeadWeakImpls(visitor);
 }
@@ -62 +62 @@
 {
     WeakBlock* next;
-    for (WeakBlock* block = static_cast<WeakBlock*>(m_blocks.head()); block; block = next) {
-        next = static_cast<WeakBlock*>(block->next());
+    for (WeakBlock* block = m_blocks.head(); block; block = next) {
+        next = block->next();
 
         // If a block is completely empty, a new sweep won't have any effect.
@@ -77 +77 @@
 {
     WeakBlock* next;
-    for (WeakBlock* block = static_cast<WeakBlock*>(m_blocks.head()); block; block = next) {
-        next = static_cast<WeakBlock*>(block->next());
+    for (WeakBlock* block = m_blocks.head(); block; block = next) {
+        next = block->next();
 
         if (!block->sweepResult().isNull() && block->sweepResult().blockIsFree)
@@ -88 +88 @@
 {
     m_allocator = 0;
-    m_nextAllocator = static_cast<WeakBlock*>(m_blocks.head());
+    m_nextAllocator = m_blocks.head();
 }
 
@@ -103 +103 @@
     while (m_nextAllocator) {
         WeakBlock* block = m_nextAllocator;
-        m_nextAllocator = static_cast<WeakBlock*>(m_nextAllocator->next());
+        m_nextAllocator = m_nextAllocator->next();
 
         block->sweep();