diff options
Diffstat (limited to 'deps/v8/test/cctest/test-unboxed-doubles.cc')
| -rw-r--r-- | deps/v8/test/cctest/test-unboxed-doubles.cc | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/deps/v8/test/cctest/test-unboxed-doubles.cc b/deps/v8/test/cctest/test-unboxed-doubles.cc index 7fc9b5beec..6a1d87015b 100644 --- a/deps/v8/test/cctest/test-unboxed-doubles.cc +++ b/deps/v8/test/cctest/test-unboxed-doubles.cc @@ -15,7 +15,7 @@ #include "src/ic/ic.h" #include "src/macro-assembler.h" #include "test/cctest/cctest.h" -#include "test/cctest/heap/utils-inl.h" +#include "test/cctest/heap/heap-utils.h" using namespace v8::base; using namespace v8::internal; @@ -1112,7 +1112,7 @@ TEST(DoScavengeWithIncrementalWriteBarrier) { { AlwaysAllocateScope always_allocate(isolate); // Make sure |obj_value| is placed on an old-space evacuation candidate. - SimulateFullSpace(old_space); + heap::SimulateFullSpace(old_space); obj_value = factory->NewJSArray(32 * KB, FAST_HOLEY_ELEMENTS, TENURED); ec_page = Page::FromAddress(obj_value->address()); } @@ -1142,7 +1142,7 @@ TEST(DoScavengeWithIncrementalWriteBarrier) { FLAG_stress_compaction = true; FLAG_manual_evacuation_candidates_selection = true; ec_page->SetFlag(MemoryChunk::FORCE_EVACUATION_CANDIDATE_FOR_TESTING); - SimulateIncrementalMarking(heap); + heap::SimulateIncrementalMarking(heap); // Disable stress compaction mode in order to let GC do scavenge. FLAG_stress_compaction = false; @@ -1151,7 +1151,7 @@ TEST(DoScavengeWithIncrementalWriteBarrier) { // in compacting mode and |obj_value|'s page is an evacuation candidate). IncrementalMarking* marking = heap->incremental_marking(); CHECK(marking->IsCompacting()); - CHECK(Marking::IsBlack(Marking::MarkBitFrom(*obj))); + CHECK(Marking::IsBlack(ObjectMarking::MarkBitFrom(*obj))); CHECK(MarkCompactCollector::IsOnEvacuationCandidate(*obj_value)); // Trigger GCs so that |obj| moves to old gen. @@ -1451,7 +1451,7 @@ static void TestIncrementalWriteBarrier(Handle<Map> map, Handle<Map> new_map, CHECK(old_space->Contains(*obj)); // Make sure |obj_value| is placed on an old-space evacuation candidate. - SimulateFullSpace(old_space); + heap::SimulateFullSpace(old_space); obj_value = factory->NewJSArray(32 * KB, FAST_HOLEY_ELEMENTS, TENURED); ec_page = Page::FromAddress(obj_value->address()); CHECK_NE(ec_page, Page::FromAddress(obj->address())); @@ -1460,15 +1460,15 @@ static void TestIncrementalWriteBarrier(Handle<Map> map, Handle<Map> new_map, // Heap is ready, force |ec_page| to become an evacuation candidate and // simulate incremental marking. ec_page->SetFlag(MemoryChunk::FORCE_EVACUATION_CANDIDATE_FOR_TESTING); - SimulateIncrementalMarking(heap); + heap::SimulateIncrementalMarking(heap); // Check that everything is ready for triggering incremental write barrier // (i.e. that both |obj| and |obj_value| are black and the marking phase is // still active and |obj_value|'s page is indeed an evacuation candidate). IncrementalMarking* marking = heap->incremental_marking(); CHECK(marking->IsMarking()); - CHECK(Marking::IsBlack(Marking::MarkBitFrom(*obj))); - CHECK(Marking::IsBlack(Marking::MarkBitFrom(*obj_value))); + CHECK(Marking::IsBlack(ObjectMarking::MarkBitFrom(*obj))); + CHECK(Marking::IsBlack(ObjectMarking::MarkBitFrom(*obj_value))); CHECK(MarkCompactCollector::IsOnEvacuationCandidate(*obj_value)); // Trigger incremental write barrier, which should add a slot to remembered @@ -1504,10 +1504,12 @@ static void TestIncrementalWriteBarrier(Handle<Map> map, Handle<Map> new_map, CHECK_EQ(boom_value, obj->RawFastDoublePropertyAt(double_field_index)); } - -enum WriteBarrierKind { OLD_TO_OLD_WRITE_BARRIER, OLD_TO_NEW_WRITE_BARRIER }; +enum OldToWriteBarrierKind { + OLD_TO_OLD_WRITE_BARRIER, + OLD_TO_NEW_WRITE_BARRIER +}; static void TestWriteBarrierObjectShiftFieldsRight( - WriteBarrierKind write_barrier_kind) { + OldToWriteBarrierKind write_barrier_kind) { CcTest::InitializeVM(); Isolate* isolate = CcTest::i_isolate(); v8::HandleScope scope(CcTest::isolate()); |