- Rename class index to class id.

runtime/vm/intrinsifier_ia32.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.
 //
 // The intrinsic code below is executed before a method has built its frame.
 // The return address is on the stack and the arguments below it.
 // Registers EDX (arguments descriptor) and ECX (function) must be preserved.
 // Each intrinsification method returns true if the corresponding
 // Dart method was intrinsified.
 
@@ skipping 67 matching lines @@
     __ j(ABOVE, &size_tag_overflow, Assembler::kNearJump);
     __ shll(EDI, Immediate(RawObject::kSizeTagBit - kObjectAlignmentLog2));
     __ jmp(&done, Assembler::kNearJump);
 
     __ Bind(&size_tag_overflow);
     __ movl(EDI, Immediate(0));
     __ Bind(&done);
 
     // Get the class index and insert it into the tags.
     const Class& cls = Class::Handle(isolate->object_store()->array_class());
-    __ orl(EDI, Immediate(RawObject::ClassTag::encode(cls.index())));
+    __ orl(EDI, Immediate(RawObject::ClassIdTag::encode(cls.id())));
     __ movl(FieldAddress(EAX, Array::tags_offset()), EDI);  // Tags.
   }
 
   // Store class value for array.
   // EAX: new object start as a tagged pointer.
   // EBX: new object end address.
   __ movl(EDI, FieldAddress(CTX, Context::isolate_offset()));
   __ movl(EDI, Address(EDI, Isolate::object_store_offset()));
   __ movl(EDI, Address(EDI, ObjectStore::array_class_offset()));
   __ StoreIntoObject(EAX, FieldAddress(EAX, Array::class_offset()), EDI);
@@ skipping 189 matching lines @@
   // next object start and initialize the object.
   __ movl(Address::Absolute(heap->TopAddress()), EBX);
   __ addl(EAX, Immediate(kHeapObjectTag));
 
   // Initialize the tags.
   // EAX: new growable array object start as a tagged pointer.
   const Class& cls = Class::Handle(
       isolate->object_store()->growable_object_array_class());
   uword tags = 0;
   tags = RawObject::SizeTag::update(fixed_size, tags);
-  tags = RawObject::ClassTag::update(cls.index(), tags);
+  tags = RawObject::ClassIdTag::update(cls.id(), tags);
   __ movl(FieldAddress(EAX, GrowableObjectArray::tags_offset()),
           Immediate(tags));
 
   // Store backing array object in growable array object.
   __ movl(EBX, Address(ESP, kArrayOffset));  // data argument.
   __ StoreIntoObject(EAX,
                      FieldAddress(EAX, GrowableObjectArray::data_offset()),
                      EBX);
 
   // Store class value for the growable array object.
@@ skipping 982 matching lines @@
   __ Bind(&is_true);
   __ LoadObject(EAX, bool_true);
   __ ret();
   return true;
 }
 
 #undef __
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32