| Index: src/heap-inl.h
|
| diff --git a/src/heap-inl.h b/src/heap-inl.h
|
| index 02a2bf81606393d14c79a11e72d7a9c44c160ed1..264ce8ce534be6fe063ed2559d472bd13675cedf 100644
|
| --- a/src/heap-inl.h
|
| +++ b/src/heap-inl.h
|
| @@ -267,7 +267,7 @@ void Heap::CopyBlockToOldSpaceAndUpdateRegionMarks(Address dst,
|
| remaining--) {
|
| Memory::Object_at(dst) = Memory::Object_at(src);
|
|
|
| - if (Heap::InNewSpace(Memory::Object_at(dst))) {
|
| + if (InNewSpace(Memory::Object_at(dst))) {
|
| marks |= page->GetRegionMaskForAddress(dst);
|
| }
|
|
|
| @@ -313,8 +313,13 @@ void Heap::MoveBlockToOldSpaceAndUpdateRegionMarks(Address dst,
|
| }
|
|
|
|
|
| +void Heap::ScavengePointer(HeapObject** p) {
|
| + ScavengeObject(p, *p);
|
| +}
|
| +
|
| +
|
| void Heap::ScavengeObject(HeapObject** p, HeapObject* object) {
|
| - ASSERT(InFromSpace(object));
|
| + ASSERT(HEAP->InFromSpace(object));
|
|
|
| // We use the first word (where the map pointer usually is) of a heap
|
| // object to record the forwarding pointer. A forwarding pointer can
|
|
|