Reviewers: Erik Corry,

Description:
Merge r10121 to the 3.7 branch. Use the old idle notification handler when
context is disposed.


BUG=
TEST=


Please review this at http://codereview.chromium.org/8770006/

SVN Base: https://v8.googlecode.com/svn/tags/3.7.12

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 f948c6c88f6e5fd85eac6b4c581e184988d3e50d..3f36d8b390d5e1ee01340e92d3eb40c511b1376b 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -4541,7 +4541,8 @@ void Heap::EnsureHeapIsIterable() {


 bool Heap::IdleNotification(int hint) {
- if (!FLAG_incremental_marking || FLAG_expose_gc || Serializer::enabled()) {
+  if (contexts_disposed_ > 0 || !FLAG_incremental_marking ||
+      FLAG_expose_gc || Serializer::enabled()) {
     return hint < 1000 ? true : IdleGlobalGC();
   }

Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index 3352735dc7123dbb7c5567894ba55128637b5169..2c601aaddfbbeaedcff74f279f3b2f6da6388625 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     7
 #define BUILD_NUMBER      12
-#define PATCH_LEVEL       0
+#define PATCH_LEVEL       1
 // 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

Reply via email to