Reviewers: Jakob,
Description:
Merged r13080 into trunk branch.
Remove bogus assertion from idle notification.
[email protected]
Please review this at https://codereview.chromium.org/11348296/
SVN Base: https://v8.googlecode.com/svn/trunk
Affected files:
M src/heap.cc
M src/version.cc
Index: src/heap.cc
diff --git a/src/heap.cc b/src/heap.cc
index
97fd1f8fe3768619c6b6a137844656ca65356af6..d7331dda77161be33750b0dbeae84454c64fea72
100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -5326,10 +5326,6 @@ bool Heap::IdleNotification(int hint) {
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.
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
b9ca7b1da69ebb1a79fb85ea7e190b5de06a24de..1b7f5c844be21ebc02f0cf3002fa7a57b6618d7d
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
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
