Merge old data and pointer space.

src/globals.h

Index: src/globals.h
diff --git a/src/globals.h b/src/globals.h
index 9547ea2323a77064f3e2e13a4e43f2821530b832..7bd9b22f5bde9acd8dbc95ad2892519e1be08ad0 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -409,8 +409,7 @@ typedef bool (*WeakSlotCallbackWithHeap)(Heap* heap, Object** pointer);
 // Keep this enum in sync with the ObjectSpace enum in v8.h
 enum AllocationSpace {
   NEW_SPACE,            // Semispaces collected with copying collector.
-  OLD_POINTER_SPACE,    // May contain pointers to new space.
-  OLD_DATA_SPACE,       // Must not have pointers to new space.
+  OLD_SPACE,            // May contain pointers to new space.
   CODE_SPACE,           // No pointers to new space, marked executable.
   MAP_SPACE,            // Only and all map objects.
   CELL_SPACE,           // Only and all cell objects.
@@ -419,7 +418,7 @@ enum AllocationSpace {
 
   FIRST_SPACE = NEW_SPACE,
   LAST_SPACE = LO_SPACE,
-  FIRST_PAGED_SPACE = OLD_POINTER_SPACE,
+  FIRST_PAGED_SPACE = OLD_SPACE,
   LAST_PAGED_SPACE = PROPERTY_CELL_SPACE
 };
 const int kSpaceTagSize = 3;