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

Side by Side Diff: src/heap/incremental-marking.cc

Issue 1372693002: remove byte-accounting assert for crbug.com/536163 (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/heap/incremental-marking.h" 5 #include "src/heap/incremental-marking.h"
6 6
7 #include "src/code-stubs.h" 7 #include "src/code-stubs.h"
8 #include "src/compilation-cache.h" 8 #include "src/compilation-cache.h"
9 #include "src/conversions.h" 9 #include "src/conversions.h"
10 #include "src/heap/gc-tracer.h" 10 #include "src/heap/gc-tracer.h"
(...skipping 883 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 } 894 }
895 } 895 }
896 } 896 }
897 } 897 }
898 898
899 899
900 intptr_t IncrementalMarking::Step(intptr_t allocated_bytes, 900 intptr_t IncrementalMarking::Step(intptr_t allocated_bytes,
901 CompletionAction action, 901 CompletionAction action,
902 ForceMarkingAction marking, 902 ForceMarkingAction marking,
903 ForceCompletionAction completion) { 903 ForceCompletionAction completion) {
904 DCHECK(allocated_bytes >= 0); 904 // Temporarily removed for crbug.com/536163
905 // DCHECK(allocated_bytes >= 0);
905 906
906 if (heap_->gc_state() != Heap::NOT_IN_GC || !FLAG_incremental_marking || 907 if (heap_->gc_state() != Heap::NOT_IN_GC || !FLAG_incremental_marking ||
907 (state_ != SWEEPING && state_ != MARKING)) { 908 (state_ != SWEEPING && state_ != MARKING)) {
908 return 0; 909 return 0;
909 } 910 }
910 911
911 allocated_ += allocated_bytes; 912 allocated_ += allocated_bytes;
912 913
913 if (marking == DO_NOT_FORCE_MARKING && allocated_ < kAllocatedThreshold && 914 if (marking == DO_NOT_FORCE_MARKING && allocated_ < kAllocatedThreshold &&
914 write_barriers_invoked_since_last_step_ < 915 write_barriers_invoked_since_last_step_ <
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 void IncrementalMarking::IncrementIdleMarkingDelayCounter() { 1017 void IncrementalMarking::IncrementIdleMarkingDelayCounter() {
1017 idle_marking_delay_counter_++; 1018 idle_marking_delay_counter_++;
1018 } 1019 }
1019 1020
1020 1021
1021 void IncrementalMarking::ClearIdleMarkingDelayCounter() { 1022 void IncrementalMarking::ClearIdleMarkingDelayCounter() {
1022 idle_marking_delay_counter_ = 0; 1023 idle_marking_delay_counter_ = 0;
1023 } 1024 }
1024 } // namespace internal 1025 } // namespace internal
1025 } // namespace v8 1026 } // namespace v8
OLDNEW
« 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