- Add a class index to the classes.

vm/raw_object.h

Index: vm/raw_object.h
===================================================================
--- vm/raw_object.h	(revision 5947)
+++ vm/raw_object.h	(working copy)
@@ -85,6 +85,7 @@
 
 
 enum ObjectKind {
+  kIllegalObjectKind = 0,
 #define DEFINE_OBJECT_KIND(clazz)                                              \
   k##clazz,
 CLASS_LIST(DEFINE_OBJECT_KIND)
@@ -92,7 +93,14 @@
   // The following entry does not describe a real object, but instead it
   // identifies free list elements in the heap.
   kFreeListElement,
-  kNumOfObjectKinds = kFreeListElement
+  // The following entries do not describe a real object, but instead are used
+  // to allocate class indexes for pre-allocated instance classes such as the
+  // Null, Void, Dynamic and other similar classes.
+  kNullClassIndex,
+  kSentinelClassIndex,
+  kDynamicClassIndex,
+  kVoidClassIndex,
+  kNumPredefinedKinds = 100
 };
 
 enum ObjectAlignment {
@@ -159,6 +167,8 @@
     kReservedBit10M = 7,
     kSizeTagBit = 8,
     kSizeTagSize = 8,
+    kClassTagBit = kSizeTagBit + kSizeTagSize,
+    kClassTagSize = 16
   };
 
   // Encodes the object size in the tag in units of object alignment.
@@ -192,6 +202,8 @@
     }
   };
 
+  class ClassTag : public BitField<intptr_t, kClassTagBit, kClassTagSize> {};
+
   bool IsHeapObject() const {
     uword value = reinterpret_cast<uword>(this);
     return (value & kSmiTagMask) == kHeapObjectTag;
@@ -337,6 +349,7 @@
   cpp_vtable handle_vtable_;
   intptr_t instance_size_;
   ObjectKind instance_kind_;
+  intptr_t index_;  // Index in the class table.
   intptr_t type_arguments_instance_field_offset_;  // May be kNoTypeArguments.
   intptr_t next_field_offset_;  // Offset of then next instance field.
   intptr_t num_native_fields_;  // Number of native fields in class.