From 2c1b5c0a9ae2dc0b4eb4ea0f06615d3d92572bd6 Mon Sep 17 00:00:00 2001 From: "vegorov@chromium.org" Date: Wed, 28 Sep 2011 12:55:34 +0000 Subject: [PATCH] Adjust assertion in Heap::IdleNotification. R=mstarzinger@chromium.org BUG=v8:1715 Review URL: http://codereview.chromium.org/8038045 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@9467 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/heap.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/heap.cc b/src/heap.cc index 75a1e5f..3838a55 100644 --- a/src/heap.cc +++ b/src/heap.cc @@ -4594,8 +4594,11 @@ bool Heap::IdleNotification() { // Make sure that we have no pending context disposals and // conditionally uncommit from space. - ASSERT((contexts_disposed_ == 0) || incremental_marking()->IsMarking()); + // Take into account that we might have decided to delay full collection + // because incremental marking is in progress. + ASSERT((contexts_disposed_ == 0) || !incremental_marking()->IsStopped()); if (uncommit) UncommitFromSpace(); + return finished; } -- 2.7.4