Reland "Merge old data and pointer space."

test/cctest/test-constantpool.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 
 // Test constant pool array code.
 
 #include "src/v8.h"
 
 #include "src/factory.h"
 #include "src/objects.h"
 #include "test/cctest/cctest.h"
 
@@ skipping 263 matching lines @@
   Factory* factory = isolate->factory();
   v8::HandleScope scope(context->GetIsolate());
 
   ConstantPoolArray::NumberOfEntries small(0, 0, 1, 0);
   ConstantPoolArray::NumberOfEntries extended(0, 0, 1, 0);
   Handle<ConstantPoolArray> array =
       factory->NewExtendedConstantPoolArray(small, extended);
 
   // Start a second old-space page so that the heap pointer added to the
   // constant pool array ends up on the an evacuation candidate page.
-  Page* first_page = heap->old_data_space()->anchor()->next_page();
+  Page* first_page = heap->old_space()->anchor()->next_page();
   {
     HandleScope scope(isolate);
     int dummy_array_size = Page::kMaxRegularHeapObjectSize - 92 * KB;
     Handle<HeapObject> temp =
         factory->NewFixedDoubleArray(dummy_array_size / kDoubleSize, TENURED);
-    CHECK(heap->InOldDataSpace(temp->address()));
+    CHECK(heap->InOldSpace(temp->address()));
     Handle<HeapObject> heap_ptr =
         factory->NewHeapNumber(5.0, IMMUTABLE, TENURED);
-    CHECK(heap->InOldDataSpace(heap_ptr->address()));
+    CHECK(heap->InOldSpace(heap_ptr->address()));
     CHECK(!first_page->Contains(heap_ptr->address()));
     array->set(0, *heap_ptr);
     array->set(1, *heap_ptr);
   }
 
   // Check heap pointers are correctly updated on GC.
   Object* old_ptr = array->get_heap_ptr_entry(0);
   Handle<Object> object(old_ptr, isolate);
   CHECK_EQ(old_ptr, *object);
   CHECK_EQ(old_ptr, array->get_heap_ptr_entry(1));
 
   // Force compacting garbage collection.
   CHECK(FLAG_always_compact);
   heap->CollectAllGarbage(Heap::kNoGCFlags);
 
   CHECK_NE(old_ptr, *object);
   CHECK_EQ(*object, array->get_heap_ptr_entry(0));
   CHECK_EQ(*object, array->get_heap_ptr_entry(1));
 }