Reland "Merge old data and pointer space."

tools/oom_dump/oom_dump.cc

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 147 matching lines @@
   // Read heap stats.
 
 #define READ_FIELD(offset) \
   ReadPointedValue(memory_region, heap_stats_addr, offset)
 
   CHECK(READ_FIELD(0) == v8::internal::HeapStats::kStartMarker);
   CHECK(READ_FIELD(24) == v8::internal::HeapStats::kEndMarker);
 
   const int new_space_size = READ_FIELD(1);
   const int new_space_capacity = READ_FIELD(2);
-  const int old_pointer_space_size = READ_FIELD(3);
-  const int old_pointer_space_capacity = READ_FIELD(4);
-  const int old_data_space_size = READ_FIELD(5);
-  const int old_data_space_capacity = READ_FIELD(6);
-  const int code_space_size = READ_FIELD(7);
-  const int code_space_capacity = READ_FIELD(8);
-  const int map_space_size = READ_FIELD(9);
-  const int map_space_capacity = READ_FIELD(10);
-  const int cell_space_size = READ_FIELD(11);
-  const int cell_space_capacity = READ_FIELD(12);
-  const int lo_space_size = READ_FIELD(13);
-  const int global_handle_count = READ_FIELD(14);
-  const int weak_global_handle_count = READ_FIELD(15);
-  const int pending_global_handle_count = READ_FIELD(16);
-  const int near_death_global_handle_count = READ_FIELD(17);
-  const int destroyed_global_handle_count = READ_FIELD(18);
-  const int memory_allocator_size = READ_FIELD(19);
-  const int memory_allocator_capacity = READ_FIELD(20);
-  const int os_error = READ_FIELD(23);
+  const int old_space_size = READ_FIELD(3);
+  const int old_space_capacity = READ_FIELD(4);
+  const int code_space_size = READ_FIELD(5);
+  const int code_space_capacity = READ_FIELD(6);
+  const int map_space_size = READ_FIELD(7);
+  const int map_space_capacity = READ_FIELD(8);
+  const int cell_space_size = READ_FIELD(9);
+  const int cell_space_capacity = READ_FIELD(10);
+  const int lo_space_size = READ_FIELD(11);
+  const int global_handle_count = READ_FIELD(12);
+  const int weak_global_handle_count = READ_FIELD(13);
+  const int pending_global_handle_count = READ_FIELD(14);
+  const int near_death_global_handle_count = READ_FIELD(15);
+  const int destroyed_global_handle_count = READ_FIELD(16);
+  const int memory_allocator_size = READ_FIELD(17);
+  const int memory_allocator_capacity = READ_FIELD(18);
+  const int os_error = READ_FIELD(19);
 #undef READ_FIELD
 
   int objects_per_type[v8::internal::LAST_TYPE + 1] = {0};
   ReadArrayFrom(memory_region, heap_stats_addr, 21,
                 v8::internal::LAST_TYPE + 1, objects_per_type);
 
   int size_per_type[v8::internal::LAST_TYPE + 1] = {0};
   ReadArrayFrom(memory_region, heap_stats_addr, 22, v8::internal::LAST_TYPE + 1,
                 size_per_type);
 
@@ skipping 21 matching lines @@
 
   printf("exception thread ID: %" PRIu32 " (%#" PRIx32 ")\n",
          exception_thread_id, exception_thread_id);
   printf("heap stats address: %#" PRIx64 "\n", heap_stats_addr);
 #define PRINT_INT_STAT(stat) \
     printf("\t%-25s\t% 10d\n", #stat ":", stat);
 #define PRINT_MB_STAT(stat) \
     printf("\t%-25s\t% 10.3f MB\n", #stat ":", toM(stat));
   PRINT_MB_STAT(new_space_size);
   PRINT_MB_STAT(new_space_capacity);
-  PRINT_MB_STAT(old_pointer_space_size);
-  PRINT_MB_STAT(old_pointer_space_capacity);
-  PRINT_MB_STAT(old_data_space_size);
-  PRINT_MB_STAT(old_data_space_capacity);
+  PRINT_MB_STAT(old_space_size);
+  PRINT_MB_STAT(old_space_capacity);
   PRINT_MB_STAT(code_space_size);
   PRINT_MB_STAT(code_space_capacity);
   PRINT_MB_STAT(map_space_size);
   PRINT_MB_STAT(map_space_capacity);
   PRINT_MB_STAT(cell_space_size);
   PRINT_MB_STAT(cell_space_capacity);
   PRINT_MB_STAT(lo_space_size);
   PRINT_INT_STAT(global_handle_count);
   PRINT_INT_STAT(weak_global_handle_count);
   PRINT_INT_STAT(pending_global_handle_count);
@@ skipping 36 matching lines @@
 int main(int argc, char **argv) {
   if (argc != 2) {
     fprintf(stderr, "usage: %s <minidump>\n", argv[0]);
     return 1;
   }
 
   DumpHeapStats(argv[1]);
 
   return 0;
 }