Revert of Merge cellspace into old pointer space

src/heap/heap.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_HEAP_HEAP_H_
 #define V8_HEAP_HEAP_H_
 
 #include <cmath>
 
 #include "src/allocation.h"
@@ skipping 625 matching lines @@
   // address with the mask will result in the start address of the new space
   // for all addresses in either semispace.
   Address NewSpaceStart() { return new_space_.start(); }
   uintptr_t NewSpaceMask() { return new_space_.mask(); }
   Address NewSpaceTop() { return new_space_.top(); }
 
   NewSpace* new_space() { return &new_space_; }
   OldSpace* old_space() { return old_space_; }
   OldSpace* code_space() { return code_space_; }
   MapSpace* map_space() { return map_space_; }
+  CellSpace* cell_space() { return cell_space_; }
   LargeObjectSpace* lo_space() { return lo_space_; }
   PagedSpace* paged_space(int idx) {
     switch (idx) {
       case OLD_SPACE:
         return old_space();
       case MAP_SPACE:
         return map_space();
+      case CELL_SPACE:
+        return cell_space();
       case CODE_SPACE:
         return code_space();
       case NEW_SPACE:
       case LO_SPACE:
         UNREACHABLE();
     }
     return NULL;
   }
 
   bool always_allocate() { return always_allocate_scope_depth_ != 0; }
@@ skipping 898 matching lines @@
   int contexts_disposed_;
 
   int global_ic_age_;
 
   int scan_on_scavenge_pages_;
 
   NewSpace new_space_;
   OldSpace* old_space_;
   OldSpace* code_space_;
   MapSpace* map_space_;
+  CellSpace* cell_space_;
   LargeObjectSpace* lo_space_;
   HeapState gc_state_;
   int gc_post_processing_depth_;
   Address new_space_top_after_last_gc_;
 
   // Returns the amount of external memory registered since last global gc.
   int64_t PromotedExternalMemorySize();
 
   // How many "runtime allocations" happened.
   uint32_t allocations_count_;
@@ skipping 584 matching lines @@
 
   int* start_marker;                       //  0
   int* new_space_size;                     //  1
   int* new_space_capacity;                 //  2
   intptr_t* old_space_size;                //  3
   intptr_t* old_space_capacity;            //  4
   intptr_t* code_space_size;               //  5
   intptr_t* code_space_capacity;           //  6
   intptr_t* map_space_size;                //  7
   intptr_t* map_space_capacity;            //  8
-  intptr_t* lo_space_size;                 //  9
-  int* global_handle_count;                // 10
-  int* weak_global_handle_count;           // 11
-  int* pending_global_handle_count;        // 12
-  int* near_death_global_handle_count;     // 13
-  int* free_global_handle_count;           // 14
-  intptr_t* memory_allocator_size;         // 15
-  intptr_t* memory_allocator_capacity;     // 16
-  int* objects_per_type;                   // 17
-  int* size_per_type;                      // 18
-  int* os_error;                           // 19
-  int* end_marker;                         // 20
+  intptr_t* cell_space_size;               //  9
+  intptr_t* cell_space_capacity;           // 10
+  intptr_t* lo_space_size;                 // 11
+  int* global_handle_count;                // 12
+  int* weak_global_handle_count;           // 13
+  int* pending_global_handle_count;        // 14
+  int* near_death_global_handle_count;     // 15
+  int* free_global_handle_count;           // 16
+  intptr_t* memory_allocator_size;         // 17
+  intptr_t* memory_allocator_capacity;     // 18
+  int* objects_per_type;                   // 19
+  int* size_per_type;                      // 20
+  int* os_error;                           // 21
+  int* end_marker;                         // 22
 };
 
 
 class AlwaysAllocateScope {
  public:
   explicit inline AlwaysAllocateScope(Isolate* isolate);
   inline ~AlwaysAllocateScope();
 
  private:
   // Implicitly disable artificial allocation failures.
@@ skipping 399 matching lines @@
   DisallowHeapAllocation no_allocation;  // i.e. no gc allowed.
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(PathTracer);
 };
 #endif  // DEBUG
 }
 }  // namespace v8::internal
 
 #endif  // V8_HEAP_HEAP_H_