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

vm/intrinsifier_x64.cc

Index: vm/intrinsifier_x64.cc
===================================================================
--- vm/intrinsifier_x64.cc	(revision 10409)
+++ vm/intrinsifier_x64.cc	(working copy)
@@ -787,14 +787,14 @@
   // Note that an instance of Mint or Bigint never contains a value that can be
   // represented by Smi.
   __ movq(RAX, Address(RSP, + 1 * kWordSize));
-  __ CompareClassId(RAX, kDouble);
+  __ CompareClassId(RAX, kDoubleCid);
   __ j(EQUAL, &fall_through);
   __ LoadObject(RAX, bool_false);
   __ ret();
 
   __ Bind(&receiver_not_smi);
   // RAX:: receiver.
-  __ CompareClassId(RAX, kMint);
+  __ CompareClassId(RAX, kMintCid);
   __ j(NOT_EQUAL, &fall_through);
   // Receiver is Mint, return false if right is Smi.
   __ movq(RAX, Address(RSP, + 1 * kWordSize));  // Right argument.
@@ -859,7 +859,7 @@
   __ movq(RAX, Address(RSP, + 1 * kWordSize));
   __ testq(RAX, Immediate(kSmiTagMask));
   __ j(ZERO, is_smi, Assembler::kNearJump);  // Jump if Smi.
-  __ CompareClassId(RAX, kDouble);
+  __ CompareClassId(RAX, kDoubleCid);
   __ j(NOT_EQUAL, not_double_smi, Assembler::kNearJump);
   // Fall through if double.
 }
@@ -1281,7 +1281,7 @@
   __ cmpq(RCX, FieldAddress(RAX, String::length_offset()));
   // Runtime throws exception.
   __ j(ABOVE_EQUAL, &fall_through, Assembler::kNearJump);
-  __ CompareClassId(RAX, kOneByteString);
+  __ CompareClassId(RAX, kOneByteStringCid);
   __ j(NOT_EQUAL, &fall_through);
   __ SmiUntag(RCX);
   __ movzxb(RAX, FieldAddress(RAX, RCX, TIMES_1, OneByteString::data_offset()));