diff options
| author | Ben Murdoch <benm@google.com> | 2012-01-20 14:57:15 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2012-01-20 14:57:15 +0000 |
| commit | 2b4ba1175df6a5a6b9b5cda034189197bf6565ec (patch) | |
| tree | 6a4c479deebb22e68c5d7b915609593adee56a92 /src/profile-generator.h | |
| parent | 35e02d4f35686cd3d202dab09aa0fdf24651afed (diff) | |
| download | android_external_v8-2b4ba1175df6a5a6b9b5cda034189197bf6565ec.tar.gz android_external_v8-2b4ba1175df6a5a6b9b5cda034189197bf6565ec.tar.bz2 android_external_v8-2b4ba1175df6a5a6b9b5cda034189197bf6565ec.zip | |
Merge V8 at r10446: Roll to 3.6.6.19
Bug: 5688872
Change-Id: Ie6be41e043db4e38abeb6b8d92761d7cc2c294bf
Diffstat (limited to 'src/profile-generator.h')
| -rw-r--r-- | src/profile-generator.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/profile-generator.h b/src/profile-generator.h index da1fdc33..0beb109e 100644 --- a/src/profile-generator.h +++ b/src/profile-generator.h @@ -735,7 +735,8 @@ class HeapObjectsMap { static uint32_t AddressHash(Address addr) { return ComputeIntegerHash( - static_cast<uint32_t>(reinterpret_cast<uintptr_t>(addr))); + static_cast<uint32_t>(reinterpret_cast<uintptr_t>(addr)), + v8::internal::kZeroHashSeed); } bool initial_fill_mode_; @@ -836,7 +837,8 @@ class HeapEntriesMap { static uint32_t Hash(HeapThing thing) { return ComputeIntegerHash( - static_cast<uint32_t>(reinterpret_cast<uintptr_t>(thing))); + static_cast<uint32_t>(reinterpret_cast<uintptr_t>(thing)), + v8::internal::kZeroHashSeed); } static bool HeapThingsMatch(HeapThing key1, HeapThing key2) { return key1 == key2; @@ -1018,7 +1020,8 @@ class NativeObjectsExplorer : public HeapEntriesAllocator { void VisitSubtreeWrapper(Object** p, uint16_t class_id); static uint32_t InfoHash(v8::RetainedObjectInfo* info) { - return ComputeIntegerHash(static_cast<uint32_t>(info->GetHash())); + return ComputeIntegerHash(static_cast<uint32_t>(info->GetHash()), + v8::internal::kZeroHashSeed); } static bool RetainedInfosMatch(void* key1, void* key2) { return key1 == key2 || @@ -1096,7 +1099,8 @@ class HeapSnapshotJSONSerializer { INLINE(static uint32_t ObjectHash(const void* key)) { return ComputeIntegerHash( - static_cast<uint32_t>(reinterpret_cast<uintptr_t>(key))); + static_cast<uint32_t>(reinterpret_cast<uintptr_t>(key)), + v8::internal::kZeroHashSeed); } void EnumerateNodes(); |