| Index: src/heap.cc
|
| diff --git a/src/heap.cc b/src/heap.cc
|
| index 5c7cbcacd3d4c3e028b347ae9cd42e1d79b825b2..fec0ac0a099ce56ef6d06602349e0755ec6b3add 100644
|
| --- a/src/heap.cc
|
| +++ b/src/heap.cc
|
| @@ -1301,7 +1301,7 @@ static void VerifyNonPointerSpacePointers(Heap* heap) {
|
|
|
| // The old data space was normally swept conservatively so that the iterator
|
| // doesn't work, so we normally skip the next bit.
|
| - if (heap->old_data_space()->is_iterable()) {
|
| + if (heap->old_data_space()->swept_precisely()) {
|
| HeapObjectIterator data_it(heap->old_data_space());
|
| for (HeapObject* object = data_it.Next();
|
| object != NULL; object = data_it.Next())
|
| @@ -3312,8 +3312,7 @@ bool Heap::CanMoveObjectStart(HeapObject* object) {
|
| // pages is set after sweeping all pages.
|
| return (!is_in_old_pointer_space && !is_in_old_data_space) ||
|
| page->WasSwept() ||
|
| - (page->parallel_sweeping() <=
|
| - MemoryChunk::PARALLEL_SWEEPING_FINALIZE);
|
| + (page->parallel_sweeping() <= MemoryChunk::SWEEPING_FINALIZE);
|
| }
|
|
|
|
|
| @@ -4217,8 +4216,8 @@ STRUCT_LIST(MAKE_CASE)
|
|
|
|
|
| bool Heap::IsHeapIterable() {
|
| - return (old_pointer_space()->is_iterable() &&
|
| - old_data_space()->is_iterable() &&
|
| + return (old_pointer_space()->swept_precisely() &&
|
| + old_data_space()->swept_precisely() &&
|
| new_space_top_after_last_gc_ == new_space()->top());
|
| }
|
|
|
|
|