diff --git a/src/profile-generator-inl.h b/src/profile-generator-inl.h index 71de2d1797..c8c98cc784 100644 --- a/src/profile-generator-inl.h +++ b/src/profile-generator-inl.h @@ -122,6 +122,11 @@ CodeEntry* ProfileGenerator::EntryForVMState(StateTag tag) { } +inline uint64_t HeapEntry::id() { + return *(reinterpret_cast(&id_)); +} + + template void HeapEntriesMap::UpdateEntries(Visitor* visitor) { for (HashMap::Entry* p = entries_.Start(); diff --git a/src/profile-generator.cc b/src/profile-generator.cc index 9f475a4913..8a871a5981 100644 --- a/src/profile-generator.cc +++ b/src/profile-generator.cc @@ -870,7 +870,7 @@ void HeapEntry::Init(HeapSnapshot* snapshot, type_ = type; painted_ = kUnpainted; name_ = name; - id_ = id; + *(reinterpret_cast(&id_)) = id; self_size_ = self_size; retained_size_ = 0; children_count_ = children_count; @@ -952,7 +952,7 @@ void HeapEntry::PaintAllReachable() { void HeapEntry::Print(int max_depth, int indent) { - OS::Print("%6d %6d [%llu] ", self_size(), RetainedSize(false), id_); + OS::Print("%6d %6d [%llu] ", self_size(), RetainedSize(false), id()); if (type() != kString) { OS::Print("%s %.40s\n", TypeAsString(), name_); } else { diff --git a/src/profile-generator.h b/src/profile-generator.h index 7f8ffbdba4..0773a1e1d0 100644 --- a/src/profile-generator.h +++ b/src/profile-generator.h @@ -526,7 +526,7 @@ class HeapEntry BASE_EMBEDDED { HeapSnapshot* snapshot() { return snapshot_; } Type type() { return static_cast(type_); } const char* name() { return name_; } - uint64_t id() { return id_; } + uint64_t id(); int self_size() { return self_size_; } int retained_size() { return retained_size_; } void add_retained_size(int size) { retained_size_ += size; } @@ -615,8 +615,11 @@ class HeapEntry BASE_EMBEDDED { }; HeapEntry* dominator_; HeapSnapshot* snapshot_; + struct Id { + uint32_t id1_; + uint32_t id2_; + } id_; // This is to avoid extra padding of 64-bit value on MSVC. const char* name_; - uint64_t id_; // Paints used for exact retained sizes calculation. static const unsigned kUnpainted = 0;