Revision: 13091
Author: [email protected]
Date: Thu Nov 29 05:05:43 2012
Log: Merged r13080 into trunk branch.
Remove bogus assertion from idle notification.
[email protected]
Review URL: https://codereview.chromium.org/11348296
http://code.google.com/p/v8/source/detail?r=13091
Modified:
/trunk/src/heap.cc
/trunk/src/version.cc
=======================================
--- /trunk/src/heap.cc Wed Nov 28 04:10:01 2012
+++ /trunk/src/heap.cc Thu Nov 29 05:05:43 2012
@@ -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.
=======================================
--- /trunk/src/version.cc Wed Nov 28 04:10:01 2012
+++ /trunk/src/version.cc Thu Nov 29 05:05:43 2012
@@ -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
