diff options
Diffstat (limited to 'deps/v8/test/cctest/heap/test-spaces.cc')
-rw-r--r-- | deps/v8/test/cctest/heap/test-spaces.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/deps/v8/test/cctest/heap/test-spaces.cc b/deps/v8/test/cctest/heap/test-spaces.cc index 24a882fc82..5e6392bf59 100644 --- a/deps/v8/test/cctest/heap/test-spaces.cc +++ b/deps/v8/test/cctest/heap/test-spaces.cc @@ -31,8 +31,8 @@ #include "src/base/platform/platform.h" #include "src/heap/factory.h" #include "src/heap/spaces-inl.h" -#include "src/objects-inl.h" #include "src/objects/free-space.h" +#include "src/objects/objects-inl.h" #include "src/snapshot/snapshot.h" #include "test/cctest/cctest.h" #include "test/cctest/heap/heap-tester.h" @@ -301,7 +301,7 @@ TEST(LargeObjectSpace) { int lo_size = Page::kPageSize; Object obj = lo->AllocateRaw(lo_size).ToObjectChecked(); - CHECK(obj->IsHeapObject()); + CHECK(obj.IsHeapObject()); HeapObject ho = HeapObject::cast(obj); @@ -390,7 +390,7 @@ static HeapObject AllocateUnaligned(NewSpace* space, int size) { CHECK(!allocation.IsRetry()); HeapObject filler; CHECK(allocation.To(&filler)); - space->heap()->CreateFillerObjectAt(filler->address(), size, + space->heap()->CreateFillerObjectAt(filler.address(), size, ClearRecordedSlots::kNo); return filler; } @@ -400,7 +400,7 @@ static HeapObject AllocateUnaligned(PagedSpace* space, int size) { CHECK(!allocation.IsRetry()); HeapObject filler; CHECK(allocation.To(&filler)); - space->heap()->CreateFillerObjectAt(filler->address(), size, + space->heap()->CreateFillerObjectAt(filler.address(), size, ClearRecordedSlots::kNo); return filler; } @@ -571,7 +571,7 @@ HEAP_TEST(Regress777177) { heap::SimulateFullSpace(old_space); AllocationResult result = old_space->AllocateRaw(filler_size, kWordAligned); HeapObject obj = result.ToObjectChecked(); - heap->CreateFillerObjectAt(obj->address(), filler_size, + heap->CreateFillerObjectAt(obj.address(), filler_size, ClearRecordedSlots::kNo); } @@ -582,14 +582,14 @@ HEAP_TEST(Regress777177) { old_space->AllocateRaw(max_object_size, kWordAligned); HeapObject obj = result.ToObjectChecked(); // Simulate allocation folding moving the top pointer back. - old_space->SetTopAndLimit(obj->address(), old_space->limit()); + old_space->SetTopAndLimit(obj.address(), old_space->limit()); } { // This triggers assert in crbug.com/777177. AllocationResult result = old_space->AllocateRaw(filler_size, kWordAligned); HeapObject obj = result.ToObjectChecked(); - heap->CreateFillerObjectAt(obj->address(), filler_size, + heap->CreateFillerObjectAt(obj.address(), filler_size, ClearRecordedSlots::kNo); } old_space->RemoveAllocationObserver(&observer); @@ -621,17 +621,17 @@ HEAP_TEST(Regress791582) { AllocationResult result = new_space->AllocateRaw(until_page_end, kWordAligned); HeapObject obj = result.ToObjectChecked(); - heap->CreateFillerObjectAt(obj->address(), until_page_end, + heap->CreateFillerObjectAt(obj.address(), until_page_end, ClearRecordedSlots::kNo); // Simulate allocation folding moving the top pointer back. - *new_space->allocation_top_address() = obj->address(); + *new_space->allocation_top_address() = obj.address(); } { // This triggers assert in crbug.com/791582 AllocationResult result = new_space->AllocateRaw(256, kWordAligned); HeapObject obj = result.ToObjectChecked(); - heap->CreateFillerObjectAt(obj->address(), 256, ClearRecordedSlots::kNo); + heap->CreateFillerObjectAt(obj.address(), 256, ClearRecordedSlots::kNo); } new_space->RemoveAllocationObserver(&observer); } @@ -656,7 +656,7 @@ TEST(ShrinkPageToHighWaterMarkFreeSpaceEnd) { old_space->ResetFreeList(); HeapObject filler = HeapObject::FromAddress(array->address() + array->Size()); - CHECK(filler->IsFreeSpace()); + CHECK(filler.IsFreeSpace()); size_t shrunk = old_space->ShrinkPageToHighWaterMark(page); size_t should_have_shrunk = RoundDown( static_cast<size_t>(MemoryChunkLayout::AllocatableMemoryInDataPage() - @@ -707,7 +707,7 @@ TEST(ShrinkPageToHighWaterMarkOneWordFiller) { old_space->ResetFreeList(); HeapObject filler = HeapObject::FromAddress(array->address() + array->Size()); - CHECK_EQ(filler->map(), + CHECK_EQ(filler.map(), ReadOnlyRoots(CcTest::heap()).one_pointer_filler_map()); size_t shrunk = old_space->ShrinkPageToHighWaterMark(page); @@ -734,7 +734,7 @@ TEST(ShrinkPageToHighWaterMarkTwoWordFiller) { old_space->ResetFreeList(); HeapObject filler = HeapObject::FromAddress(array->address() + array->Size()); - CHECK_EQ(filler->map(), + CHECK_EQ(filler.map(), ReadOnlyRoots(CcTest::heap()).two_pointer_filler_map()); size_t shrunk = old_space->ShrinkPageToHighWaterMark(page); |