When reading a full snapshot use the class id from the snapshot instead of generating a new one. Th…

runtime/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_histogram.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/object_set.h"
 #include "vm/os.h"
 #include "vm/pages.h"
 #include "vm/raw_object.h"
 #include "vm/scavenger.h"
 #include "vm/stack_frame.h"
 #include "vm/verifier.h"
 #include "vm/virtual_memory.h"
@@ skipping 154 matching lines @@
       break;
     }
     case kOld:
     case kCode: {
       bool promotion_failure = new_space_->HadPromotionFailure();
       RecordBeforeGC(kOld, promotion_failure ? kPromotionFailure : kOldSpace);
       UpdateClassHeapStatsBeforeGC(kOld);
       old_space_->MarkSweep(invoke_api_callbacks);
       RecordAfterGC();
       PrintStats();
-      UpdateObjectHistogram();
       break;
     }
     default:
       UNREACHABLE();
   }
 }
 
 
-void Heap::UpdateObjectHistogram() {
-  Isolate* isolate = Isolate::Current();
-  if (isolate->object_histogram() == NULL) return;
-  isolate->object_histogram()->Collect();
-}
-
-
 void Heap::UpdateClassHeapStatsBeforeGC(Heap::Space space) {
   Isolate* isolate = Isolate::Current();
   ClassTable* class_table = isolate->class_table();
   if (space == kNew) {
     class_table->ResetCountersNew();
   } else {
     class_table->ResetCountersOld();
   }
 }
 
@@ skipping 13 matching lines @@
   RecordBeforeGC(kNew, kFull);
   UpdateClassHeapStatsBeforeGC(kNew);
   new_space_->Scavenge(kInvokeApiCallbacks);
   RecordAfterGC();
   PrintStats();
   RecordBeforeGC(kOld, kFull);
   UpdateClassHeapStatsBeforeGC(kOld);
   old_space_->MarkSweep(kInvokeApiCallbacks);
   RecordAfterGC();
   PrintStats();
-  UpdateObjectHistogram();
 }
 
 
 void Heap::SetGrowthControlState(bool state) {
   old_space_->SetGrowthControlState(state);
 }
 
 
 bool Heap::GrowthControlState() {
   return old_space_->GrowthControlState();
@@ skipping 275 matching lines @@
     heap->DisableGrowthControl();
 }
 
 
 NoHeapGrowthControlScope::~NoHeapGrowthControlScope() {
     Heap* heap = reinterpret_cast<Isolate*>(isolate())->heap();
     heap->SetGrowthControlState(current_growth_controller_state_);
 }
 
 }  // namespace dart