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

Unified Diff: src/heap/heap.cc

Issue 2868103002: [deserializer] Make large object deserialization GC safe (Closed)
Patch Set: Created 3 years, 7 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 | src/heap/incremental-marking.cc » ('j') | src/snapshot/deserializer.cc » ('J')
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 4ef4c900b955b52ae03f425eda508d598785a9e6..d62f1db857141aee2cd9212634744f330ff97355 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -5377,7 +5377,7 @@ bool Heap::ShouldExpandOldGenerationOnSlowAllocation() {
// The kSoftLimit means that incremental marking should be started soon.
// The kHardLimit means that incremental marking should be started immediately.
Heap::IncrementalMarkingLimit Heap::IncrementalMarkingLimitReached() {
- if (!incremental_marking()->CanBeActivated() ||
+ if (!incremental_marking()->CanBeActivated() || always_allocate() ||
PromotedSpaceSizeOfObjects() <=
IncrementalMarking::kActivationThreshold) {
// Incremental marking is disabled or it is too early to start.
« no previous file with comments | « no previous file | src/heap/incremental-marking.cc » ('j') | src/snapshot/deserializer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698