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

Side by Side Diff: src/heap/mark-compact-inl.h

Issue 2504193002: [heap] Simplify adjusting of live bytes. (Closed)
Patch Set: fix test Created 4 years, 1 month 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 | « src/heap/mark-compact.cc ('k') | src/heap/scavenger.cc » ('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_MARK_COMPACT_INL_H_ 5 #ifndef V8_HEAP_MARK_COMPACT_INL_H_
6 #define V8_HEAP_MARK_COMPACT_INL_H_ 6 #define V8_HEAP_MARK_COMPACT_INL_H_
7 7
8 #include "src/heap/mark-compact.h" 8 #include "src/heap/mark-compact.h"
9 #include "src/heap/remembered-set.h" 9 #include "src/heap/remembered-set.h"
10 #include "src/isolate.h" 10 #include "src/isolate.h"
11 11
12 namespace v8 { 12 namespace v8 {
13 namespace internal { 13 namespace internal {
14 14
15 void MarkCompactCollector::PushBlack(HeapObject* obj) { 15 void MarkCompactCollector::PushBlack(HeapObject* obj) {
16 DCHECK(Marking::IsBlack(ObjectMarking::MarkBitFrom(obj))); 16 DCHECK(Marking::IsBlack(ObjectMarking::MarkBitFrom(obj)));
17 if (marking_deque()->Push(obj)) { 17 if (marking_deque()->Push(obj)) {
18 MemoryChunk::IncrementLiveBytesFromGC(obj, obj->Size()); 18 MemoryChunk::IncrementLiveBytes(obj, obj->Size());
19 } else { 19 } else {
20 MarkBit mark_bit = ObjectMarking::MarkBitFrom(obj); 20 MarkBit mark_bit = ObjectMarking::MarkBitFrom(obj);
21 Marking::BlackToGrey(mark_bit); 21 Marking::BlackToGrey(mark_bit);
22 } 22 }
23 } 23 }
24 24
25 25
26 void MarkCompactCollector::UnshiftBlack(HeapObject* obj) { 26 void MarkCompactCollector::UnshiftBlack(HeapObject* obj) {
27 DCHECK(Marking::IsBlack(ObjectMarking::MarkBitFrom(obj))); 27 DCHECK(Marking::IsBlack(ObjectMarking::MarkBitFrom(obj)));
28 if (!marking_deque()->Unshift(obj)) { 28 if (!marking_deque()->Unshift(obj)) {
29 MemoryChunk::IncrementLiveBytesFromGC(obj, -obj->Size()); 29 MemoryChunk::IncrementLiveBytes(obj, -obj->Size());
30 MarkBit mark_bit = ObjectMarking::MarkBitFrom(obj); 30 MarkBit mark_bit = ObjectMarking::MarkBitFrom(obj);
31 Marking::BlackToGrey(mark_bit); 31 Marking::BlackToGrey(mark_bit);
32 } 32 }
33 } 33 }
34 34
35 35
36 void MarkCompactCollector::MarkObject(HeapObject* obj, MarkBit mark_bit) { 36 void MarkCompactCollector::MarkObject(HeapObject* obj, MarkBit mark_bit) {
37 DCHECK(ObjectMarking::MarkBitFrom(obj) == mark_bit); 37 DCHECK(ObjectMarking::MarkBitFrom(obj) == mark_bit);
38 if (Marking::IsWhite(mark_bit)) { 38 if (Marking::IsWhite(mark_bit)) {
39 Marking::WhiteToBlack(mark_bit); 39 Marking::WhiteToBlack(mark_bit);
40 DCHECK(obj->GetIsolate()->heap()->Contains(obj)); 40 DCHECK(obj->GetIsolate()->heap()->Contains(obj));
41 PushBlack(obj); 41 PushBlack(obj);
42 } 42 }
43 } 43 }
44 44
45 45
46 void MarkCompactCollector::SetMark(HeapObject* obj, MarkBit mark_bit) { 46 void MarkCompactCollector::SetMark(HeapObject* obj, MarkBit mark_bit) {
47 DCHECK(Marking::IsWhite(mark_bit)); 47 DCHECK(Marking::IsWhite(mark_bit));
48 DCHECK(ObjectMarking::MarkBitFrom(obj) == mark_bit); 48 DCHECK(ObjectMarking::MarkBitFrom(obj) == mark_bit);
49 Marking::WhiteToBlack(mark_bit); 49 Marking::WhiteToBlack(mark_bit);
50 MemoryChunk::IncrementLiveBytesFromGC(obj, obj->Size()); 50 MemoryChunk::IncrementLiveBytes(obj, obj->Size());
51 } 51 }
52 52
53 53
54 bool MarkCompactCollector::IsMarked(Object* obj) { 54 bool MarkCompactCollector::IsMarked(Object* obj) {
55 DCHECK(obj->IsHeapObject()); 55 DCHECK(obj->IsHeapObject());
56 HeapObject* heap_object = HeapObject::cast(obj); 56 HeapObject* heap_object = HeapObject::cast(obj);
57 return Marking::IsBlackOrGrey(ObjectMarking::MarkBitFrom(heap_object)); 57 return Marking::IsBlackOrGrey(ObjectMarking::MarkBitFrom(heap_object));
58 } 58 }
59 59
60 60
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 } 219 }
220 if (object != nullptr) return object; 220 if (object != nullptr) return object;
221 } 221 }
222 return nullptr; 222 return nullptr;
223 } 223 }
224 224
225 } // namespace internal 225 } // namespace internal
226 } // namespace v8 226 } // namespace v8
227 227
228 #endif // V8_HEAP_MARK_COMPACT_INL_H_ 228 #endif // V8_HEAP_MARK_COMPACT_INL_H_
OLDNEW
« no previous file with comments | « src/heap/mark-compact.cc ('k') | src/heap/scavenger.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698