Index: src/objects.cc |
=================================================================== |
--- src/objects.cc (revision 10379) |
+++ src/objects.cc (working copy) |
@@ -6077,14 +6077,14 @@ |
if (StringShape(this).IsSequentialAscii()) { |
field = HashSequentialString(SeqAsciiString::cast(this)->GetChars(), |
len, |
- GetHeap()->StringHashSeed()); |
+ GetHeap()->HashSeed()); |
} else if (StringShape(this).IsSequentialTwoByte()) { |
field = HashSequentialString(SeqTwoByteString::cast(this)->GetChars(), |
len, |
- GetHeap()->StringHashSeed()); |
+ GetHeap()->HashSeed()); |
} else { |
StringInputBuffer buffer(this); |
- field = ComputeHashField(&buffer, len, GetHeap()->StringHashSeed()); |
+ field = ComputeHashField(&buffer, len, GetHeap()->HashSeed()); |
} |
// Store the hash code in the object. |
@@ -9671,7 +9671,7 @@ |
uint32_t Hash() { |
ASSERT(length_ >= 0); |
ASSERT(from_ + length_ <= string_->length()); |
- StringHasher hasher(length_, string_->GetHeap()->StringHashSeed()); |
+ StringHasher hasher(length_, string_->GetHeap()->HashSeed()); |
// Very long strings have a trivial hash that doesn't inspect the |
// string contents. |
@@ -9880,7 +9880,7 @@ |
uint32_t from_index = EntryToIndex(i); |
Object* k = get(from_index); |
if (IsKey(k)) { |
- uint32_t hash = Shape::HashForObject(key, k); |
+ uint32_t hash = HashTable<Shape, Key>::HashForObject(key, k); |
uint32_t insertion_index = |
EntryToIndex(new_table->FindInsertionEntry(hash)); |
for (int j = 0; j < Shape::kEntrySize; j++) { |
@@ -10576,7 +10576,7 @@ |
bool SymbolTable::LookupTwoCharsSymbolIfExists(uint32_t c1, |
uint32_t c2, |
String** symbol) { |
- TwoCharHashTableKey key(c1, c2, GetHeap()->StringHashSeed()); |
+ TwoCharHashTableKey key(c1, c2, GetHeap()->HashSeed()); |
int entry = FindEntry(&key); |
if (entry == kNotFound) { |
return false; |
@@ -10591,14 +10591,14 @@ |
MaybeObject* SymbolTable::LookupSymbol(Vector<const char> str, |
Object** s) { |
- Utf8SymbolKey key(str, GetHeap()->StringHashSeed()); |
+ Utf8SymbolKey key(str, GetHeap()->HashSeed()); |
return LookupKey(&key, s); |
} |
MaybeObject* SymbolTable::LookupAsciiSymbol(Vector<const char> str, |
Object** s) { |
- AsciiSymbolKey key(str, GetHeap()->StringHashSeed()); |
+ AsciiSymbolKey key(str, GetHeap()->HashSeed()); |
return LookupKey(&key, s); |
} |
@@ -10607,14 +10607,14 @@ |
int from, |
int length, |
Object** s) { |
- SubStringAsciiSymbolKey key(str, from, length, GetHeap()->StringHashSeed()); |
+ SubStringAsciiSymbolKey key(str, from, length, GetHeap()->HashSeed()); |
return LookupKey(&key, s); |
} |
MaybeObject* SymbolTable::LookupTwoByteSymbol(Vector<const uc16> str, |
Object** s) { |
- TwoByteSymbolKey key(str, GetHeap()->StringHashSeed()); |
+ TwoByteSymbolKey key(str, GetHeap()->HashSeed()); |
return LookupKey(&key, s); |
} |
@@ -10971,8 +10971,9 @@ |
if (!maybe_k->ToObject(&k)) return maybe_k; |
} |
PropertyDetails details = PropertyDetails(NONE, NORMAL); |
- return Dictionary<Shape, Key>::cast(obj)-> |
- AddEntry(key, value, details, Shape::Hash(key)); |
+ |
+ return Dictionary<Shape, Key>::cast(obj)->AddEntry(key, value, details, |
+ Dictionary<Shape, Key>::Hash(key)); |
} |
@@ -10987,8 +10988,9 @@ |
{ MaybeObject* maybe_obj = EnsureCapacity(1, key); |
if (!maybe_obj->ToObject(&obj)) return maybe_obj; |
} |
- return Dictionary<Shape, Key>::cast(obj)-> |
- AddEntry(key, value, details, Shape::Hash(key)); |
+ |
+ return Dictionary<Shape, Key>::cast(obj)->AddEntry(key, value, details, |
+ Dictionary<Shape, Key>::Hash(key)); |
} |