From cc838be4b699c3f2324cc1850876ca8e8ae3a079 Mon Sep 17 00:00:00 2001 From: jochen Date: Tue, 21 Apr 2015 03:05:12 -0700 Subject: [PATCH] Don't assert that no incremental marking happened during a non-incremental GC If a scavenge is triggered during the GC (via a weak callback or the GC prologue/epilogue), and another mark-compact is triggered (via the same unfortunate code path), we end up doing some incremental steps. BUG=v8:4048 R=dcarney@chromium.org,hpayer@chromium.org LOG=n Review URL: https://codereview.chromium.org/1096693011 Cr-Commit-Position: refs/heads/master@{#27956} --- src/heap/gc-tracer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/heap/gc-tracer.cc b/src/heap/gc-tracer.cc index 6f550aa..6f3a03f 100644 --- a/src/heap/gc-tracer.cc +++ b/src/heap/gc-tracer.cc @@ -218,7 +218,7 @@ void GCTracer::Stop(GarbageCollector collector) { DCHECK(current_.incremental_marking_bytes == 0); DCHECK(current_.incremental_marking_duration == 0); DCHECK(current_.pure_incremental_marking_duration == 0); - DCHECK(longest_incremental_marking_step_ == 0.0); + longest_incremental_marking_step_ = 0.0; mark_compactor_events_.push_front(current_); } -- 2.7.4