Version 4.5.103.15 (cherry-pick)

cdai2 · cdai2 · commit 71d2ce6b0411 · 2015-08-05T15:38:19.000Z
Merged 8ae236c Fix the failure when enabling v8 profiler or vtune profiler in chromium. R=hablich@chromium.org BUG=v8:4352 Review URL: https://codereview.chromium.org/1272133002 Cr-Commit-Position: refs/branch-heads/4.5@{#22} Cr-Branched-From: 7f21153-refs/heads/4.5.103@{#1} Cr-Branched-From: 4b38c15-refs/heads/master@{#29527}
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 5
 #define V8_BUILD_NUMBER 103
-#define V8_PATCH_LEVEL 19
+#define V8_PATCH_LEVEL 20
 
 // 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
@@ -966,7 +966,9 @@ bool Heap::CollectGarbage(GarbageCollector collector, const char* gc_reason,
           (committed_memory_before - committed_memory_after) > MB ||
           HasHighFragmentation(used_memory_after, committed_memory_after) ||
           (detached_contexts()->length() > 0);
-      memory_reducer_.NotifyMarkCompact(event);
+      if (deserialization_complete_) {
+        memory_reducer_.NotifyMarkCompact(event);
+      }
     }
 
     tracer()->Stop(collector);
