Revert change 11091.

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/exceptions.h"
@@ skipping 30 matching lines @@
 
 
 static intptr_t ClassIdFromObjectId(intptr_t object_id) {
   ASSERT(object_id > kClassIdsOffset);
   intptr_t class_id = (object_id - kClassIdsOffset);
   return class_id;
 }
 
 
 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);
 }
 
 
 static RawType* GetType(ObjectStore* object_store, int index) {
   switch (index) {
     case kObjectType: return object_store->object_type();
     case kNullType: return object_store->null_type();
     case kDynamicType: return object_store->dynamic_type();
     case kVoidType: return object_store->void_type();
@@ skipping 345 matching lines @@
       AllocateUninitialized(cls_, Context::InstanceSize(num_variables)));
   obj->ptr()->num_variables_ = num_variables;
   return obj;
 }
 
 
 RawClass* SnapshotReader::NewClass(intptr_t class_id, bool is_signature_class) {
   ASSERT(kind_ == Snapshot::kFull);
   ASSERT(isolate()->no_gc_scope_depth() != 0);
   if (class_id < kNumPredefinedCids) {
-    ASSERT((class_id >= kInstanceCid) && (class_id <= kWeakPropertyCid));
-    return isolate()->class_table()->At(class_id);
+    return Class::GetClass(class_id, is_signature_class);
   }
   cls_ = Object::class_class();
   RawClass* obj = reinterpret_cast<RawClass*>(
       AllocateUninitialized(cls_, Class::InstanceSize()));
   if (is_signature_class) {
     Closure fake;
     obj->ptr()->handle_vtable_ = fake.vtable();
   } else {
     Instance fake;
     obj->ptr()->handle_vtable_ = fake.vtable();
@@ skipping 692 matching lines @@
     RawObject* raw_obj = *current;
     if (as_references_) {
       writer_->WriteObjectRef(raw_obj);
     } else {
       writer_->WriteObjectImpl(raw_obj);
     }
   }
 }
 
 }  // namespace dart