Currently we use a generated number as the class id for object class, this change tries to pin it t…

vm/raw_object_snapshot.cc

Index: vm/raw_object_snapshot.cc
===================================================================
--- vm/raw_object_snapshot.cc	(revision 11008)
+++ vm/raw_object_snapshot.cc	(working copy)
@@ -41,7 +41,16 @@
     if (kind == Snapshot::kFull) {
       cls = reader->NewClass(class_id, is_signature_class);
     } else {
-      cls = Class::GetClass(class_id, is_signature_class);
+      if (class_id < kNumPredefinedCids) {
+        ASSERT((class_id >= kInstanceCid) && (class_id <= kWeakPropertyCid));
+        cls = reader->isolate()->class_table()->At(class_id);
+      } else {
+        if (is_signature_class) {
+          cls = Class::New<Closure>(kIllegalCid);
+        } else {
+          cls = Class::New<Instance>(kIllegalCid);
+        }
+      }
     }
     reader->AddBackRef(object_id, &cls, kIsDeserialized);