rinfo->set_call_address(Code::cast(target)->instruction_start());
}
- private:
- inline void UpdatePointer(Object** p) {
- if (!(*p)->IsHeapObject()) return;
+ static inline void UpdateSlot(Heap* heap, Object** slot) {
+ Object* obj = *slot;
+
+ if (!obj->IsHeapObject()) return;
- HeapObject* obj = HeapObject::cast(*p);
+ HeapObject* heap_obj = HeapObject::cast(obj);
- MapWord map_word = obj->map_word();
+ MapWord map_word = heap_obj->map_word();
if (map_word.IsForwardingAddress()) {
- ASSERT(heap_->InFromSpace(obj) ||
- MarkCompactCollector::IsOnEvacuationCandidate(obj));
- *p = obj->map_word().ToForwardingAddress();
- ASSERT(!heap_->InFromSpace(*p) &&
- !MarkCompactCollector::IsOnEvacuationCandidate(*p));
+ ASSERT(heap->InFromSpace(heap_obj) ||
+ MarkCompactCollector::IsOnEvacuationCandidate(heap_obj));
+ HeapObject* target = map_word.ToForwardingAddress();
+ *slot = target;
+ ASSERT(!heap->InFromSpace(target) &&
+ !MarkCompactCollector::IsOnEvacuationCandidate(target));
}
}
+ private:
+
+ inline void UpdatePointer(Object** p) {
+ UpdateSlot(heap_, p);
+ }
+
Heap* heap_;
};
};
-static inline void UpdateSlot(Object** slot) {
- Object* obj = *slot;
- if (!obj->IsHeapObject()) return;
-
- HeapObject* heap_obj = HeapObject::cast(obj);
-
- MapWord map_word = heap_obj->map_word();
- if (map_word.IsForwardingAddress()) {
- ASSERT(MarkCompactCollector::IsOnEvacuationCandidate(*slot));
- *slot = map_word.ToForwardingAddress();
- ASSERT(!MarkCompactCollector::IsOnEvacuationCandidate(*slot));
- }
-}
-
-
static inline void UpdateSlot(ObjectVisitor* v,
SlotsBuffer::SlotType slot_type,
Address addr) {
for (int slot_idx = 0; slot_idx < idx_; ++slot_idx) {
ObjectSlot slot = slots_[slot_idx];
if (!IsTypedSlot(slot)) {
- UpdateSlot(slot);
+ PointersUpdatingVisitor::UpdateSlot(heap, slot);
} else {
++slot_idx;
ASSERT(slot_idx < idx_);
ObjectSlot slot = slots_[slot_idx];
if (!IsTypedSlot(slot)) {
if (!IsOnInvalidatedCodeObject(reinterpret_cast<Address>(slot))) {
- UpdateSlot(slot);
+ PointersUpdatingVisitor::UpdateSlot(heap, slot);
}
} else {
++slot_idx;