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

vm/object_test.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 "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
@@ skipping 2601 matching lines @@
   const String& target_name = String::Handle(String::New("Thun"));
   ICData& o1 = ICData::Handle();
   o1 = ICData::New(function, target_name, id, num_args_tested);
   EXPECT_EQ(1, o1.num_args_tested());
   EXPECT_EQ(id, o1.deopt_id());
   EXPECT_EQ(function.raw(), o1.function());
   EXPECT_EQ(0, o1.NumberOfChecks());
   EXPECT_EQ(target_name.raw(), o1.target_name());
 
   const Function& target1 = Function::Handle(GetDummyTarget("Thun"));
-  o1.AddReceiverCheck(kSmi, target1);
+  o1.AddReceiverCheck(kSmiCid, target1);
   EXPECT_EQ(1, o1.NumberOfChecks());
   intptr_t test_class_id = -1;
   Function& test_target = Function::Handle();
   o1.GetOneClassCheckAt(0, &test_class_id, &test_target);
-  EXPECT_EQ(kSmi, test_class_id);
+  EXPECT_EQ(kSmiCid, test_class_id);
   EXPECT_EQ(target1.raw(), test_target.raw());
   GrowableArray<intptr_t> test_class_ids;
   o1.GetCheckAt(0, &test_class_ids, &test_target);
   EXPECT_EQ(1, test_class_ids.length());
-  EXPECT_EQ(kSmi, test_class_ids[0]);
+  EXPECT_EQ(kSmiCid, test_class_ids[0]);
   EXPECT_EQ(target1.raw(), test_target.raw());
 
   const Function& target2 = Function::Handle(GetDummyTarget("Thun"));
-  o1.AddReceiverCheck(kDouble, target2);
+  o1.AddReceiverCheck(kDoubleCid, target2);
   EXPECT_EQ(2, o1.NumberOfChecks());
   o1.GetOneClassCheckAt(1, &test_class_id, &test_target);
-  EXPECT_EQ(kDouble, test_class_id);
+  EXPECT_EQ(kDoubleCid, test_class_id);
   EXPECT_EQ(target2.raw(), test_target.raw());
 
   ICData& o2 = ICData::Handle();
   o2 = ICData::New(function, target_name, 57, 2);
   EXPECT_EQ(2, o2.num_args_tested());
   EXPECT_EQ(57, o2.deopt_id());
   EXPECT_EQ(function.raw(), o2.function());
   EXPECT_EQ(0, o2.NumberOfChecks());
   GrowableArray<intptr_t> classes;
-  classes.Add(kSmi);
-  classes.Add(kSmi);
+  classes.Add(kSmiCid);
+  classes.Add(kSmiCid);
   o2.AddCheck(classes, target1);
   EXPECT_EQ(1, o2.NumberOfChecks());
   o2.GetCheckAt(0, &test_class_ids, &test_target);
   EXPECT_EQ(2, test_class_ids.length());
-  EXPECT_EQ(kSmi, test_class_ids[0]);
-  EXPECT_EQ(kSmi, test_class_ids[1]);
+  EXPECT_EQ(kSmiCid, test_class_ids[0]);
+  EXPECT_EQ(kSmiCid, test_class_ids[1]);
   EXPECT_EQ(target1.raw(), test_target.raw());
 }
 
 
 TEST_CASE(SubtypeTestCache) {
   String& class_name = String::Handle(Symbols::New("EmptyClass"));
   Script& script = Script::Handle();
   const Class& empty_class =
       Class::Handle(Class::New(class_name, script, Scanner::kDummyTokenIndex));
   SubtypeTestCache& cache = SubtypeTestCache::Handle(SubtypeTestCache::New());
@@ skipping 197 matching lines @@
       "#6      MyClass.foo (dart:test-lib:32:14)\n"
       "#7      MyClass.MyClass.<anonymous closure> (dart:test-lib:21:15)\n"
       "#8      MyClass.MyClass (dart:test-lib:21:18)\n"
       "#9      main.<anonymous closure> (dart:test-lib:37:10)\n"
       "#10     main (dart:test-lib:37:24)");
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart