- Add a class index to the classes.

vm/object_store.h

 // Copyright (c) 2011, 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_OBJECT_STORE_H_
 #define VM_OBJECT_STORE_H_
 
 #include "vm/object.h"
 
 namespace dart {
@@ skipping 43 matching lines @@
     kInternalByteArrayClass,
     kExternalByteArrayClass,
     kStacktraceClass,
     kJSRegExpClass,
     kMaxId,
     kInvalidIndex = -1,
   };
 
   ~ObjectStore();
 
-  RawClass* object_class() const { return object_class_; }
+  RawClass* object_class() const {
+    ASSERT(object_class_ != Object::null());
+    return object_class_;
+  }
   void set_object_class(const Class& value) { object_class_ = value.raw(); }
   static intptr_t object_class_offset() {
     return OFFSET_OF(ObjectStore, object_class_);
   }
 
   RawType* object_type() const { return object_type_; }
   void set_object_type(const Type& value) {
     object_type_ = value.raw();
   }
 
@@ skipping 336 matching lines @@
   RawObject** to() { return reinterpret_cast<RawObject**>(&keyword_symbols_); }
 
   friend class SnapshotReader;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectStore);
 };
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_STORE_H_