Changeset 37985 in webkit for trunk/JavaScriptCore/runtime/StructureID.h

Timestamp:

Oct 29, 2008, 4:52:52 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-29 Sam Weinig <​[email protected]>

Reviewed by Geoffrey Garen.

Rename and move the StructureID transition table to its own file.

• GNUmakefile.am:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/StructureID.cpp: (JSC::StructureID::addPropertyTransition):
• runtime/StructureID.h: (JSC::StructureID::):
• runtime/StructureIDTransitionTable.h: Copied from runtime/StructureID.h. (JSC::StructureIDTransitionTableHash::hash): (JSC::StructureIDTransitionTableHash::equal):

File:

• trunk/JavaScriptCore/runtime/StructureID.h (modified) (4 diffs)

trunk/JavaScriptCore/runtime/StructureID.h

@@ -31 +31 @@
 #include "JSValue.h"
 #include "PropertyMap.h"
+#include "StructureIDTransitionTable.h"
 #include "TypeInfo.h"
 #include "ustring.h"
@@ -46 +47 @@
     class PropertyNameArrayData;
     class StructureIDChain;
-
-    struct TransitionTableHash {
-        typedef std::pair<RefPtr<UString::Rep>, unsigned> TransitionTableKey;
-        static unsigned hash(const TransitionTableKey& p)
-        {
-            return p.first->computedHash();
-        }
-
-        static bool equal(const TransitionTableKey& a, const TransitionTableKey& b)
-        {
-            return a == b;
-        }
-
-        static const bool safeToCompareToEmptyOrDeleted = true;
-    };
-
-    struct TransitionTableHashTraits {
-        typedef WTF::HashTraits<RefPtr<UString::Rep> > FirstTraits;
-        typedef WTF::GenericHashTraits<unsigned> SecondTraits;
-        typedef std::pair<FirstTraits::TraitType, SecondTraits::TraitType> TraitType;
-
-        static const bool emptyValueIsZero = FirstTraits::emptyValueIsZero && SecondTraits::emptyValueIsZero;
-        static TraitType emptyValue() { return std::make_pair(FirstTraits::emptyValue(), SecondTraits::emptyValue()); }
-
-        static const bool needsDestruction = FirstTraits::needsDestruction || SecondTraits::needsDestruction;
-
-        static void constructDeletedValue(TraitType& slot) { FirstTraits::constructDeletedValue(slot.first); }
-        static bool isDeletedValue(const TraitType& value) { return FirstTraits::isDeletedValue(value.first); }
-    };
 
     class StructureID : public RefCounted<StructureID> {
@@ -141 +113 @@
 
     private:
-        typedef std::pair<RefPtr<UString::Rep>, unsigned> TransitionTableKey;
-        typedef HashMap<TransitionTableKey, StructureID*, TransitionTableHash, TransitionTableHashTraits> TransitionTable;
-
         StructureID(JSValue* prototype, const TypeInfo&);
         
@@ -159 +128 @@
         union {
             StructureID* singleTransition;
-            TransitionTable* table;
+            StructureIDTransitionTable* table;
         } m_transitions;