| Index: test/cctest/heap/test-heap.cc
|
| diff --git a/test/cctest/heap/test-heap.cc b/test/cctest/heap/test-heap.cc
|
| index a0a06444dec2a1ab36c4876e3fa81f6f25f7381a..d7dec934e72e74d5fedd2975548b27d3fb95f93e 100644
|
| --- a/test/cctest/heap/test-heap.cc
|
| +++ b/test/cctest/heap/test-heap.cc
|
| @@ -791,7 +791,7 @@ TEST(BytecodeArray) {
|
| // Perform a full garbage collection and force the constant pool to be on an
|
| // evacuation candidate.
|
| Page* evac_page = Page::FromAddress(constant_pool->address());
|
| - evac_page->SetFlag(MemoryChunk::FORCE_EVACUATION_CANDIDATE_FOR_TESTING);
|
| + heap::ForceEvacuationCandidate(evac_page);
|
| CcTest::CollectAllGarbage(i::Heap::kFinalizeIncrementalMarkingMask);
|
|
|
| // BytecodeArray should survive.
|
| @@ -4358,7 +4358,7 @@ TEST(Regress514122) {
|
| // Heap is ready, force {lit_page} to become an evacuation candidate and
|
| // simulate incremental marking to enqueue optimized code map.
|
| FLAG_manual_evacuation_candidates_selection = true;
|
| - evac_page->SetFlag(MemoryChunk::FORCE_EVACUATION_CANDIDATE_FOR_TESTING);
|
| + heap::ForceEvacuationCandidate(evac_page);
|
| heap::SimulateIncrementalMarking(heap);
|
|
|
| // No matter whether reachable or not, {boomer} is doomed.
|
| @@ -4557,7 +4557,7 @@ TEST(LargeObjectSlotRecording) {
|
| heap::SimulateFullSpace(heap->old_space());
|
| Handle<FixedArray> lit = isolate->factory()->NewFixedArray(4, TENURED);
|
| Page* evac_page = Page::FromAddress(lit->address());
|
| - evac_page->SetFlag(MemoryChunk::FORCE_EVACUATION_CANDIDATE_FOR_TESTING);
|
| + heap::ForceEvacuationCandidate(evac_page);
|
| FixedArray* old_location = *lit;
|
|
|
| // Allocate a large object.
|
| @@ -5563,8 +5563,7 @@ HEAP_TEST(Regress538257) {
|
| heap->CanExpandOldGeneration(old_space->AreaSize());
|
| i++) {
|
| objects[i] = i_isolate->factory()->NewFixedArray(kFixedArrayLen, TENURED);
|
| - Page::FromAddress(objects[i]->address())
|
| - ->SetFlag(MemoryChunk::FORCE_EVACUATION_CANDIDATE_FOR_TESTING);
|
| + heap::ForceEvacuationCandidate(Page::FromAddress(objects[i]->address()));
|
| }
|
| heap::SimulateFullSpace(old_space);
|
| heap->CollectAllGarbage(i::Heap::kFinalizeIncrementalMarkingMask,
|
| @@ -6526,7 +6525,7 @@ HEAP_TEST(Regress589413) {
|
| AlwaysAllocateScope always_allocate(isolate);
|
| Handle<HeapObject> ec_obj = factory->NewFixedArray(5000, TENURED);
|
| Page* ec_page = Page::FromAddress(ec_obj->address());
|
| - ec_page->SetFlag(MemoryChunk::FORCE_EVACUATION_CANDIDATE_FOR_TESTING);
|
| + heap::ForceEvacuationCandidate(ec_page);
|
| // Make all arrays point to evacuation candidate so that
|
| // slots are recorded for them.
|
| for (size_t j = 0; j < arrays.size(); j++) {
|
| @@ -6733,8 +6732,7 @@ TEST(Regress631969) {
|
| heap::SimulateFullSpace(heap->old_space());
|
| Handle<String> s1 = factory->NewStringFromStaticChars("123456789", TENURED);
|
| Handle<String> s2 = factory->NewStringFromStaticChars("01234", TENURED);
|
| - Page::FromAddress(s1->address())
|
| - ->SetFlag(MemoryChunk::FORCE_EVACUATION_CANDIDATE_FOR_TESTING);
|
| + heap::ForceEvacuationCandidate(Page::FromAddress(s1->address()));
|
|
|
| heap::SimulateIncrementalMarking(heap, false);
|
|
|
|
|