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

runtime/vm/snapshot.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/snapshot.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
 #include "vm/class_finalizer.h"
@@ skipping 362 matching lines @@
   for (intptr_t i = 0; i <= num_flds; i++) {
     *(object_store->from() + i) = ReadObjectImpl();
   }
   for (intptr_t i = 0; i < backward_references_.length(); i++) {
     if (!backward_references_[i]->is_deserialized()) {
       ReadObjectImpl();
       backward_references_[i]->set_state(kIsDeserialized);
     }
   }
 
+  // Validate the class table.
+#if defined(DEBUG)
+  isolate->ValidateClassTable();
+#endif
+
   // Setup native resolver for bootstrap impl.
   Bootstrap::SetupNativeResolver();
 }
 
 
 #define ALLOC_NEW_OBJECT_WITH_LEN(type, class_obj, length)                     \
   ASSERT(kind_ == Snapshot::kFull);                                            \
   ASSERT(isolate()->no_gc_scope_depth() != 0);                                 \
   cls_ = class_obj;                                                            \
   Raw##type* obj = reinterpret_cast<Raw##type*>(                               \
@@ skipping 72 matching lines @@
     ASSERT((class_id >= kInstanceCid) &&
            (class_id <= kNullCid));
     return isolate()->class_table()->At(class_id);
   }
   cls_ = Object::class_class();
   RawClass* obj = reinterpret_cast<RawClass*>(
       AllocateUninitialized(cls_, Class::InstanceSize()));
   Instance fake;
   obj->ptr()->handle_vtable_ = fake.vtable();
   cls_ = obj;
-  cls_.set_id(kIllegalCid);
-  isolate()->RegisterClass(cls_);
+  cls_.set_id(class_id);
+  isolate()->RegisterClassAt(class_id, cls_);
   return cls_.raw();
 }
 
 
 RawInstance* SnapshotReader::NewInstance() {
   ASSERT(kind_ == Snapshot::kFull);
   ASSERT(isolate()->no_gc_scope_depth() != 0);
   cls_ = object_store()->object_class();
   RawInstance* obj = reinterpret_cast<RawInstance*>(
       AllocateUninitialized(cls_, Instance::InstanceSize()));
@@ skipping 627 matching lines @@
 }
 
 
 void FullSnapshotWriter::WriteFullSnapshot() {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   ObjectStore* object_store = isolate->object_store();
   ASSERT(object_store != NULL);
   ASSERT(ClassFinalizer::AllClassesFinalized());
 
+  // Ensure the class table is valid.
+#if defined(DEBUG)
+  isolate->ValidateClassTable();
+#endif
+
+
   // Setup for long jump in case there is an exception while writing
   // the snapshot.
   LongJumpScope jump;
   if (setjmp(*jump.Set()) == 0) {
     NoGCScope no_gc;
 
     // Reserve space in the output buffer for a snapshot header.
     ReserveHeader();
 
     // Write out all the objects in the object store of the isolate which
@@ skipping 415 matching lines @@
     NoGCScope no_gc;
     WriteObject(obj.raw());
     UnmarkAll();
   } else {
     ThrowException(exception_type(), exception_msg());
   }
 }
 
 
 }  // namespace dart