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

Side by Side Diff: src/heap/incremental-marking-inl.h

Issue 1153233003: Re-land new insertion write barrier. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 6 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 | src/heap/spaces.h » ('j') | 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 #ifndef V8_HEAP_INCREMENTAL_MARKING_INL_H_ 5 #ifndef V8_HEAP_INCREMENTAL_MARKING_INL_H_
6 #define V8_HEAP_INCREMENTAL_MARKING_INL_H_ 6 #define V8_HEAP_INCREMENTAL_MARKING_INL_H_
7 7
8 #include "src/heap/incremental-marking.h" 8 #include "src/heap/incremental-marking.h"
9 9
10 namespace v8 { 10 namespace v8 {
11 namespace internal { 11 namespace internal {
12 12
13 13
14 bool IncrementalMarking::BaseRecordWrite(HeapObject* obj, Object** slot, 14 bool IncrementalMarking::BaseRecordWrite(HeapObject* obj, Object** slot,
15 Object* value) { 15 Object* value) {
16 HeapObject* value_heap_obj = HeapObject::cast(value); 16 HeapObject* value_heap_obj = HeapObject::cast(value);
17 MarkBit value_bit = Marking::MarkBitFrom(value_heap_obj); 17 MarkBit value_bit = Marking::MarkBitFrom(value_heap_obj);
18 if (Marking::IsWhite(value_bit)) { 18 // Checking the obj marking state is not necessary, but reduces the marking
19 MarkBit obj_bit = Marking::MarkBitFrom(obj); 19 // load.
20 if (Marking::IsBlack(obj_bit)) { 20 MarkBit obj_bit = Marking::MarkBitFrom(obj);
21 MemoryChunk* chunk = MemoryChunk::FromAddress(obj->address()); 21 if (Marking::IsWhite(value_bit) && Marking::IsBlack(obj_bit)) {
22 if (chunk->IsFlagSet(MemoryChunk::HAS_PROGRESS_BAR)) { 22 WhiteToGreyAndPush(value_heap_obj, value_bit);
23 if (chunk->IsLeftOfProgressBar(slot)) { 23 RestartIfNotMarking();
24 WhiteToGreyAndPush(value_heap_obj, value_bit);
25 RestartIfNotMarking();
26 } else {
27 return false;
28 }
29 } else {
30 BlackToGreyAndUnshift(obj, obj_bit);
31 RestartIfNotMarking();
32 return false;
33 }
34 } else {
35 return false;
36 }
37 } 24 }
38 if (!is_compacting_) return false; 25 if (!is_compacting_) return false;
39 MarkBit obj_bit = Marking::MarkBitFrom(obj);
40 return Marking::IsBlack(obj_bit); 26 return Marking::IsBlack(obj_bit);
41 } 27 }
42 28
43 29
44 void IncrementalMarking::RecordWrite(HeapObject* obj, Object** slot, 30 void IncrementalMarking::RecordWrite(HeapObject* obj, Object** slot,
45 Object* value) { 31 Object* value) {
46 if (IsMarking() && value->IsHeapObject()) { 32 if (IsMarking() && value->IsHeapObject()) {
47 RecordWriteSlow(obj, slot, value); 33 RecordWriteSlow(obj, slot, value);
48 } 34 }
49 } 35 }
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 96
111 97
112 void IncrementalMarking::WhiteToGreyAndPush(HeapObject* obj, MarkBit mark_bit) { 98 void IncrementalMarking::WhiteToGreyAndPush(HeapObject* obj, MarkBit mark_bit) {
113 Marking::WhiteToGrey(mark_bit); 99 Marking::WhiteToGrey(mark_bit);
114 heap_->mark_compact_collector()->marking_deque()->PushGrey(obj); 100 heap_->mark_compact_collector()->marking_deque()->PushGrey(obj);
115 } 101 }
116 } 102 }
117 } // namespace v8::internal 103 } // namespace v8::internal
118 104
119 #endif // V8_HEAP_INCREMENTAL_MARKING_INL_H_ 105 #endif // V8_HEAP_INCREMENTAL_MARKING_INL_H_
OLDNEW
« no previous file with comments | « no previous file | src/heap/spaces.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698