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

Unified Diff: src/heap/incremental-marking.cc

Issue 2868103002: [deserializer] Make large object deserialization GC safe (Closed)
Patch Set: fix tests for --noopt 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 | « src/heap/heap.cc ('k') | src/snapshot/deserializer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/heap/incremental-marking.cc
diff --git a/src/heap/incremental-marking.cc b/src/heap/incremental-marking.cc
index e5c65705c9726b7245eb3361af4566df77e68c20..77eee708c75bdba116404394494c6990899e88d2 100644
--- a/src/heap/incremental-marking.cc
+++ b/src/heap/incremental-marking.cc
@@ -1102,8 +1102,10 @@ size_t IncrementalMarking::StepSizeToMakeProgress() {
}
void IncrementalMarking::AdvanceIncrementalMarkingOnAllocation() {
+ // Code using an AlwaysAllocateScope assumes that the GC state does not
+ // change; that implies that no marking steps must be performed.
if (heap_->gc_state() != Heap::NOT_IN_GC || !FLAG_incremental_marking ||
- (state_ != SWEEPING && state_ != MARKING)) {
+ (state_ != SWEEPING && state_ != MARKING) || heap_->always_allocate()) {
return;
}
« no previous file with comments | « src/heap/heap.cc ('k') | src/snapshot/deserializer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698