Use kInstanceCid instead of object_store()->object_class() when checking to see if the class is obj…

vm/object.cc

Index: vm/object.cc
===================================================================
--- vm/object.cc	(revision 11121)
+++ vm/object.cc	(working copy)
@@ -1854,7 +1854,6 @@
   ASSERT(!subclass.IsNull());
   ASSERT(subclass.SuperClass() == raw());
   // Do not keep track of the direct subclasses of class Object.
-  // TODO(regis): Replace assert below with ASSERT(id() != kDartObjectCid).
   ASSERT(!IsObjectClass());
   GrowableObjectArray& direct_subclasses =
       GrowableObjectArray::Handle(raw_ptr()->direct_subclasses_);
@@ -1900,7 +1899,7 @@
 
 
 bool Class::IsObjectClass() const {
-  return raw() == Type::Handle(Type::ObjectType()).type_class();
+  return id() == kInstanceCid;
 }
 
 
@@ -10094,10 +10093,9 @@
       // Update the leftover space as a basic object.
       ASSERT(leftover_size == Object::InstanceSize());
       RawObject* raw = reinterpret_cast<RawObject*>(RawObject::FromAddr(addr));
-      const Class& cls = Class::Handle(isolate->object_store()->object_class());
       tags = 0;
       tags = RawObject::SizeTag::update(leftover_size, tags);
-      tags = RawObject::ClassIdTag::update(cls.id(), tags);
+      tags = RawObject::ClassIdTag::update(kInstanceCid, tags);
       raw->ptr()->tags_ = tags;
     }
   }