VM: Inline Scavenger and PageSpace objects into Heap.

runtime/vm/heap.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_HEAP_H_
 #define VM_HEAP_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/flags.h"
@@ skipping 50 matching lines @@
 
 #if defined(DEBUG)
   // Pattern for unused new space and swept old space.
   static const uint64_t kZap64Bits = 0xf3f3f3f3f3f3f3f3;
   static const uint32_t kZap32Bits = 0xf3f3f3f3;
   static const uint8_t kZapByte = 0xf3;
 #endif  // DEBUG
 
   ~Heap();
 
-  Scavenger* new_space() const { return new_space_; }
-  PageSpace* old_space() const { return old_space_; }
+  Scavenger* new_space() { return &new_space_; }
+  PageSpace* old_space() { return &old_space_; }
 
   uword Allocate(intptr_t size, Space space) {
     ASSERT(!read_only_);
     switch (space) {
       case kNew:
         // Do not attempt to allocate very large objects in new space.
         if (!IsAllocatableInNewSpace(size)) {
           return AllocateOld(size, HeapPage::kData);
         }
         return AllocateNew(size);
@@ skipping 46 matching lines @@
   // Enables growth control on the page space heaps.  This should be
   // called before any user code is executed.
   void EnableGrowthControl() { SetGrowthControlState(true); }
   void DisableGrowthControl() { SetGrowthControlState(false); }
   void SetGrowthControlState(bool state);
   bool GrowthControlState();
 
   // Protect access to the heap.
   void WriteProtect(bool read_only);
   void WriteProtectCode(bool read_only) {
-    old_space_->WriteProtectCode(read_only);
+    old_space_.WriteProtectCode(read_only);
   }
 
   // Accessors for inlined allocation in generated code.
   uword TopAddress(Space space);
   uword EndAddress(Space space);
   Space SpaceForAllocation(intptr_t class_id) const;
 
   // Initialize the heap and register it with the isolate.
   static void Init(Isolate* isolate,
                    intptr_t max_new_gen_words,
@@ skipping 71 matching lines @@
 
   bool gc_in_progress() const { return gc_in_progress_; }
 
   static bool IsAllocatableInNewSpace(intptr_t size) {
     return size <= kNewAllocatableSize;
   }
 
   void PrintToJSONObject(Space space, JSONObject* object) const;
 
   // The heap map contains the sizes and class ids for the objects in each page.
-  void PrintHeapMapToJSONStream(Isolate* isolate, JSONStream* stream) const {
-    return old_space_->PrintHeapMapToJSONStream(isolate, stream);
+  void PrintHeapMapToJSONStream(Isolate* isolate, JSONStream* stream) {
+    return old_space_.PrintHeapMapToJSONStream(isolate, stream);
   }
 
   Isolate* isolate() const { return isolate_; }
 
   bool ShouldPretenure(intptr_t class_id) const;
 
  private:
   class GCStats : public ValueObject {
    public:
     GCStats() {}
@@ skipping 55 matching lines @@
   void UpdatePretenurePolicy();
 
   // If this heap is non-empty, updates start and end to the smallest range that
   // contains both the original [start, end) and the [lowest, highest) addresses
   // of this heap.
   void GetMergedAddressRange(uword* start, uword* end) const;
 
   Isolate* isolate_;
 
   // The different spaces used for allocation.
-  Scavenger* new_space_;
-  PageSpace* old_space_;
+  Scavenger new_space_;
+  PageSpace old_space_;
 
   WeakTable* new_weak_tables_[kNumWeakSelectors];
   WeakTable* old_weak_tables_[kNumWeakSelectors];
 
   // GC stats collection.
   GCStats stats_;
 
   // This heap is in read-only mode: No allocation is allowed.
   bool read_only_;
 
   // GC on the heap is in progress.
   bool gc_in_progress_;
 
   int pretenure_policy_;
 
   friend class ServiceEvent;
-  friend class GCTestHelper;
   friend class PageSpace;  // VerifyGC
   DISALLOW_COPY_AND_ASSIGN(Heap);
 };
 
 
 // Within a NoSafepointScope, the thread must not reach any safepoint. Used
 // around code that manipulates raw object pointers directly without handles.
 #if defined(DEBUG)
 class NoSafepointScope : public StackResource {
  public:
@@ skipping 29 matching lines @@
   NoHeapGrowthControlScope();
   ~NoHeapGrowthControlScope();
  private:
   bool current_growth_controller_state_;
   DISALLOW_COPY_AND_ASSIGN(NoHeapGrowthControlScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_HEAP_H_