Reland "Merge old data and pointer space."

src/heap/spaces-inl.h

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_HEAP_SPACES_INL_H_
 #define V8_HEAP_SPACES_INL_H_
 
 #include "src/heap/spaces.h"
 #include "src/heap-profiler.h"
 #include "src/isolate.h"
@@ skipping 188 matching lines @@
   // to another chunk. See the comment to Page::FromAllocationTop.
   MemoryChunk* chunk = MemoryChunk::FromAddress(mark - 1);
   int new_mark = static_cast<int>(mark - chunk->address());
   if (new_mark > chunk->high_water_mark_) {
     chunk->high_water_mark_ = new_mark;
   }
 }
 
 
 PointerChunkIterator::PointerChunkIterator(Heap* heap)
-    : state_(kOldPointerState),
-      old_pointer_iterator_(heap->old_pointer_space()),
+    : state_(kOldSpaceState),
+      old_iterator_(heap->old_space()),
       map_iterator_(heap->map_space()),
       lo_iterator_(heap->lo_space()) {}
 
 
 Page* Page::next_page() {
   DCHECK(next_chunk()->owner() == owner());
   return static_cast<Page*>(next_chunk());
 }
 
 
@@ skipping 81 matching lines @@
 
 
 intptr_t LargeObjectSpace::Available() {
   return ObjectSizeFor(heap()->isolate()->memory_allocator()->Available());
 }
 
 }
 }  // namespace v8::internal
 
 #endif  // V8_HEAP_SPACES_INL_H_