Add Heap::isolate_ to simplify code.

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 99 matching lines @@
   void PromoteExternal(intptr_t size);
 
   // Heap contains the specified address.
   bool Contains(uword addr) const;
   bool NewContains(uword addr) const;
   bool OldContains(uword addr) const;
   bool CodeContains(uword addr) const;
   bool StubCodeContains(uword addr) const;
 
   // Visit all pointers.
-  void IteratePointers(ObjectPointerVisitor* visitor);
+  void IteratePointers(ObjectPointerVisitor* visitor) const;
 
   // Visit all pointers in the space.
-  void IterateNewPointers(ObjectPointerVisitor* visitor);
-  void IterateOldPointers(ObjectPointerVisitor* visitor);
+  void IterateNewPointers(ObjectPointerVisitor* visitor) const;
+  void IterateOldPointers(ObjectPointerVisitor* visitor) const;
 
   // Visit all objects.
-  void IterateObjects(ObjectVisitor* visitor);
+  void IterateObjects(ObjectVisitor* visitor) const;
 
   // Visit all object in the space.
-  void IterateNewObjects(ObjectVisitor* visitor);
-  void IterateOldObjects(ObjectVisitor* visitor);
+  void IterateNewObjects(ObjectVisitor* visitor) const;
+  void IterateOldObjects(ObjectVisitor* visitor) const;
 
   // Find an object by visiting all pointers in the specified heap space,
   // the 'visitor' is used to determine if an object is found or not.
   // The 'visitor' function should be set up to return true if the
   // object is found, traversal through the heap space stops at that
   // point.
   // The 'visitor' function should return false if the object is not found,
   // traversal through the heap space continues.
   // Returns null object if nothing is found. Must be called within a NoGCScope.
   RawInstructions* FindObjectInCodeSpace(FindObjectVisitor* visitor) const;
@@ skipping 100 matching lines @@
     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);
   }
 
+  Isolate* isolate() const { return isolate_; }
+
  private:
   class GCStats : public ValueObject {
    public:
     GCStats() {}
     intptr_t num_;
     Heap::Space space_;
     Heap::GCReason reason_;
 
     class Data : public ValueObject {
     public:
@@ skipping 13 matching lines @@
     Data after_;
     int64_t times_[kDataEntries];
     intptr_t data_[kDataEntries];
 
    private:
     DISALLOW_COPY_AND_ASSIGN(GCStats);
   };
 
   static const intptr_t kNewAllocatableSize = 256 * KB;
 
-  Heap(intptr_t max_new_gen_words, intptr_t max_old_gen_words);
+  Heap(Isolate* isolate,
+       intptr_t max_new_gen_words,
+       intptr_t max_old_gen_words);
 
   uword AllocateNew(intptr_t size);
   uword AllocateOld(intptr_t size, HeapPage::PageType type);
 
   // GC stats collection.
   void RecordBeforeGC(Space space, GCReason reason);
   void RecordAfterGC();
   void PrintStats();
   void UpdateClassHeapStatsBeforeGC(Heap::Space space);
 
   // 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_;
 
   WeakTable* new_weak_tables_[kNumWeakSelectors];
   WeakTable* old_weak_tables_[kNumWeakSelectors];
 
   // GC stats collection.
   GCStats stats_;
 
@@ skipping 31 matching lines @@
   NoHeapGrowthControlScope();
   ~NoHeapGrowthControlScope();
  private:
   bool current_growth_controller_state_;
   DISALLOW_COPY_AND_ASSIGN(NoHeapGrowthControlScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_HEAP_H_