Fix incremental marking to be off during heap snapshots.

src/heap.cc

Index: src/heap.cc
diff --git a/src/heap.cc b/src/heap.cc
index c394a2c60b7a4177e43691c211826112118fe8b0..ece80f78179d5fa03802273165a3d7d18e9d90d9 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -657,10 +657,13 @@ bool Heap::CollectGarbage(AllocationSpace space,
     GarbageCollectionEpilogue();
   }
 
-  if (incremental_marking()->IsStopped()) {
-    if (incremental_marking()->WorthActivating() && NextGCIsLikelyToBeFull()) {
-      incremental_marking()->Start();
-    }
+  // Start incremental marking for the next cycle. The heap snapshot
+  // generator needs incremental marking to stay off after it aborted.
+  if (!mark_compact_collector()->abort_incremental_marking_ &&

[Toon Verwaest, 2012/11/27 12:07:26]

Please make a protected accessor for abort_incremental_marking_;, and maybe give
it a name that describes that incremental marking should not be turned on again.

[Michael Starzinger, 2012/11/27 13:18:11]

Done.

+      incremental_marking()->IsStopped() &&
+      incremental_marking()->WorthActivating() &&
+      NextGCIsLikelyToBeFull()) {
+    incremental_marking()->Start();
   }
 
   return next_gc_likely_to_collect_more;