Changeset 80985 in webkit for trunk/Source/JavaScriptCore/runtime/ConservativeSet.h

Timestamp:

Mar 13, 2011, 6:16:15 PM (14 years ago)

Author:

[email protected]

Message:

2011-03-13 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

Removed another case of DeprecatedPtr (ConservativeSet)
​https://bugs.webkit.org/show_bug.cgi?id=56281

The ConservativeSet is an internal data structure used during marking,
so direct pointers are fine.

• runtime/ConservativeSet.cpp: (JSC::ConservativeSet::grow):
• runtime/ConservativeSet.h: Added some accessors, for use by MarkStack::append. (JSC::ConservativeSet::~ConservativeSet): Fixed a typo where we calculated the size of the set based on sizeof(DeprecatedPtr<T>*) instead of sizeof(DeprecatedPtr<T>). I'm not sure if this had real-world implications or not. (JSC::ConservativeSet::size): (JSC::ConservativeSet::set): Use direct pointers, as stated above.

• runtime/Heap.cpp: (JSC::Heap::markRoots):
• runtime/MarkStack.h: (JSC::MarkStack::append): Created a special case of append for ConservativeSet. I didn't want to add back a generic "append JSCell*" function, since other class might start using that wrong. (In the end, this function might go away, since the Heap will want to do something slightly more interesting with the conservative set, but this is OK for now.)

File:

• trunk/Source/JavaScriptCore/runtime/ConservativeSet.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/runtime/ConservativeSet.h

@@ -27 +27 @@
 #define ConservativeSet_h
 
-#include "Heap.h"
-#include "MarkStack.h"
+#include <wtf/OSAllocator.h>
 #include <wtf/Vector.h>
 
@@ -34 +33 @@
 
 class JSCell;
+class Heap;
+
+// May contain duplicates.
 
 class ConservativeSet {
@@ -41 +43 @@
 
     void add(void* begin, void* end);
-    void mark(MarkStack&);
+    
+    size_t size();
+    JSCell** set();
 
 private:
@@ -50 +54 @@
 
     Heap* m_heap;
-    DeprecatedPtr<JSCell>* m_set;
+    JSCell** m_set;
     size_t m_size;
     size_t m_capacity;
-    DeprecatedPtr<JSCell> m_inlineSet[inlineCapacity];
+    JSCell* m_inlineSet[inlineCapacity];
 };
 
@@ -67 +71 @@
 {
     if (m_set != m_inlineSet)
-        OSAllocator::decommitAndRelease(m_set, m_capacity * sizeof(DeprecatedPtr<JSCell>*));
+        OSAllocator::decommitAndRelease(m_set, m_capacity * sizeof(JSCell*));
 }
 
-inline void ConservativeSet::mark(MarkStack& markStack)
+inline size_t ConservativeSet::size()
 {
-    for (size_t i = 0; i < m_size; ++i)
-        markStack.append(&m_set[i]);
+    return m_size;
+}
+
+inline JSCell** ConservativeSet::set()
+{
+    return m_set;
 }