From: vegorov@chromium.org <vegorov@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Wed, 28 Sep 2011 12:55:34 +0000 (+0000)
Subject: Adjust assertion in Heap::IdleNotification.
X-Git-Tag: upstream/4.7.83~18334
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c1b5c0a9ae2dc0b4eb4ea0f06615d3d92572bd6;p=platform%2Fupstream%2Fv8.git

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
---

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;
 }