Do not emit pointer information for embedded singleton VM Isolate objects while generating code. Th…

vm/heap.cc

 // 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.
 
 #include "vm/heap.h"
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/flags.h"
 #include "vm/heap_profiler.h"
@@ skipping 17 matching lines @@
             "Enables heap verification before GC.");
 DEFINE_FLAG(bool, verify_after_gc, false,
             "Enables heap verification after GC.");
 DEFINE_FLAG(bool, gc_at_alloc, false, "GC at every allocation.");
 DEFINE_FLAG(int, new_gen_heap_size, 32, "new gen heap size in MB,"
             "e.g: --new_gen_heap_size=64 allocates a 64MB new gen heap");
 DEFINE_FLAG(int, old_gen_heap_size, Heap::kHeapSizeInMB,
             "old gen heap size in MB,"
             "e.g: --old_gen_heap_size=1024 allocates a 1024MB old gen heap");
 
-Heap::Heap() : read_only_(false) {
+Heap::Heap() : read_only_(false), gc_in_progress_(false) {
   new_space_ = new Scavenger(this,
                              (FLAG_new_gen_heap_size * MB),
                              kNewObjectAlignmentOffset);
   old_space_ = new PageSpace(this, (FLAG_old_gen_heap_size * MB));
   stats_.num_ = 0;
   heap_trace_ = new HeapTrace;
 }
 
 
 Heap::~Heap() {
@@ skipping 311 matching lines @@
   return old_space_->GetPeer(raw_obj);
 }
 
 
 int64_t Heap::PeerCount() const {
   return new_space_->PeerCount() + old_space_->PeerCount();
 }
 
 
 void Heap::RecordBeforeGC(Space space, GCReason reason) {
+  ASSERT(!gc_in_progress_);
+  gc_in_progress_ = true;
   stats_.num_++;
   stats_.space_ = space;
   stats_.reason_ = reason;
   stats_.before_.micros_ = OS::GetCurrentTimeMicros();
   stats_.before_.new_used_ = new_space_->in_use();
   stats_.before_.new_capacity_ = new_space_->capacity();
   stats_.before_.old_used_ = old_space_->in_use();
   stats_.before_.old_capacity_ = old_space_->capacity();
   stats_.times_[0] = 0;
   stats_.times_[1] = 0;
   stats_.times_[2] = 0;
   stats_.times_[3] = 0;
   stats_.data_[0] = 0;
   stats_.data_[1] = 0;
   stats_.data_[2] = 0;
   stats_.data_[3] = 0;
 }
 
 
 void Heap::RecordAfterGC() {
   stats_.after_.micros_ = OS::GetCurrentTimeMicros();
   stats_.after_.new_used_ = new_space_->in_use();
   stats_.after_.new_capacity_ = new_space_->capacity();
   stats_.after_.old_used_ = old_space_->in_use();
   stats_.after_.old_capacity_ = old_space_->capacity();
+  ASSERT(gc_in_progress_);
+  gc_in_progress_ = false;
 }
 
 
 static intptr_t RoundToKB(intptr_t memory_size) {
   return (memory_size + (KB >> 1)) >> KBLog2;
 }
 
 
 static double RoundToSecs(int64_t micros) {
   const int k1M = 1000000;  // Converting us to secs.
@@ skipping 56 matching lines @@
   isolate()->IncrementNoGCScopeDepth();
 }
 
 
 NoGCScope::~NoGCScope() {
   isolate()->DecrementNoGCScopeDepth();
 }
 #endif  // defined(DEBUG)
 
 }  // namespace dart