Reland "Merge old data and pointer space."

src/extensions/statistics-extension.cc

 // 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.
 
 #include "src/extensions/statistics-extension.h"
 
 namespace v8 {
 namespace internal {
 
 const char* const StatisticsExtension::kSource =
@@ skipping 90 matching lines @@
   struct StatisticNumber {
     intptr_t number;
     const char* name;
   };
 
   const StatisticNumber numbers[] = {
       {isolate->memory_allocator()->Size(), "total_committed_bytes"},
       {heap->new_space()->Size(), "new_space_live_bytes"},
       {heap->new_space()->Available(), "new_space_available_bytes"},
       {heap->new_space()->CommittedMemory(), "new_space_commited_bytes"},
-      {heap->old_pointer_space()->Size(), "old_pointer_space_live_bytes"},
-      {heap->old_pointer_space()->Available(),
-       "old_pointer_space_available_bytes"},
-      {heap->old_pointer_space()->CommittedMemory(),
-       "old_pointer_space_commited_bytes"},
-      {heap->old_data_space()->Size(), "old_data_space_live_bytes"},
-      {heap->old_data_space()->Available(), "old_data_space_available_bytes"},
-      {heap->old_data_space()->CommittedMemory(),
-       "old_data_space_commited_bytes"},
+      {heap->old_space()->Size(), "old_space_live_bytes"},
+      {heap->old_space()->Available(), "old_space_available_bytes"},
+      {heap->old_space()->CommittedMemory(), "old_space_commited_bytes"},
       {heap->code_space()->Size(), "code_space_live_bytes"},
       {heap->code_space()->Available(), "code_space_available_bytes"},
       {heap->code_space()->CommittedMemory(), "code_space_commited_bytes"},
       {heap->cell_space()->Size(), "cell_space_live_bytes"},
       {heap->cell_space()->Available(), "cell_space_available_bytes"},
       {heap->cell_space()->CommittedMemory(), "cell_space_commited_bytes"},
       {heap->lo_space()->Size(), "lo_space_live_bytes"},
       {heap->lo_space()->Available(), "lo_space_available_bytes"},
       {heap->lo_space()->CommittedMemory(), "lo_space_commited_bytes"},
   };
 
   for (size_t i = 0; i < arraysize(numbers); i++) {
     AddNumber(args.GetIsolate(), result, numbers[i].number, numbers[i].name);
   }
 
   AddNumber64(args.GetIsolate(), result,
               heap->amount_of_external_allocated_memory(),
               "amount_of_external_allocated_memory");
   args.GetReturnValue().Set(result);
 }
 
 } }  // namespace v8::internal