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

runtime/vm/isolate.h

 // Copyright (c) 2013, 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_ISOLATE_H_
 #define VM_ISOLATE_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/thread.h"
@@ skipping 42 matching lines @@
 class RawError;
 class RawFloat32x4;
 class RawInt32x4;
 class SampleBuffer;
 class Simulator;
 class StackResource;
 class StackZone;
 class StubCode;
 class TypeArguments;
 class TypeParameter;
-class ObjectHistogram;
 class ObjectIdRing;
 
 
 #define REUSABLE_HANDLE_LIST(V)                                                \
   V(Object)                                                                    \
   V(Array)                                                                     \
   V(String)                                                                    \
   V(Instance)                                                                  \
   V(Function)                                                                  \
   V(Field)                                                                     \
@@ skipping 23 matching lines @@
   }
 
   static void SetCurrent(Isolate* isolate);
 
   static void InitOnce();
   static Isolate* Init(const char* name_prefix);
   void Shutdown();
 
   // 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,
                            bool visit_prologue_weak_persistent_handles,
                            bool validate_frames);
 
   // Visits weak object pointers.
   void VisitWeakPersistentHandles(HandleVisitor* visit,
                                   bool visit_prologue_weak_persistent_handles);
 
   StoreBuffer* store_buffer() { return &store_buffer_; }
   static intptr_t store_buffer_offset() {
     return OFFSET_OF(Isolate, store_buffer_);
   }
 
   ClassTable* class_table() { return &class_table_; }
   static intptr_t class_table_offset() {
     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; }
 
   MegamorphicCacheTable* megamorphic_cache_table() {
     return &megamorphic_cache_table_;
   }
 
   Dart_MessageNotifyCallback message_notify_callback() const {
     return message_notify_callback_;
   }
@@ skipping 343 matching lines @@
   IsolateSpawnState* spawn_state_;
   bool is_runnable_;
   GcPrologueCallbacks gc_prologue_callbacks_;
   GcEpilogueCallbacks gc_epilogue_callbacks_;
   intptr_t defer_finalization_count_;
   DeoptContext* deopt_context_;
 
   // Status support.
   char* stacktrace_;
   intptr_t stack_frame_index_;
-  ObjectHistogram* object_histogram_;
 
   bool cha_used_;
 
   // Ring buffer of objects assigned an id.
   ObjectIdRing* object_id_ring_;
 
   IsolateProfilerData* profiler_data_;
   Mutex profiler_data_mutex_;
   InterruptableThreadState* thread_state_;
 
@@ skipping 122 matching lines @@
   char* script_url_;
   char* library_url_;
   char* class_name_;
   char* function_name_;
   char* exception_callback_name_;
 };
 
 }  // namespace dart
 
 #endif  // VM_ISOLATE_H_