| Index: src/heap/heap-inl.h
|
| diff --git a/src/heap/heap-inl.h b/src/heap/heap-inl.h
|
| index da6a481c4b46ad02709c69f90d6e47c2d689404a..96437396c1fc75662e42024962586f79cee499af 100644
|
| --- a/src/heap/heap-inl.h
|
| +++ b/src/heap/heap-inl.h
|
| @@ -395,7 +395,7 @@ bool Heap::OldGenerationAllocationLimitReached() {
|
|
|
|
|
| bool Heap::ShouldBePromoted(Address old_address, int object_size) {
|
| - NewSpacePage* page = NewSpacePage::FromAddress(old_address);
|
| + Page* page = Page::FromAddress(old_address);
|
| Address age_mark = new_space_.age_mark();
|
| return page->IsFlagSet(MemoryChunk::NEW_SPACE_BELOW_AGE_MARK) &&
|
| (!page->ContainsLimit(age_mark) || old_address < age_mark);
|
| @@ -476,7 +476,7 @@ AllocationMemento* Heap::FindAllocationMemento(HeapObject* object) {
|
| Address object_address = object->address();
|
| Address memento_address = object_address + object->Size();
|
| Address last_memento_word_address = memento_address + kPointerSize;
|
| - if (!NewSpacePage::OnSamePage(object_address, last_memento_word_address)) {
|
| + if (!Page::OnSamePage(object_address, last_memento_word_address)) {
|
| return nullptr;
|
| }
|
| HeapObject* candidate = HeapObject::FromAddress(memento_address);
|
| @@ -504,7 +504,7 @@ AllocationMemento* Heap::FindAllocationMemento(HeapObject* object) {
|
| top = NewSpaceTop();
|
| DCHECK(memento_address == top ||
|
| memento_address + HeapObject::kHeaderSize <= top ||
|
| - !NewSpacePage::OnSamePage(memento_address, top - 1));
|
| + !Page::OnSamePage(memento_address, top - 1));
|
| if ((memento_address != top) && memento_candidate->IsValid()) {
|
| return memento_candidate;
|
| }
|
|
|