AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[heap] Make Heap::PageFlagsAreConsistent() RO objects friendly

Browse Source 
... and make the checks stricter.

Bug: chromium:954852
Change-Id: Ib28246d275b0cadff00012f02f8aca4c4c235cc5
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1581599
Commit-Queue: Igor Sheludko <ishell@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#60982}
This commit is contained in:
Igor Sheludko 2019-04-24 14:57:38 +02:00 committed by Commit Bot
parent ae6a47bad7
commit f025cef9d9
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/heap/heap.cc
View File

@ -5918,20 +5918,35 @@ void Heap::MarkingBarrierForDescriptorArraySlow(Heap* heap, HeapObject host,
}
bool Heap::PageFlagsAreConsistent(HeapObject object) {
Heap* heap = Heap::FromWritableHeapObject(object);
MemoryChunk* chunk = MemoryChunk::FromHeapObject(object);
heap_internals::MemoryChunk* slim_chunk =
heap_internals::MemoryChunk::FromHeapObject(object);
const bool generation_consistency =
chunk->owner()->identity() != NEW_SPACE ||
(chunk->InYoungGeneration() && slim_chunk->InYoungGeneration());
const bool marking_consistency =
!heap->incremental_marking()->IsMarking() ||
(chunk->IsFlagSet(MemoryChunk::INCREMENTAL_MARKING) &&
slim_chunk->IsMarking());
// Slim chunk flags consistency.
CHECK_EQ(chunk->InYoungGeneration(), slim_chunk->InYoungGeneration());
CHECK_EQ(chunk->IsFlagSet(MemoryChunk::INCREMENTAL_MARKING),
slim_chunk->IsMarking());
return generation_consistency && marking_consistency;
Space* chunk_owner = chunk->owner();
AllocationSpace identity = chunk_owner->identity();
// Generation consistency.
CHECK_EQ(identity == NEW_SPACE || identity == NEW_LO_SPACE,
slim_chunk->InYoungGeneration());
// Marking consistency.
if (identity != RO_SPACE ||
static_cast<ReadOnlySpace*>(chunk->owner())->writable()) {
// RO_SPACE can be shared between heaps, so we can't use RO_SPACE objects to
// find a heap. The exception is when the ReadOnlySpace is writeable, during
// bootstrapping, so explicitly allow this case.
Heap* heap = Heap::FromWritableHeapObject(object);
CHECK_EQ(slim_chunk->IsMarking(), heap->incremental_marking()->IsMarking());
} else {
// Non-writable RO_SPACE must never have marking flag set.
CHECK(!slim_chunk->IsMarking());
}
return true;
}
static_assert(MemoryChunk::Flag::INCREMENTAL_MARKING ==