Index: src/heap/heap.cc |
diff --git a/src/heap/heap.cc b/src/heap/heap.cc |
index 4f09e675414c4d5e35d014f86273a08faef747ef..b9e3ce5aa609ee9022b34ace8417f0a50861fbda 100644 |
--- a/src/heap/heap.cc |
+++ b/src/heap/heap.cc |
@@ -1107,7 +1107,7 @@ void Heap::MoveElements(FixedArray* array, int dst_index, int src_index, |
for (int i = 0; i < len; i++) { |
// TODO(hpayer): check store buffer for entries |
if (InNewSpace(dst_objects[i])) { |
- RecordWrite(array->address(), array->OffsetOfElementAt(dst_index + i)); |
+ RecordWrite(array, array->OffsetOfElementAt(dst_index + i)); |
} |
} |
} |
@@ -4365,7 +4365,7 @@ bool Heap::Contains(HeapObject* value) { return Contains(value->address()); } |
bool Heap::Contains(Address addr) { |
if (isolate_->memory_allocator()->IsOutsideAllocatedSpace(addr)) return false; |
return HasBeenSetUp() && |
- (new_space_.ToSpaceContains(addr) || old_space_->Contains(addr) || |
+ (new_space_.ToSpaceContainsSlow(addr) || old_space_->Contains(addr) || |
Hannes Payer (out of office)
2016/02/08 16:05:40
If ToSpaceContains takes an object, this check wil
Michael Lippautz
2016/02/08 18:00:38
Done.
|
code_space_->Contains(addr) || map_space_->Contains(addr) || |
lo_space_->SlowContains(addr)); |
} |
@@ -4382,7 +4382,7 @@ bool Heap::InSpace(Address addr, AllocationSpace space) { |
switch (space) { |
case NEW_SPACE: |
- return new_space_.ToSpaceContains(addr); |
+ return new_space_.ToSpaceContainsSlow(addr); |
case OLD_SPACE: |
return old_space_->Contains(addr); |
case CODE_SPACE: |