Merged r13080 into trunk branch.
Remove bogus assertion from idle notification.
R=jkummerow@chromium.org
Review URL: https://codereview.chromium.org/11348296
git-svn-id: http://v8.googlecode.com/svn/trunk@13091 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
diff --git a/src/heap.cc b/src/heap.cc
index 97fd1f8..d7331dd 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -5326,10 +5326,6 @@
AdvanceIdleIncrementalMarking(step_size);
contexts_disposed_ = 0;
}
- // Make sure that we have no pending context disposals.
- // 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());
// After context disposal there is likely a lot of garbage remaining, reset
// the idle notification counters in order to trigger more incremental GCs
// on subsequent idle notifications.
diff --git a/src/version.cc b/src/version.cc
index b9ca7b1..1b7f5c8 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 15
#define BUILD_NUMBER 6
-#define PATCH_LEVEL 1
+#define PATCH_LEVEL 2
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0