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

vm/flow_graph_compiler_ia32.cc

Index: vm/flow_graph_compiler_ia32.cc
===================================================================
--- vm/flow_graph_compiler_ia32.cc	(revision 10409)
+++ vm/flow_graph_compiler_ia32.cc	(working copy)
@@ -283,7 +283,7 @@
   // Bool interface can be implemented only by core class Bool.
   // (see ClassFinalizer::ResolveInterfaces for list of restricted interfaces).
   if (type.IsBoolInterface()) {
-    __ cmpl(kClassIdReg, Immediate(kBool));
+    __ cmpl(kClassIdReg, Immediate(kBoolCid));
     __ j(EQUAL, is_instance_lbl);
     __ jmp(is_not_instance_lbl);
     return false;
@@ -370,7 +370,7 @@
     // Can handle only type arguments that are instances of TypeArguments.
     // (runtime checks canonicalize type arguments).
     Label fall_through;
-    __ CompareClassId(EDX, kTypeArguments, EDI);
+    __ CompareClassId(EDX, kTypeArgumentsCid, EDI);
     __ j(NOT_EQUAL, &fall_through, Assembler::kNearJump);
     __ movl(EDI,
         FieldAddress(EDX, TypeArguments::type_at_offset(type_param.index())));
@@ -907,7 +907,7 @@
   __ movl(EAX, Address(ESP, 0));
   __ testl(EAX, Immediate(kSmiTagMask));
   __ j(ZERO, &smi_to_double);
-  __ CompareClassId(EAX, kDouble, EBX);
+  __ CompareClassId(EAX, kDoubleCid, EBX);
   __ j(NOT_EQUAL, &call_method);
   __ movsd(XMM1, FieldAddress(EAX, Double::value_offset()));
   __ Bind(&double_op);
@@ -1083,7 +1083,7 @@
                                              Register temp_reg,
                                              Label* deopt) {
   Label ok;
-  ASSERT(ic_data.GetReceiverClassIdAt(0) != kSmi);
+  ASSERT(ic_data.GetReceiverClassIdAt(0) != kSmiCid);
   __ testl(instance_reg, Immediate(kSmiTagMask));
   __ j(ZERO, deopt);
   Label is_ok;
@@ -1113,7 +1113,7 @@
   Label is_smi, done;
   __ testl(reg, Immediate(kSmiTagMask));
   __ j(ZERO, &is_smi);
-  __ CompareClassId(reg, kDouble, temp);
+  __ CompareClassId(reg, kDoubleCid, temp);
   __ j(NOT_EQUAL, not_double_or_smi);
   __ movsd(result, FieldAddress(reg, Double::value_offset()));
   __ jmp(&done);