Version 4.3.57.2 (cherry-pick)

Merged c290007 Don't start marking while sweeping R=hablich@chromium.org, yangguo@chromium.org BUG= Review URL: https://codereview.chromium.org/1003963005 Cr-Commit-Position: refs/heads/4.3.57@{#3} Cr-Branched-From: aca928b-refs/heads/master@{#27458}
v8 · Mar 26, 2015 · b8c26ba · b8c26ba
1 parent d125e47
commit b8c26ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/include/v8-version.h b/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 4
 #define V8_MINOR_VERSION 3
 #define V8_BUILD_NUMBER 57
-#define V8_PATCH_LEVEL 1
+#define V8_PATCH_LEVEL 2
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)

diff --git a/src/heap/heap.cc b/src/heap/heap.cc
@@ -4610,7 +4610,8 @@ bool Heap::IdleNotification(double deadline_in_seconds) {
   heap_state.incremental_marking_stopped = incremental_marking()->IsStopped();
   // TODO(ulan): Start incremental marking only for large heaps.
   heap_state.can_start_incremental_marking =
-      incremental_marking()->ShouldActivate() && FLAG_incremental_marking;
+      incremental_marking()->ShouldActivate() && FLAG_incremental_marking &&
+      !mark_compact_collector()->sweeping_in_progress();
   heap_state.sweeping_in_progress =
       mark_compact_collector()->sweeping_in_progress();
   heap_state.mark_compact_speed_in_bytes_per_ms =