Do nothing in IncrementalMarking::Step when we are not marking or sweeping.

src/incremental-marking.cc

Index: src/incremental-marking.cc
diff --git a/src/incremental-marking.cc b/src/incremental-marking.cc
index 0e53a380ac717a7741ddf172327a821dc0631d94..a35fe52d1bbf55265767b93f8157e8757cd5babd 100644
--- a/src/incremental-marking.cc
+++ b/src/incremental-marking.cc
@@ -539,6 +539,7 @@ void IncrementalMarking::Step(intptr_t allocated_bytes) {
   if (heap_->gc_state() != Heap::NOT_IN_GC) return;
   if (!FLAG_incremental_marking) return;
   if (!FLAG_incremental_marking_steps) return;

[Lasse Reichstein, 2011/07/12 08:18:32]

Are FLAG_incremental_marking and FLAG_incremental_marking_steps forced to be
dependent in any way? Should they be (i.e., it seems it should be sufficient to
check FLAG_incremental_marking_steps)?

[Vyacheslav Egorov (Chromium), 2011/07/12 09:27:54]

They are independent.

+  if (state_ != SWEEPING && state_ != MARKING) return;

[Lasse Reichstein, 2011/07/12 08:18:32]

How about combining all these conditions with || and just having one return?

[Vyacheslav Egorov (Chromium), 2011/07/12 09:27:54]

Done.

 
   allocated_ += allocated_bytes;