Changeset 82874 in webkit

Timestamp:

Apr 4, 2011 2:29:56 PM (13 years ago)

Author:

ggaren@apple.com

Message:

2011-04-04 Geoffrey Garen <​ggaren@apple.com>

Reviewed by Oliver Hunt.

Standardized handling of handles for immediate values
​https://bugs.webkit.org/show_bug.cgi?id=57788

• collector/handles/HandleHeap.cpp: (JSC::HandleHeap::clearWeakPointers): Don't check for null or non-cell values here, because our write barrier guarantees that such values are not in the weak list.

(JSC::HandleHeap::writeBarrier): Standardized on checking for null before
checking for cell, and on using early return instead of if/else.

• collector/handles/HandleHeap.h: (JSC::HandleHeap::deallocate): (JSC::HandleHeap::makeWeak): Ditto.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• collector/handles/HandleHeap.cpp (modified) (2 diffs)
• collector/handles/HandleHeap.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-04-04  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Standardized handling of handles for immediate values
+        https://bugs.webkit.org/show_bug.cgi?id=57788
+
+        * collector/handles/HandleHeap.cpp:
+        (JSC::HandleHeap::clearWeakPointers): Don't check for null or non-cell
+        values here, because our write barrier guarantees that such values are
+        not in the weak list.
+
+        (JSC::HandleHeap::writeBarrier): Standardized on checking for null before
+        checking for cell, and on using early return instead of if/else.
+
+        * collector/handles/HandleHeap.h:
+        (JSC::HandleHeap::deallocate):
+        (JSC::HandleHeap::makeWeak): Ditto.
+
 2011-04-04  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/collector/handles/HandleHeap.cpp

@@ -68 +68 @@
 
         JSValue value = *node->slot();
-        if (!value || !value.isCell())
-            continue;
-        
+        ASSERT(value);
+
         JSCell* cell = value.asCell();
-        ASSERT(!cell || cell->structure());
-        
+        ASSERT(cell && cell->structure());
 #if ENABLE(JSC_ZOMBIES)
         ASSERT(!cell->isZombie());
 #endif
+
         if (Heap::isMarked(cell))
             continue;
@@ -98 +97 @@
     ASSERT(!m_nextToFinalize); // Forbid assignment to handles during the finalization phase, since it would violate many GC invariants.
 
-    if (slot->isCell() == value.isCell() && !value == !*slot)
+    if (!value == !*slot && slot->isCell() == value.isCell())
         return;
+
     Node* node = toNode(slot);
     SentinelLinkedList<Node>::remove(node);
-    if (!value.isCell() || !value) {
+    if (!value || !value.isCell()) {
         m_immediateList.push(node);
         return;
     }
-    if (node->isWeak())
+
+    if (node->isWeak()) {
         m_weakList.push(node);
-    else
-        m_strongList.push(node);
+        return;
+    }
+
+    m_strongList.push(node);
 }
 

trunk/Source/JavaScriptCore/collector/handles/HandleHeap.h

@@ -146 +146 @@
 {
     Node* node = toNode(handle);
-    if (m_nextToFinalize == node) {
+    if (node == m_nextToFinalize) {
         m_nextToFinalize = node->next();
         ASSERT(m_nextToFinalize->next());
     }
+
     SentinelLinkedList<Node>::remove(node);
     m_freeList.push(node);
@@ -157 +158 @@
 {
     Node* node = toNode(handle);
+    node->makeWeak(weakOwner, context);
+
     SentinelLinkedList<Node>::remove(node);
-    node->makeWeak(weakOwner, context);
-    if (handle->isCell() && *handle)
-        m_weakList.push(node);
-    else
+    if (!*handle || !handle->isCell()) {
         m_immediateList.push(node);
+        return;
+    }
+
+    m_weakList.push(node);
 }