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

runtime/vm/isolate.h

Index: runtime/vm/isolate.h
===================================================================
--- runtime/vm/isolate.h	(revision 33311)
+++ runtime/vm/isolate.h	(working copy)
@@ -60,7 +60,6 @@
 class StubCode;
 class TypeArguments;
 class TypeParameter;
-class ObjectHistogram;
 class ObjectIdRing;
 
 
@@ -104,6 +103,8 @@
 
   // Register a newly introduced class.
   void RegisterClass(const Class& cls);
+  void RegisterClassAt(intptr_t index, const Class& cls);
+  void ValidateClassTable();
 
   // Visit all object pointers.
   void VisitObjectPointers(ObjectPointerVisitor* visitor,
@@ -124,8 +125,6 @@
     return OFFSET_OF(Isolate, class_table_);
   }
 
-  ObjectHistogram* object_histogram() { return object_histogram_; }
-
   bool cha_used() const { return cha_used_; }
   void set_cha_used(bool value) { cha_used_ = value; }
 
@@ -489,7 +488,6 @@
   // Status support.
   char* stacktrace_;
   intptr_t stack_frame_index_;
-  ObjectHistogram* object_histogram_;
 
   bool cha_used_;