Changeset 76425 in webkit for trunk/Source/JavaScriptCore/runtime/MarkStack.h

Timestamp:

Jan 21, 2011, 8:27:18 PM (14 years ago)

Author:

[email protected]

Message:

2011-01-21 Geoffrey Garen <​[email protected]>

Reviewed by Maciej Stachowiak.

Cleaned up some conservative marking code.
​https://bugs.webkit.org/show_bug.cgi?id=52946

SunSpider reports no change.

• interpreter/RegisterFile.h: No need for a special marking function, since we already expose a start() and end().

• runtime/Heap.cpp: (JSC::Heap::registerFile): (JSC::Heap::markRoots):
• runtime/Heap.h: (JSC::Heap::contains): Migrated markConservatively() to the machine stack marker class. Now, Heap just provides a contains() function, which the machine stack marker uses for checking whether a pointer points into the heap.

• runtime/MachineStackMarker.cpp: (JSC::MachineStackMarker::markCurrentThreadConservativelyInternal): (JSC::MachineStackMarker::markOtherThreadConservatively): (JSC::isPointerAligned): (JSC::MachineStackMarker::markConservatively):
• runtime/MachineStackMarker.h: Move the conservative marking code here.

• runtime/MarkStack.h: (JSC::ConservativeSet::add): (JSC::ConservativeSet::mark): Changed to using a vector instead of hash set. Vector seems to be a bit faster, and it generates smaller code.

• runtime/MarkedSpace.cpp: (JSC::MarkedSpace::containsSlowCase):
• runtime/MarkedSpace.h: (JSC::MarkedSpace::isCellAligned): (JSC::MarkedSpace::isPossibleCell): (JSC::MarkedSpace::contains): Kept the code for determining whether a pointer pointed into marked space, and moved the code for marking a set of conservative pointers into the machine stack marker.

• wtf/HashSet.h: (WTF::::add): Added two missing inlines that I noticed while testing vector vs hash set.

File:

• trunk/Source/JavaScriptCore/runtime/MarkStack.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/MarkStack.h

@@ -28 +28 @@
 
 #include "JSValue.h"
-#include <wtf/HashSet.h>
+#include <wtf/Vector.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/OSAllocator.h>
@@ -191 +191 @@
     class ConservativeSet {
     public:
-        void add(JSCell* cell) { m_set.add(cell); }
+        void add(JSCell* cell) { m_vector.append(cell); }
         void mark(MarkStack& markStack)
         {
-            HashSet<JSCell*>::iterator end = m_set.end();
-            for (HashSet<JSCell*>::iterator it = m_set.begin(); it != end; ++it)
-                markStack.append(*it);
+            for (size_t i = 0; i < m_vector.size(); ++i)
+                markStack.append(m_vector[i]);
         }
 
     private:
-        HashSet<JSCell*> m_set;
+        Vector<JSCell*, 64> m_vector;
     };
 }