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

vm/flow_graph_compiler.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/globals.h"  // Needed here to get TARGET_ARCH_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
@@ skipping 400 matching lines @@
                                        try_index);
 }
 
 
 void FlowGraphCompiler::GenerateNumberTypeCheck(Register kClassIdReg,
                                                 const AbstractType& type,
                                                 Label* is_instance_lbl,
                                                 Label* is_not_instance_lbl) {
   GrowableArray<intptr_t> args;
   if (type.IsNumberInterface()) {
-    args.Add(kDouble);
-    args.Add(kMint);
-    args.Add(kBigint);
+    args.Add(kDoubleCid);
+    args.Add(kMintCid);
+    args.Add(kBigintCid);
   } else if (type.IsIntInterface()) {
-    args.Add(kMint);
-    args.Add(kBigint);
+    args.Add(kMintCid);
+    args.Add(kBigintCid);
   } else if (type.IsDoubleInterface()) {
-    args.Add(kDouble);
+    args.Add(kDoubleCid);
   }
   CheckClassIds(kClassIdReg, args, is_instance_lbl, is_not_instance_lbl);
 }
 
 
 void FlowGraphCompiler::GenerateStringTypeCheck(Register kClassIdReg,
                                                 Label* is_instance_lbl,
                                                 Label* is_not_instance_lbl) {
   GrowableArray<intptr_t> args;
-  args.Add(kOneByteString);
-  args.Add(kTwoByteString);
-  args.Add(kFourByteString);
-  args.Add(kExternalOneByteString);
-  args.Add(kExternalTwoByteString);
-  args.Add(kExternalFourByteString);
+  args.Add(kOneByteStringCid);
+  args.Add(kTwoByteStringCid);
+  args.Add(kFourByteStringCid);
+  args.Add(kExternalOneByteStringCid);
+  args.Add(kExternalTwoByteStringCid);
+  args.Add(kExternalFourByteStringCid);
   CheckClassIds(kClassIdReg, args, is_instance_lbl, is_not_instance_lbl);
 }
 
 
 void FlowGraphCompiler::GenerateListTypeCheck(Register kClassIdReg,
                                               Label* is_instance_lbl) {
   Label unknown;
   GrowableArray<intptr_t> args;
-  args.Add(kArray);
-  args.Add(kGrowableObjectArray);
-  args.Add(kImmutableArray);
+  args.Add(kArrayCid);
+  args.Add(kGrowableObjectArrayCid);
+  args.Add(kImmutableArrayCid);
   CheckClassIds(kClassIdReg, args, is_instance_lbl, &unknown);
   assembler()->Bind(&unknown);
 }
 
 
 void FlowGraphCompiler::EmitComment(Instruction* instr) {
   char buffer[256];
   BufferFormatter f(buffer, sizeof(buffer));
   instr->PrintTo(&f);
   assembler()->Comment("%s", buffer);
@@ skipping 387 matching lines @@
       return;
     }
   }
 
   // This move is not blocked.
   EmitMove(index);
 }
 
 
 }  // namespace dart