- Rename class index to class id.

runtime/vm/assembler_ia32.cc

 // 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.
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/assembler.h"
 #include "vm/heap.h"
 #include "vm/memory_region.h"
@@ skipping 1559 matching lines @@
 
   movl(result, FieldAddress(CTX, Context::isolate_offset()));
   const intptr_t table_offset_in_isolate =
       Isolate::class_table_offset() + ClassTable::table_offset();
   movl(result, Address(result, table_offset_in_isolate));
   movl(result, Address(result, scratch, TIMES_4, 0));
 }
 
 
 void Assembler::LoadClassIndexOfObject(Register result, Register object) {
-  ASSERT(RawObject::kClassTagBit == 16);
-  ASSERT(RawObject::kClassTagSize == 16);
+  ASSERT(RawObject::kClassIdTagBit == 16);
+  ASSERT(RawObject::kClassIdTagSize == 16);
   const intptr_t class_id_offset = Object::tags_offset() +
-      RawObject::kClassTagBit / kBitsPerByte;
+      RawObject::kClassIdTagBit / kBitsPerByte;
   movzxw(result, FieldAddress(object, class_id_offset));
 }
 
 
 void Assembler::CompareClassOfObject(Register object,
                                      const Class& clazz,
                                      Register scratch) {
   LoadClassIndexOfObject(scratch, object);
-  cmpl(scratch, Immediate(clazz.index()));
+  cmpl(scratch, Immediate(clazz.id()));
 }
 
 
 void Assembler::Comment(const char* format, ...) {
   if (FLAG_code_comments) {
     char buffer[1024];
 
     va_list args;
     va_start(args, format);
     OS::VSNPrint(buffer, sizeof(buffer), format, args);
@@ skipping 13 matching lines @@
     comments.SetCommentAt(i, comments_[i]->comment());
   }
 
   return comments;
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32