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

Side by Side Diff: src/heap/remembered-set.cc

Issue 2418053002: Revert of [heap] Move slot filtering logic into sweeper. (Closed)
Patch Set: Created 4 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 | « src/heap/remembered-set.h ('k') | src/heap/slot-set.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 2016 the V8 project authors. All rights reserved. 1 // Copyright 2016 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/remembered-set.h" 5 #include "src/heap/remembered-set.h"
6 #include "src/heap/heap-inl.h" 6 #include "src/heap/heap-inl.h"
7 #include "src/heap/heap.h" 7 #include "src/heap/heap.h"
8 #include "src/heap/mark-compact.h" 8 #include "src/heap/mark-compact.h"
9 #include "src/heap/slot-set.h" 9 #include "src/heap/slot-set.h"
10 #include "src/heap/spaces.h" 10 #include "src/heap/spaces.h"
11 #include "src/heap/store-buffer.h" 11 #include "src/heap/store-buffer.h"
12 #include "src/macro-assembler.h" 12 #include "src/macro-assembler.h"
13 13
14 namespace v8 { 14 namespace v8 {
15 namespace internal { 15 namespace internal {
16 16
17 template <PointerDirection direction> 17 template <PointerDirection direction>
18 void RememberedSet<direction>::ClearInvalidSlots(Heap* heap,
19 MemoryChunk* chunk) {
20 STATIC_ASSERT(direction == OLD_TO_NEW);
21 DCHECK(chunk->owner()->identity() == OLD_SPACE ||
22 chunk->owner()->identity() == MAP_SPACE);
23 SlotSet* slots = GetSlotSet(chunk);
24 if (slots != nullptr) {
25 slots->Iterate(
26 [heap, chunk](Address addr) {
27 Object** slot = reinterpret_cast<Object**>(addr);
28 return IsValidSlot(heap, chunk, slot) ? KEEP_SLOT : REMOVE_SLOT;
29 },
30 SlotSet::KEEP_EMPTY_BUCKETS);
31 }
32 }
33
34 template <PointerDirection direction>
18 void RememberedSet<direction>::ClearInvalidTypedSlots(Heap* heap, 35 void RememberedSet<direction>::ClearInvalidTypedSlots(Heap* heap,
19 MemoryChunk* chunk) { 36 MemoryChunk* chunk) {
20 STATIC_ASSERT(direction == OLD_TO_NEW); 37 STATIC_ASSERT(direction == OLD_TO_NEW);
21 DCHECK(chunk->owner()->identity() == CODE_SPACE); 38 DCHECK(chunk->owner()->identity() == CODE_SPACE);
22 TypedSlotSet* slots = GetTypedSlotSet(chunk); 39 TypedSlotSet* slots = GetTypedSlotSet(chunk);
23 if (slots != nullptr) { 40 if (slots != nullptr) {
24 slots->Iterate( 41 slots->Iterate(
25 [heap, chunk](SlotType type, Address host_addr, Address addr) { 42 [heap, chunk](SlotType type, Address host_addr, Address addr) {
26 if (Marking::IsBlack(ObjectMarking::MarkBitFrom(host_addr))) { 43 if (Marking::IsBlack(ObjectMarking::MarkBitFrom(host_addr))) {
27 return KEEP_SLOT; 44 return KEEP_SLOT;
28 } else { 45 } else {
29 return REMOVE_SLOT; 46 return REMOVE_SLOT;
30 } 47 }
31 }, 48 },
32 TypedSlotSet::KEEP_EMPTY_CHUNKS); 49 TypedSlotSet::KEEP_EMPTY_CHUNKS);
33 } 50 }
34 } 51 }
35 52
36 template <PointerDirection direction> 53 template <PointerDirection direction>
37 bool RememberedSet<direction>::IsValidSlot(Heap* heap, MemoryChunk* chunk, 54 bool RememberedSet<direction>::IsValidSlot(Heap* heap, MemoryChunk* chunk,
38 Object** slot) { 55 Object** slot) {
39 STATIC_ASSERT(direction == OLD_TO_NEW); 56 STATIC_ASSERT(direction == OLD_TO_NEW);
40 // If the target object is not black, the source slot must be part 57 // If the target object is not black, the source slot must be part
41 // of a non-black (dead) object. 58 // of a non-black (dead) object.
42 return heap->mark_compact_collector()->IsSlotInBlackObject( 59 return heap->mark_compact_collector()->IsSlotInBlackObject(
43 chunk, reinterpret_cast<Address>(slot)); 60 chunk, reinterpret_cast<Address>(slot));
44 } 61 }
45 62
63 template void RememberedSet<OLD_TO_NEW>::ClearInvalidSlots(Heap* heap,
64 MemoryChunk* chunk);
46 template void RememberedSet<OLD_TO_NEW>::ClearInvalidTypedSlots( 65 template void RememberedSet<OLD_TO_NEW>::ClearInvalidTypedSlots(
47 Heap* heap, MemoryChunk* chunk); 66 Heap* heap, MemoryChunk* chunk);
48 67
49 } // namespace internal 68 } // namespace internal
50 } // namespace v8 69 } // namespace v8
OLDNEW
« no previous file with comments | « src/heap/remembered-set.h ('k') | src/heap/slot-set.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698