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

vm/snapshot.cc

Index: vm/snapshot.cc
===================================================================
--- vm/snapshot.cc	(revision 11008)
+++ vm/snapshot.cc	(working copy)
@@ -48,7 +48,7 @@
 
 
 static intptr_t ObjectIdFromClassId(intptr_t class_id) {
-  ASSERT(class_id > kIllegalCid && class_id < kNumPredefinedCids);
+  ASSERT((class_id > kIllegalCid) && (class_id < kNumPredefinedCids));
   return (class_id + kClassIdsOffset);
 }
 
@@ -414,7 +414,8 @@
   ASSERT(kind_ == Snapshot::kFull);
   ASSERT(isolate()->no_gc_scope_depth() != 0);
   if (class_id < kNumPredefinedCids) {
-    return Class::GetClass(class_id, is_signature_class);
+    ASSERT((class_id >= kInstanceCid) && (class_id <= kWeakPropertyCid));
+    return isolate()->class_table()->At(class_id);
   }
   cls_ = Object::class_class();
   RawClass* obj = reinterpret_cast<RawClass*>(