Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(392)

Unified Diff: src/heap/heap.cc

Issue 1270493002: Fix the failure when enabling v8 profiler or vtune profiler in chromium. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/heap/heap.cc
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index b75c6f7bc6083d0990089dd6f3aec50e6b057b99..b4aecc28065a0014ebe69b076d01184d4e5efcc3 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -952,7 +952,7 @@ bool Heap::CollectGarbage(GarbageCollector collector, const char* gc_reason,
isolate()->CheckDetachedContextsAfterGC();
}
- if (collector == MARK_COMPACTOR) {
+ if (collector == MARK_COMPACTOR && deserialization_complete_) {
intptr_t committed_memory_after = CommittedOldGenerationMemory();
intptr_t used_memory_after = PromotedSpaceSizeOfObjects();
MemoryReducer::Event event;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698