Index: src/heap/heap.cc |
diff --git a/src/heap/heap.cc b/src/heap/heap.cc |
index 634d1b3c7d11b55d204c2a1c4649ae61ec1c1b27..1b3a9f411b3cda67d6f6dea2e2f92a60a5add10c 100644 |
--- a/src/heap/heap.cc |
+++ b/src/heap/heap.cc |
@@ -519,17 +519,19 @@ void Heap::MergeAllocationSitePretenuringFeedback( |
if (map_word.IsForwardingAddress()) { |
site = AllocationSite::cast(map_word.ToForwardingAddress()); |
} |
- DCHECK(site->IsAllocationSite()); |
+ |
+ // We have not validated the allocation site yet, since we have not |
+ // dereferenced the site during collecting information. |
+ // This is an inlined check of AllocationMemento::IsValid. |
+ if (!site->IsAllocationSite() || site->IsZombie()) continue; |
+ |
int value = |
static_cast<int>(reinterpret_cast<intptr_t>(local_entry->value)); |
DCHECK_GT(value, 0); |
- { |
- // TODO(mlippautz): For parallel processing we need synchronization here. |
- if (site->IncrementMementoFoundCount(value)) { |
- global_pretenuring_feedback_->LookupOrInsert( |
- site, static_cast<uint32_t>(bit_cast<uintptr_t>(site))); |
- } |
+ if (site->IncrementMementoFoundCount(value)) { |
+ global_pretenuring_feedback_->LookupOrInsert(site, |
+ ObjectHash(site->address())); |
} |
} |
} |