Unify class ids and snapshot object ids list so that we don't have disparate and sometimes confusin…

vm/class_table.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/class_table.h"
 #include "vm/flags.h"
 #include "vm/freelist.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, print_class_table, false, "Print initial class table.");
 
 ClassTable::ClassTable()
-    : top_(kNumPredefinedKinds), capacity_(0), table_(NULL) {
+    : top_(kNumPredefinedCids), capacity_(0), table_(NULL) {
   if (Dart::vm_isolate() == NULL) {
     capacity_ = initial_capacity_;
     table_ = reinterpret_cast<RawClass**>(
         calloc(capacity_, sizeof(RawClass*)));  // NOLINT
   } else {
     // Duplicate the class table from the VM isolate.
     ClassTable* vm_class_table = Dart::vm_isolate()->class_table();
     capacity_ = vm_class_table->capacity_;
     table_ = reinterpret_cast<RawClass**>(
         calloc(capacity_, sizeof(RawClass*)));  // NOLINT
-    for (intptr_t i = kObject; i < kInstance; i++) {
+    for (intptr_t i = kObjectCid; i < kInstanceCid; i++) {
       table_[i] = vm_class_table->At(i);
     }
     table_[kFreeListElement] = vm_class_table->At(kFreeListElement);
-    table_[kNullClassId] = vm_class_table->At(kNullClassId);
-    table_[kDynamicClassId] = vm_class_table->At(kDynamicClassId);
-    table_[kVoidClassId] = vm_class_table->At(kVoidClassId);
+    table_[kNullCid] = vm_class_table->At(kNullCid);
+    table_[kDynamicCid] = vm_class_table->At(kDynamicCid);
+    table_[kVoidCid] = vm_class_table->At(kVoidCid);
   }
 }
 
 
 ClassTable::~ClassTable() {
   free(table_);
 }
 
 
 void ClassTable::Register(const Class& cls) {
   intptr_t index = cls.id();
-  if (index != kIllegalObjectKind) {
+  if (index != kIllegalCid) {
     ASSERT(index > 0);
-    ASSERT(index < kNumPredefinedKinds);
+    ASSERT(index < kNumPredefinedCids);
     ASSERT(table_[index] == 0);
     ASSERT(index < capacity_);
     table_[index] = cls.raw();
     // Add the vtable for this predefined class into the static vtable registry
     // if it has not been setup yet.
     cpp_vtable cls_vtable = cls.handle_vtable();
     cpp_vtable table_entry = Object::builtin_vtables_[index];
     ASSERT((table_entry == 0) || (table_entry == cls_vtable));
     if (table_entry == 0) {
       Object::builtin_vtables_[index] = cls_vtable;
@@ skipping 31 matching lines @@
   for (intptr_t i = 1; i < top_; i++) {
     cls = At(i);
     if (cls.raw() != reinterpret_cast<RawClass*>(0)) {
       name = cls.Name();
       OS::Print("%d: %s\n", i, name.ToCString());
     }
   }
 }
 
 }  // namespace dart