Commit a17ed358 authored by Ulan Degenbaev's avatar Ulan Degenbaev Committed by Commit Bot

[heap] Fix assert in Heap::NotifyObjectLayoutChange

This partially relands b35a0789.

Bug: chromium:752426
Change-Id: Ia6f9853115278109189291bca92e94974cfe35b0
Reviewed-on: https://chromium-review.googlesource.com/610580Reviewed-by: 's avatarMichael Lippautz <mlippautz@chromium.org>
Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47289}
parent 4af9cfcc
......@@ -4607,7 +4607,8 @@ void Heap::RegisterDeserializedObjectsForBlackAllocation(
void Heap::NotifyObjectLayoutChange(HeapObject* object, int size,
const DisallowHeapAllocation&) {
DCHECK(InOldSpace(object) || InNewSpace(object));
DCHECK(InOldSpace(object) || InNewSpace(object) ||
(lo_space()->Contains(object) && object->IsString()));
if (FLAG_incremental_marking && incremental_marking()->IsMarking()) {
incremental_marking()->MarkBlackAndPush(object);
if (InOldSpace(object) && incremental_marking()->IsCompacting()) {
......
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