[v8-dev] Reland "Allow compaction when incremental marking is on." (issue 1048013003 by ulan@chromium.org)

[ulan]

Reviewers: Hannes Payer,

Message:
PTAL
Description:
Reland "Allow compaction when incremental marking is on."

BUG=chromium:450824
LOG=NO

Please review this at https://codereview.chromium.org/1048013003/

Base URL: https://chromium.googlesource.com/v8/v8.git@master

Affected files (+8, -12 lines):
  M src/heap/incremental-marking.h
  M src/heap/incremental-marking.cc


Index: src/heap/incremental-marking.cc
diff --git a/src/heap/incremental-marking.cc  
b/src/heap/incremental-marking.cc
index  
749fa5ef54934d7c2ed3945d8381b4cfd3c2cdcb..b3609e4adcf7db1baa16dde096f9ee48d5290045  
100644
--- a/src/heap/incremental-marking.cc
+++ b/src/heap/incremental-marking.cc
@@ -468,7 +468,7 @@ static void PatchIncrementalMarkingRecordWriteStubs(
 }


-void IncrementalMarking::Start(CompactionFlag flag) {
+void IncrementalMarking::Start() {
   if (FLAG_trace_incremental_marking) {
     PrintF("[IncrementalMarking] Start\n");
   }
@@ -483,7 +483,7 @@ void IncrementalMarking::Start(CompactionFlag flag) {
   was_activated_ = true;

   if (!heap_->mark_compact_collector()->sweeping_in_progress()) {
-    StartMarking(flag);
+    StartMarking();
   } else {
     if (FLAG_trace_incremental_marking) {
       PrintF("[IncrementalMarking] Start sweeping.\n");
@@ -495,12 +495,12 @@ void IncrementalMarking::Start(CompactionFlag flag) {
 }


-void IncrementalMarking::StartMarking(CompactionFlag flag) {
+void IncrementalMarking::StartMarking() {
   if (FLAG_trace_incremental_marking) {
     PrintF("[IncrementalMarking] Start marking\n");
   }

-  is_compacting_ = !FLAG_never_compact && (flag == ALLOW_COMPACTION) &&
+  is_compacting_ = !FLAG_never_compact &&
                    heap_->mark_compact_collector()->StartCompaction(
                        MarkCompactCollector::INCREMENTAL_COMPACTION);

@@ -834,9 +834,7 @@ void IncrementalMarking::Epilogue() {

 void IncrementalMarking::OldSpaceStep(intptr_t allocated) {
   if (IsStopped() && ShouldActivate()) {
-    // TODO(hpayer): Let's play safe for now, but compaction should be
-    // in principle possible.
-    Start(PREVENT_COMPACTION);
+    Start();
   } else {
     Step(allocated * kFastMarking / kInitialMarkingSpeed,  
GC_VIA_STACK_GUARD);
   }
@@ -965,7 +963,7 @@ intptr_t IncrementalMarking::Step(intptr_t  
allocated_bytes,
       }
       if (!heap_->mark_compact_collector()->sweeping_in_progress()) {
         bytes_scanned_ = 0;
-        StartMarking(PREVENT_COMPACTION);
+        StartMarking();
       }
     } else if (state_ == MARKING) {
       bytes_processed = ProcessMarkingDeque(bytes_to_process);
Index: src/heap/incremental-marking.h
diff --git a/src/heap/incremental-marking.h b/src/heap/incremental-marking.h
index  
7d41cfef4156dc73f46abb3180f95baf9f625a3b..6a6f8c4abb5498fb3cc61643733b6ebfc14225bc  
100644
--- a/src/heap/incremental-marking.h
+++ b/src/heap/incremental-marking.h
@@ -67,9 +67,7 @@ class IncrementalMarking {

   bool WasActivated();

-  enum CompactionFlag { ALLOW_COMPACTION, PREVENT_COMPACTION };
-
-  void Start(CompactionFlag flag = ALLOW_COMPACTION);
+  void Start();

   void Stop();

@@ -208,7 +206,7 @@ class IncrementalMarking {

   void ResetStepCounters();

-  void StartMarking(CompactionFlag flag);
+  void StartMarking();

   void ActivateIncrementalWriteBarrier(PagedSpace* space);
   static void ActivateIncrementalWriteBarrier(NewSpace* space);


--
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
--- 
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.