Chromium Code Reviews| Index: src/objects.h |
| diff --git a/src/objects.h b/src/objects.h |
| index 717b2ab07204c4f8155cb55cf5927067c3d7083b..bdf251176c339aec531b5d7a4d4cb181b10e5c80 100644 |
| --- a/src/objects.h |
| +++ b/src/objects.h |
| @@ -2754,10 +2754,11 @@ class SymbolTableShape { |
| static inline bool IsMatch(HashTableKey* key, Object* value) { |
| return key->IsMatch(value); |
| } |
| - static inline uint32_t Hash(HashTableKey* key) { |
| + static inline uint32_t Hash(HashTableKey* key, uint32_t) { |
| return key->Hash(); |
| } |
| - static inline uint32_t HashForObject(HashTableKey* key, Object* object) { |
| + static inline uint32_t HashForObject(HashTableKey* key, uint32_t, |
|
Erik Corry
2012/01/09 23:52:48
Formatting.
|
| + Object* object) { |
| return key->HashForObject(object); |
| } |
| MUST_USE_RESULT static inline MaybeObject* AsObject(HashTableKey* key) { |
| @@ -2813,11 +2814,12 @@ class MapCacheShape { |
| static inline bool IsMatch(HashTableKey* key, Object* value) { |
| return key->IsMatch(value); |
| } |
| - static inline uint32_t Hash(HashTableKey* key) { |
| + static inline uint32_t Hash(HashTableKey* key, uint32_t) { |
| return key->Hash(); |
| } |
| - static inline uint32_t HashForObject(HashTableKey* key, Object* object) { |
| + static inline uint32_t HashForObject(HashTableKey* key, uint32_t, |
|
Erik Corry
2012/01/09 23:52:48
Formatting.
|
| + Object* object) { |
| return key->HashForObject(object); |
| } |
| @@ -2967,8 +2969,9 @@ class Dictionary: public HashTable<Shape, Key> { |
| class StringDictionaryShape { |
| public: |
| static inline bool IsMatch(String* key, Object* other); |
| - static inline uint32_t Hash(String* key); |
| - static inline uint32_t HashForObject(String* key, Object* object); |
| + static inline uint32_t Hash(String* key, uint32_t); |
|
Erik Corry
2012/01/09 23:52:48
Parameter should have a name.
I'm unhappy that we
|
| + static inline uint32_t HashForObject(String* key, uint32_t, |
|
Erik Corry
2012/01/09 23:52:48
Formatting, and the parameter should have a name.
|
| + Object* object); |
| MUST_USE_RESULT static inline MaybeObject* AsObject(String* key); |
| static const int kPrefixSize = 2; |
| static const int kEntrySize = 3; |
| @@ -3000,8 +3003,9 @@ class StringDictionary: public Dictionary<StringDictionaryShape, String*> { |
| class NumberDictionaryShape { |
| public: |
| static inline bool IsMatch(uint32_t key, Object* other); |
| - static inline uint32_t Hash(uint32_t key); |
| - static inline uint32_t HashForObject(uint32_t key, Object* object); |
| + static inline uint32_t Hash(uint32_t key, uint32_t seed); |
| + static inline uint32_t HashForObject(uint32_t key, uint32_t seed, |
|
Erik Corry
2012/01/09 23:52:48
Formatting.
|
| + Object* object); |
| MUST_USE_RESULT static inline MaybeObject* AsObject(uint32_t key); |
| static const int kPrefixSize = 2; |
| static const int kEntrySize = 3; |
| @@ -3060,8 +3064,8 @@ template <int entrysize> |
| class ObjectHashTableShape { |
| public: |
| static inline bool IsMatch(Object* key, Object* other); |
| - static inline uint32_t Hash(Object* key); |
| - static inline uint32_t HashForObject(Object* key, Object* object); |
| + static inline uint32_t Hash(Object* key, uint32_t); |
|
Erik Corry
2012/01/09 23:52:48
Names for arguments x2
|
| + static inline uint32_t HashForObject(Object* key, uint32_t, Object* object); |
| MUST_USE_RESULT static inline MaybeObject* AsObject(Object* key); |
| static const int kPrefixSize = 0; |
| static const int kEntrySize = entrysize; |
| @@ -5975,11 +5979,12 @@ class CompilationCacheShape { |
| return key->IsMatch(value); |
| } |
| - static inline uint32_t Hash(HashTableKey* key) { |
| + static inline uint32_t Hash(HashTableKey* key, uint32_t) { |
| return key->Hash(); |
| } |
| - static inline uint32_t HashForObject(HashTableKey* key, Object* object) { |
| + static inline uint32_t HashForObject(HashTableKey* key, uint32_t, |
| + Object* object) { |
| return key->HashForObject(object); |
| } |
| @@ -6079,11 +6084,12 @@ class CodeCacheHashTableShape { |
| return key->IsMatch(value); |
| } |
| - static inline uint32_t Hash(HashTableKey* key) { |
| + static inline uint32_t Hash(HashTableKey* key, uint32_t) { |
| return key->Hash(); |
| } |
| - static inline uint32_t HashForObject(HashTableKey* key, Object* object) { |
| + static inline uint32_t HashForObject(HashTableKey* key, uint32_t, |
| + Object* object) { |
| return key->HashForObject(object); |
| } |