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

Unified Diff: src/heap/heap.cc

Issue 1496253002: Remove FLAG_finalize_marking_incrementally for simplicity. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years 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/flag-definitions.h ('k') | src/heap/incremental-marking.cc » ('j') | 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 103697239bbb2916f0ba1cb4ddb88da74e136a14..910f8f810c4ccc4a2a3212f4d5e4ef9c381173a4 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -762,11 +762,8 @@ void Heap::HandleGCRequest() {
IncrementalMarking::COMPLETE_MARKING) {
CollectAllGarbage(current_gc_flags_, "GC interrupt",
current_gc_callback_flags_);
- return;
- }
- DCHECK(FLAG_finalize_marking_incrementally);
- if (incremental_marking()->IsMarking() &&
- !incremental_marking()->finalize_marking_completed()) {
+ } else if (incremental_marking()->IsMarking() &&
+ !incremental_marking()->finalize_marking_completed()) {
FinalizeIncrementalMarking("GC interrupt: finalize incremental marking");
}
}
@@ -4038,8 +4035,7 @@ void Heap::ReduceNewSpaceSize() {
void Heap::FinalizeIncrementalMarkingIfComplete(const char* comment) {
- if (FLAG_finalize_marking_incrementally &&
- incremental_marking()->IsMarking() &&
+ if (incremental_marking()->IsMarking() &&
(incremental_marking()->IsReadyToOverApproximateWeakClosure() ||
(!incremental_marking()->finalize_marking_completed() &&
mark_compact_collector()->marking_deque()->IsEmpty()))) {
@@ -4056,12 +4052,11 @@ bool Heap::TryFinalizeIdleIncrementalMarking(double idle_time_in_ms) {
size_t final_incremental_mark_compact_speed_in_bytes_per_ms =
static_cast<size_t>(
tracer()->FinalIncrementalMarkCompactSpeedInBytesPerMillisecond());
- if (FLAG_finalize_marking_incrementally &&
- (incremental_marking()->IsReadyToOverApproximateWeakClosure() ||
- (!incremental_marking()->finalize_marking_completed() &&
- mark_compact_collector()->marking_deque()->IsEmpty() &&
- gc_idle_time_handler_->ShouldDoOverApproximateWeakClosure(
- static_cast<size_t>(idle_time_in_ms))))) {
+ if (incremental_marking()->IsReadyToOverApproximateWeakClosure() ||
+ (!incremental_marking()->finalize_marking_completed() &&
+ mark_compact_collector()->marking_deque()->IsEmpty() &&
+ gc_idle_time_handler_->ShouldDoOverApproximateWeakClosure(
+ static_cast<size_t>(idle_time_in_ms)))) {
FinalizeIncrementalMarking(
"Idle notification: finalize incremental marking");
return true;
« no previous file with comments | « src/flag-definitions.h ('k') | src/heap/incremental-marking.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698