- Rename class index to class id.

runtime/vm/opt_code_generator_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"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/opt_code_generator.h"
 
 #include "vm/assembler_macros.h"
@@ skipping 1408 matching lines @@
     __ j(ZERO, deopt_blob->label());
   }
 
   __ LoadClassIndexOfObject(EAX, EBX);
   const ICData& ic_data = node->ic_data();
   Function& target = Function::Handle();
   Label load_field;
   for (intptr_t i = 0; i < ic_data.NumberOfChecks(); i++) {
     Class& cls = Class::Handle();
     ic_data.GetOneClassCheckAt(i, &cls, &target);
-    __ cmpl(EAX, Immediate(cls.index()));
+    __ cmpl(EAX, Immediate(cls.id()));
     if (i == (ic_data.NumberOfChecks() - 1)) {
       __ j(NOT_EQUAL, deopt_blob->label());
     } else {
       __ j(EQUAL, &load_field);
     }
   }
   Class& cls = Class::Handle();
   ic_data.GetOneClassCheckAt(0, &cls, &target);
 
   __ Bind(&load_field);
@@ skipping 191 matching lines @@
   }
   __ LoadClassIndexOfObject(EBX, recv_reg);
   // Initialize setter arguments, but leave the class and target fields NULL.
   InstanceSetterArgs setter_args =
       {NULL, NULL, &field_name, recv_reg, value_reg,
       node->id(), node->token_index()};
 
   if (unique_target) {
     Label store_field;
     for (intptr_t i = 0; i < classes.length(); i++) {
-      __ cmpl(EBX, Immediate(classes[i]->index()));
+      __ cmpl(EBX, Immediate(classes[i]->id()));
       if (i == (classes.length() - 1)) {
         __ j(NOT_EQUAL, deopt_blob->label());
       } else {
         __ j(EQUAL, &store_field);
       }
     }
     __ Bind(&store_field);
     setter_args.cls = classes[0];
     setter_args.target = targets[0];
     GenerateInstanceSetter(setter_args);
     return;
   }
   // Targets are different.
   Label done;
   for (intptr_t i = 0; i < classes.length(); i++) {
     setter_args.cls = classes[i];
     setter_args.target = targets[i];
-    __ cmpl(EBX, Immediate(classes[i]->index()));
+    __ cmpl(EBX, Immediate(classes[i]->id()));
     if (i == (classes.length() - 1)) {
       __ j(NOT_EQUAL, deopt_blob->label());
       GenerateInstanceSetter(setter_args);
     } else {
       Label next_check;
       __ j(NOT_EQUAL, &next_check);
       GenerateInstanceSetter(setter_args);
       __ jmp(&done);
       __ Bind(&next_check);
     }
@@ skipping 318 matching lines @@
   } else {
     DeoptimizationBlob* deopt_blob =
         AddDeoptimizationBlob(node, EAX, EDX, kDeoptEqualityClassCheck);
     __ j(EQUAL, &compare);
     // Smi causes deoptimization.
     __ testl(EAX, Immediate(kSmiTagMask));
     __ j(ZERO, deopt_blob->label());
     __ LoadClassIndexOfObject(EBX, EAX);
     for (intptr_t i = 0; i < num_classes; i++) {
       const Class& cls = *(*classes)[i];
-      __ cmpl(EBX, Immediate(cls.index()));
+      __ cmpl(EBX, Immediate(cls.id()));
       if (i == (num_classes - 1)) {
         __ j(NOT_EQUAL, deopt_blob->label());
       } else {
         __ j(EQUAL, &compare);
       }
     }
   }
   __ Bind(&compare);
   __ cmpl(EAX, EDX);
   if (NodeInfoHasLabels(node)) {
@@ skipping 633 matching lines @@
         AddDeoptimizationBlob(node, kDeoptCheckedInstanceCallSmiFail);
     __ testl(EAX, Immediate(kSmiTagMask));
     __ j(ZERO, deopt_blob->label());
   } else {
     // Receiver cannot be Smi, no need to test it.
   }
   __ LoadClassIndexOfObject(EAX, EAX);  // Receiver's class.
   for (intptr_t i = start_ix; i < classes.length(); i++) {
     const Class& cls = *classes[i];
     const Function& target = *targets[i];
-    __ cmpl(EAX, Immediate(cls.index()));
+    __ cmpl(EAX, Immediate(cls.id()));
     if (i == (classes.length() - 1)) {
       // Last check.
       DeoptimizationBlob* deopt_blob =
           AddDeoptimizationBlob(node, kDeoptCheckedInstanceCallCheckFail);
       __ j(NOT_EQUAL, deopt_blob->label());
       GenerateDirectCall(node->id(),
                          token_index,
                          target,
                          num_args,
                          optional_arguments_names);
@@ skipping 236 matching lines @@
     }
   }
   // TODO(srdjan): Implement unary kSUB (negate) Mint.
   CodeGenerator::VisitUnaryOpNode(node);
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32