Index: src/heap/spaces.h |
diff --git a/src/heap/spaces.h b/src/heap/spaces.h |
index 9a7b8a5f2767766c7a2338e96f0ac5ffebfe2be3..aa30e7da3b438102f3b7980b85f6e4e93ea116e0 100644 |
--- a/src/heap/spaces.h |
+++ b/src/heap/spaces.h |
@@ -509,6 +509,7 @@ class MemoryChunk { |
static const size_t kWriteBarrierCounterOffset = |
kOldToNewSlotsOffset + kPointerSize // SlotSet* old_to_new_slots_; |
+ kPointerSize // SlotSet* old_to_old_slots_; |
+ + kPointerSize // TypedSlotSet* typed_old_to_new_slots_; |
+ kPointerSize // TypedSlotSet* typed_old_to_old_slots_; |
+ kPointerSize; // SkipList* skip_list_; |
@@ -625,6 +626,9 @@ class MemoryChunk { |
inline SlotSet* old_to_new_slots() { return old_to_new_slots_; } |
inline SlotSet* old_to_old_slots() { return old_to_old_slots_; } |
+ inline TypedSlotSet* typed_old_to_new_slots() { |
+ return typed_old_to_new_slots_; |
+ } |
inline TypedSlotSet* typed_old_to_old_slots() { |
return typed_old_to_old_slots_; |
} |
@@ -633,6 +637,8 @@ class MemoryChunk { |
void ReleaseOldToNewSlots(); |
void AllocateOldToOldSlots(); |
void ReleaseOldToOldSlots(); |
+ void AllocateTypedOldToNewSlots(); |
+ void ReleaseTypedOldToNewSlots(); |
void AllocateTypedOldToOldSlots(); |
void ReleaseTypedOldToOldSlots(); |
@@ -792,6 +798,7 @@ class MemoryChunk { |
// is ceil(size() / kPageSize). |
SlotSet* old_to_new_slots_; |
SlotSet* old_to_old_slots_; |
+ TypedSlotSet* typed_old_to_new_slots_; |
TypedSlotSet* typed_old_to_old_slots_; |
SkipList* skip_list_; |
@@ -3111,8 +3118,7 @@ class LargePageIterator BASE_EMBEDDED { |
// pointers to new space or to evacuation candidates. |
class MemoryChunkIterator BASE_EMBEDDED { |
public: |
- enum Mode { ALL, ALL_BUT_MAP_SPACE, ALL_BUT_CODE_SPACE }; |
- inline explicit MemoryChunkIterator(Heap* heap, Mode mode); |
+ inline explicit MemoryChunkIterator(Heap* heap); |
// Return NULL when the iterator is done. |
inline MemoryChunk* next(); |
@@ -3126,7 +3132,6 @@ class MemoryChunkIterator BASE_EMBEDDED { |
kFinishedState |
}; |
State state_; |
- const Mode mode_; |
PageIterator old_iterator_; |
PageIterator code_iterator_; |
PageIterator map_iterator_; |