Do not scavenge while marking incrementally when FLAG_gc_global is on.

BUG=
R=yangguo@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@21268 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/heap.cc b/src/heap.cc
index 219584b..ddec9a9 100644 (file)
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -790,7 +790,7 @@ bool Heap::CollectGarbage(GarbageCollector collector,
     const intptr_t kStepSizeWhenDelayedByScavenge = 1 * MB;
     incremental_marking()->Step(kStepSizeWhenDelayedByScavenge,
                                 IncrementalMarking::NO_GC_VIA_STACK_GUARD);
-    if (!incremental_marking()->IsComplete()) {
+    if (!incremental_marking()->IsComplete() && !FLAG_gc_global) {
       if (FLAG_trace_incremental_marking) {
         PrintF("[IncrementalMarking] Delaying MarkSweep.\n");
       }