| Index: test/cctest/heap/test-compaction.cc
|
| diff --git a/test/cctest/heap/test-compaction.cc b/test/cctest/heap/test-compaction.cc
|
| index 5920835722dc25398b671233d30936c61f14f278..339aef3ea53fbfc4bd3bbe14a246482bc0e0975e 100644
|
| --- a/test/cctest/heap/test-compaction.cc
|
| +++ b/test/cctest/heap/test-compaction.cc
|
| @@ -68,7 +68,7 @@ HEAP_TEST(CompactionFullAbortedPage) {
|
| CheckAllObjectsOnPage(compaction_page_handles, to_be_aborted_page);
|
|
|
| heap->set_force_oom(true);
|
| - heap->CollectAllGarbage();
|
| + CcTest::CollectAllGarbage(i::Heap::kFinalizeIncrementalMarkingMask);
|
| heap->mark_compact_collector()->EnsureSweepingCompleted();
|
|
|
| // Check that all handles still point to the same page, i.e., compaction
|
| @@ -128,7 +128,7 @@ HEAP_TEST(CompactionPartiallyAbortedPage) {
|
| Page::FromAddress(page_to_fill_handles.front()->address());
|
|
|
| heap->set_force_oom(true);
|
| - heap->CollectAllGarbage();
|
| + CcTest::CollectAllGarbage(i::Heap::kFinalizeIncrementalMarkingMask);
|
| heap->mark_compact_collector()->EnsureSweepingCompleted();
|
|
|
| bool migration_aborted = false;
|
| @@ -210,7 +210,7 @@ HEAP_TEST(CompactionPartiallyAbortedPageIntraAbortedPointers) {
|
| Page::FromAddress(page_to_fill_handles.front()->address());
|
|
|
| heap->set_force_oom(true);
|
| - heap->CollectAllGarbage();
|
| + CcTest::CollectAllGarbage(i::Heap::kFinalizeIncrementalMarkingMask);
|
| heap->mark_compact_collector()->EnsureSweepingCompleted();
|
|
|
| // The following check makes sure that we compacted "some" objects, while
|
| @@ -303,7 +303,7 @@ HEAP_TEST(CompactionPartiallyAbortedPageWithStoreBufferEntries) {
|
| Page::FromAddress(page_to_fill_handles.front()->address());
|
|
|
| heap->set_force_oom(true);
|
| - heap->CollectAllGarbage();
|
| + CcTest::CollectAllGarbage(i::Heap::kFinalizeIncrementalMarkingMask);
|
| heap->mark_compact_collector()->EnsureSweepingCompleted();
|
|
|
| // The following check makes sure that we compacted "some" objects, while
|
| @@ -353,7 +353,7 @@ HEAP_TEST(CompactionPartiallyAbortedPageWithStoreBufferEntries) {
|
| // If store buffer entries are not properly filtered/reset for aborted
|
| // pages we have now a broken address at an object slot in old space and
|
| // the following scavenge will crash.
|
| - heap->CollectGarbage(NEW_SPACE);
|
| + CcTest::CollectGarbage(NEW_SPACE);
|
| }
|
| }
|
| }
|
|
|