Reviewers: Hablich,
Description:
Version 4.5.103.15 (cherry-pick)
Merged 8ae236c0c4bcc7218f2f2dcf909c1410b9ce065e
Fix the failure when enabling v8 profiler or vtune profiler in chromium.
[email protected]
BUG=v8:4352
Please review this at https://codereview.chromium.org/1272133002/
Base URL: https://chromium.googlesource.com/v8/[email protected]
Affected files (+4, -2 lines):
M include/v8-version.h
M src/heap/heap.cc
Index: include/v8-version.h
diff --git a/include/v8-version.h b/include/v8-version.h
index
d8a0363fa5555d67f208005421359d9cc1bb8969..c51edbbd35b5b0a99a3877573f4a48c387318b37
100644
--- 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 14
+#define V8_PATCH_LEVEL 15
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Index: src/heap/heap.cc
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index
86b546940a40e13674804efa90e58d49ada01738..d0b29f6b0f35b0d84cae3a58d51fff8baf22bb52
100644
--- 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);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
