Reland "Merge old data and pointer space."

src/globals.h

 // Copyright 2012 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_GLOBALS_H_
 #define V8_GLOBALS_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 390 matching lines @@
 
 typedef bool (*WeakSlotCallbackWithHeap)(Heap* heap, Object** pointer);
 
 // -----------------------------------------------------------------------------
 // Miscellaneous
 
 // NOTE: SpaceIterator depends on AllocationSpace enumeration values being
 // consecutive.
 // 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.
-  CODE_SPACE,         // No pointers to new space, marked executable.
-  MAP_SPACE,          // Only and all map objects.
-  CELL_SPACE,         // Only and all cell objects.
-  LO_SPACE,           // Promoted large objects.
+  NEW_SPACE,   // Semispaces collected with copying collector.
+  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.
+  LO_SPACE,    // Promoted large objects.
 
   FIRST_SPACE = NEW_SPACE,
   LAST_SPACE = LO_SPACE,
-  FIRST_PAGED_SPACE = OLD_POINTER_SPACE,
+  FIRST_PAGED_SPACE = OLD_SPACE,
   LAST_PAGED_SPACE = CELL_SPACE
 };
 const int kSpaceTagSize = 3;
 const int kSpaceTagMask = (1 << kSpaceTagSize) - 1;
 
 
 // A flag that indicates whether objects should be pretenured when
 // allocated (allocated directly into the old generation) or not
 // (allocated in the young generation if the object size and type
 // allows).
@@ skipping 493 matching lines @@
 inline FunctionKind WithObjectLiteralBit(FunctionKind kind) {
   kind = static_cast<FunctionKind>(kind | FunctionKind::kInObjectLiteral);
   DCHECK(IsValidFunctionKind(kind));
   return kind;
 }
 } }  // namespace v8::internal
 
 namespace i = v8::internal;
 
 #endif  // V8_GLOBALS_H_