[heap] Rename IncrementalMarking::Abort to Stop.

R=hpayer@chromium.org

Review URL: https://codereview.chromium.org/1279043002

Cr-Commit-Position: refs/heads/master@{#30061}

diff --git a/src/heap/incremental-marking.cc b/src/heap/incremental-marking.cc
index a277f72..307f398 100644 (file)
--- a/src/heap/incremental-marking.cc
+++ b/src/heap/incremental-marking.cc
@@ -744,10 +744,10 @@ void IncrementalMarking::Hurry() {
 }
 
 
-void IncrementalMarking::Abort() {
+void IncrementalMarking::Stop() {
   if (IsStopped()) return;
   if (FLAG_trace_incremental_marking) {
-    PrintF("[IncrementalMarking] Aborting.\n");
+    PrintF("[IncrementalMarking] Stopping.\n");
   }
   heap_->new_space()->LowerInlineAllocationLimit(0);
   IncrementalMarking::set_should_hurry(false);

diff --git a/src/heap/incremental-marking.h b/src/heap/incremental-marking.h
index 706e332..ac1d532 100644 (file)
--- a/src/heap/incremental-marking.h
+++ b/src/heap/incremental-marking.h
@@ -86,8 +86,6 @@ class IncrementalMarking {
              const GCCallbackFlags gc_callback_flags = kNoGCCallbackFlags,
              const char* reason = nullptr);
 
-  void Stop();
-
   void MarkObjectGroups();
 
   void UpdateMarkingDequeAfterScavenge();
@@ -96,7 +94,7 @@ class IncrementalMarking {
 
   void Finalize();
 
-  void Abort();
+  void Stop();
 
   void OverApproximateWeakClosure(CompletionAction action);
 

diff --git a/src/heap/mark-compact.cc b/src/heap/mark-compact.cc
index ec2e18e..73efe88 100644 (file)
--- a/src/heap/mark-compact.cc
+++ b/src/heap/mark-compact.cc
@@ -803,7 +803,7 @@ void MarkCompactCollector::Prepare() {
 
   // Clear marking bits if incremental marking is aborted.
   if (was_marked_incrementally_ && abort_incremental_marking_) {
-    heap()->incremental_marking()->Abort();
+    heap()->incremental_marking()->Stop();
     ClearMarkbits();
     AbortWeakCollections();
     AbortWeakCells();
@@ -2242,7 +2242,7 @@ void MarkCompactCollector::MarkLiveObjects() {
     incremental_marking->Finalize();
   } else {
     // Abort any pending incremental activities e.g. incremental sweeping.
-    incremental_marking->Abort();
+    incremental_marking->Stop();
     if (marking_deque_.in_use()) {
       marking_deque_.Uninitialize(true);
     }

diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc
index 6172d77..0bc3c1e 100644 (file)
--- a/test/cctest/test-heap.cc
+++ b/test/cctest/test-heap.cc
@@ -2584,7 +2584,7 @@ TEST(InstanceOfStubWriteBarrier) {
   }
 
   IncrementalMarking* marking = CcTest::heap()->incremental_marking();
-  marking->Abort();
+  marking->Stop();
   marking->Start(Heap::kNoGCFlags);
 
   Handle<JSFunction> f =
@@ -2712,7 +2712,7 @@ TEST(ResetSharedFunctionInfoCountersDuringIncrementalMarking) {
   CHECK(f->IsOptimized());
 
   IncrementalMarking* marking = CcTest::heap()->incremental_marking();
-  marking->Abort();
+  marking->Stop();
   marking->Start(Heap::kNoGCFlags);
   // The following calls will increment CcTest::heap()->global_ic_age().
   CcTest::isolate()->ContextDisposedNotification();
@@ -2753,7 +2753,7 @@ TEST(ResetSharedFunctionInfoCountersDuringMarkSweep) {
               CcTest::global()->Get(v8_str("f"))));
   CHECK(f->IsOptimized());
 
-  CcTest::heap()->incremental_marking()->Abort();
+  CcTest::heap()->incremental_marking()->Stop();
 
   // The following two calls will increment CcTest::heap()->global_ic_age().
   CcTest::isolate()->ContextDisposedNotification();
@@ -2770,7 +2770,7 @@ TEST(IdleNotificationFinishMarking) {
   CcTest::InitializeVM();
   SimulateFullSpace(CcTest::heap()->old_space());
   IncrementalMarking* marking = CcTest::heap()->incremental_marking();
-  marking->Abort();
+  marking->Stop();
   marking->Start(Heap::kNoGCFlags);
 
   CHECK_EQ(CcTest::heap()->gc_count(), 0);
@@ -5701,7 +5701,7 @@ TEST(Regress388880) {
   // Enable incremental marking to trigger actions in Heap::AdjustLiveBytes()
   // that would cause crash.
   IncrementalMarking* marking = CcTest::heap()->incremental_marking();
-  marking->Abort();
+  marking->Stop();
   marking->Start(Heap::kNoGCFlags);
   CHECK(marking->IsMarking());