Reland of "[heap] Better integrate handling of aborted compaction pages"

test/cctest/heap/test-compaction.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "test/cctest/cctest.h"
 #include "test/cctest/heap/heap-tester.h"
 #include "test/cctest/heap/utils-inl.h"
 
 namespace v8 {
 namespace internal {
@@ skipping 32 matching lines @@
       CHECK(heap->old_space()->Expand());
       auto compaction_page_handles =
           CreatePadding(heap, Page::kAllocatableMemory, TENURED);
       Page* to_be_aborted_page =
           Page::FromAddress(compaction_page_handles.front()->address());
       to_be_aborted_page->SetFlag(
           MemoryChunk::FORCE_EVACUATION_CANDIDATE_FOR_TESTING);
 
       heap->set_force_oom(true);
       heap->CollectAllGarbage();
+      heap->mark_compact_collector()->EnsureSweepingCompleted();
 
       // Check that all handles still point to the same page, i.e., compaction
       // has been aborted on the page.
       for (Handle<FixedArray> object : compaction_page_handles) {
         CHECK_EQ(to_be_aborted_page, Page::FromAddress(object->address()));
       }
       CheckInvariantsOfAbortedPage(to_be_aborted_page);
     }
   }
 }
@@ skipping 38 matching lines @@
         HandleScope scope3(isolate);
         CHECK(heap->old_space()->Expand());
         const int num_objects = 3;
         std::vector<Handle<FixedArray>> page_to_fill_handles = CreatePadding(
             heap, object_size * num_objects, TENURED, object_size);
         Page* page_to_fill =
             Page::FromAddress(page_to_fill_handles.front()->address());
 
         heap->set_force_oom(true);
         heap->CollectAllGarbage();
+        heap->mark_compact_collector()->EnsureSweepingCompleted();
 
         bool migration_aborted = false;
         for (Handle<FixedArray> object : compaction_page_handles) {
           // Once compaction has been aborted, all following objects still have
           // to be on the initial page.
           CHECK(!migration_aborted ||
                 (Page::FromAddress(object->address()) == to_be_aborted_page));
           if (Page::FromAddress(object->address()) == to_be_aborted_page) {
             // This object has not been migrated.
             migration_aborted = true;
@@ skipping 62 matching lines @@
       CHECK(heap->old_space()->Expand());
       const int num_objects = 2;
       int used_memory = object_size * num_objects;
       std::vector<Handle<FixedArray>> page_to_fill_handles =
           CreatePadding(heap, used_memory, TENURED, object_size);
       Page* page_to_fill =
           Page::FromAddress(page_to_fill_handles.front()->address());
 
       heap->set_force_oom(true);
       heap->CollectAllGarbage();
+      heap->mark_compact_collector()->EnsureSweepingCompleted();
 
       // The following check makes sure that we compacted "some" objects, while
       // leaving others in place.
       bool in_place = true;
       Handle<FixedArray> current = root_array;
       while (current->get(0) != heap->undefined_value()) {
         current = Handle<FixedArray>(FixedArray::cast(current->get(0)));
         CHECK(current->IsFixedArray());
         if (Page::FromAddress(current->address()) != to_be_aborted_page) {
           in_place = false;
@@ skipping 73 matching lines @@
       CHECK(heap->old_space()->Expand());
       const int num_objects = 2;
       int used_memory = object_size * num_objects;
       std::vector<Handle<FixedArray>> page_to_fill_handles =
           CreatePadding(heap, used_memory, TENURED, object_size);
       Page* page_to_fill =
           Page::FromAddress(page_to_fill_handles.front()->address());
 
       heap->set_force_oom(true);
       heap->CollectAllGarbage();
+      heap->mark_compact_collector()->EnsureSweepingCompleted();
 
       // The following check makes sure that we compacted "some" objects, while
       // leaving others in place.
       bool in_place = true;
       Handle<FixedArray> current = root_array;
       while (current->get(0) != heap->undefined_value()) {
         current = Handle<FixedArray>(FixedArray::cast(current->get(0)));
         CHECK(!heap->InNewSpace(*current));
         CHECK(current->IsFixedArray());
         if (Page::FromAddress(current->address()) != to_be_aborted_page) {
@@ skipping 35 matching lines @@
       // 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);
     }
   }
 }
 
 }  // namespace internal
 }  // namespace v8