Changeset 76425 in webkit for trunk/Source/JavaScriptCore/wtf/HashSet.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/wtf/HashSet.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/wtf/HashSet.h

@@ -176 +176 @@
 
     template<typename T, typename U, typename V>
-    pair<typename HashSet<T, U, V>::iterator, bool> HashSet<T, U, V>::add(const ValueType& value)
+    inline pair<typename HashSet<T, U, V>::iterator, bool> HashSet<T, U, V>::add(const ValueType& value)
     {
         return m_impl.add(value);
@@ -183 +183 @@
     template<typename Value, typename HashFunctions, typename Traits>
     template<typename T, typename HashTranslator>
-    pair<typename HashSet<Value, HashFunctions, Traits>::iterator, bool>
+    inline pair<typename HashSet<Value, HashFunctions, Traits>::iterator, bool>
     HashSet<Value, HashFunctions, Traits>::add(const T& value)
     {