Commit 5ecc5f22 authored by Haruka Matsumura's avatar Haruka Matsumura Committed by Commit Bot

Oilpan: Fix DCHECK for fixups_ in HeapCompaction

This CL changes DCHECK for fixups_ to Fixups().
They are guaranteed that AddCompactingPage() and RegisterMovingObjectCallback() are called before these method.
But we collect also HeapCollections that have no buffer so it is not guaranteed.

Bug: 864425
Change-Id: Id28cc98f060f4125bca04664a9e8416f9cf97fcc
Reviewed-on: https://chromium-review.googlesource.com/1156527Reviewed-by: default avatarKeishi Hattori <keishi@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Haruka Matsumura <harukamt@google.com>
Cr-Commit-Position: refs/heads/master@{#579692}
parent a3e03097
...@@ -422,19 +422,17 @@ void HeapCompact::FinishedArenaCompaction(NormalPageArena* arena, ...@@ -422,19 +422,17 @@ void HeapCompact::FinishedArenaCompaction(NormalPageArena* arena,
} }
void HeapCompact::Relocate(Address from, Address to) { void HeapCompact::Relocate(Address from, Address to) {
DCHECK(fixups_); Fixups().Relocate(from, to);
fixups_->Relocate(from, to);
} }
void HeapCompact::StartThreadCompaction() { void HeapCompact::StartThreadCompaction() {
if (!do_compact_) if (!do_compact_)
return; return;
DCHECK(fixups_);
// The mapping between the slots and the backing stores are created // The mapping between the slots and the backing stores are created
for (auto** slot : traced_slots_) { for (auto** slot : traced_slots_) {
if (*slot) if (*slot)
fixups_->Add(slot); Fixups().Add(slot);
} }
traced_slots_.clear(); traced_slots_.clear();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment