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

vm/stub_code_x64.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"
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/assembler.h"
 #include "vm/assembler_macros.h"
 #include "vm/compiler.h"
@@ skipping 679 matching lines @@
       __ cmpq(RBX, Immediate(RawObject::SizeTag::kMaxSizeTag));
       __ j(ABOVE, &size_tag_overflow, Assembler::kNearJump);
       __ shlq(RBX, Immediate(RawObject::kSizeTagBit - kObjectAlignmentLog2));
       __ jmp(&done);
 
       __ Bind(&size_tag_overflow);
       __ movq(RBX, Immediate(0));
       __ Bind(&done);
 
       // Get the class index and insert it into the tags.
-      __ orq(RBX, Immediate(RawObject::ClassIdTag::encode(kArray)));
+      __ orq(RBX, Immediate(RawObject::ClassIdTag::encode(kArrayCid)));
       __ movq(FieldAddress(RAX, Array::tags_offset()), RBX);
     }
 
     // Initialize all array elements to raw_null.
     // RAX: new object start as a tagged pointer.
     // R12: new object end address.
     __ leaq(RBX, FieldAddress(RAX, Array::data_offset()));
     // RBX: iterator which initially points to the start of the variable
     // data area to be initialized.
     Label done;
@@ skipping 512 matching lines @@
       // RDI: new object type arguments.
     }
 
     // RAX: new object start.
     // RBX: next object start.
     // RDI: new object type arguments (if is_cls_parameterized).
     __ LoadObject(RDX, cls);  // Load class of object to be allocated.
     // Set the tags.
     uword tags = 0;
     tags = RawObject::SizeTag::update(instance_size, tags);
-    ASSERT(cls.id() != kIllegalObjectKind);
+    ASSERT(cls.id() != kIllegalCid);
     tags = RawObject::ClassIdTag::update(cls.id(), tags);
     __ movq(Address(RAX, Instance::tags_offset()), Immediate(tags));
 
     // Initialize the remaining words of the object.
     const Immediate raw_null =
         Immediate(reinterpret_cast<intptr_t>(Object::null()));
 
     // RAX: new object start.
     // RBX: next object start.
     // RDX: class of the object to be allocated.
@@ skipping 369 matching lines @@
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
   Label loop, found;
   if (num_args == 1) {
     __ call(&get_class_id_as_smi);
     // RAX: receiver's class id as Smi.
     __ Bind(&loop);
     __ movq(R13, Address(R12, 0));  // Get class if (Smi) to check.
     __ cmpq(RAX, R13);  // Match?
     __ j(EQUAL, &found, Assembler::kNearJump);
     __ addq(R12, Immediate(kWordSize * 2));  // Next element (class + target).
-    __ cmpq(R13, Immediate(Smi::RawValue(kIllegalObjectKind)));  // Done?
+    __ cmpq(R13, Immediate(Smi::RawValue(kIllegalCid)));  // Done?
     __ j(NOT_EQUAL, &loop, Assembler::kNearJump);
   } else if (num_args == 2) {
     Label no_match;
     __ Bind(&loop);
     // Get receiver.
     __ movq(RAX, FieldAddress(R10, Array::data_offset()));
     __ movq(RAX, Address(RSP, RAX, TIMES_4, 0));  // RAX is Smi.
     __ call(&get_class_id_as_smi);
     __ movq(R13, Address(R12, 0));  // Get class id from IC data to check.
     __ cmpq(RAX, R13);  // Class id match?
     __ j(NOT_EQUAL, &no_match, Assembler::kNearJump);
     // Check second.
     // Get next argument.
     __ movq(RAX, FieldAddress(R10, Array::data_offset()));
     __ movq(RAX, Address(RSP, RAX, TIMES_4, -kWordSize));  // RAX is Smi.
     __ call(&get_class_id_as_smi);
     __ movq(R13, Address(R12, kWordSize));  // Get class id from IC data.
     __ cmpq(RAX, R13);  //  Class id match?
     __ j(EQUAL, &found);
     __ Bind(&no_match);
     __ addq(R12, Immediate(kWordSize * (1 + num_args)));  // Next element.
-    __ cmpq(R13, Immediate(Smi::RawValue(kIllegalObjectKind)));  // Done?
+    __ cmpq(R13, Immediate(Smi::RawValue(kIllegalCid)));  // Done?
     __ j(NOT_EQUAL, &loop, Assembler::kNearJump);
   }
 
   __ Bind(&ic_miss);
   // Compute address of arguments (first read number of arguments from argument
   // descriptor array and then compute address on the stack).
   __ movq(RAX, FieldAddress(R10, Array::data_offset()));
   __ leaq(RAX, Address(RSP, RAX, TIMES_4, 0));  // RAX is Smi.
   AssemblerMacros::EnterStubFrame(assembler);
   __ pushq(R10);  // Preserve arguments array.
@@ skipping 34 matching lines @@
   __ movq(RAX, FieldAddress(RAX, Function::code_offset()));
   __ movq(RAX, FieldAddress(RAX, Code::instructions_offset()));
   __ addq(RAX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
   __ jmp(RAX);
 
   __ Bind(&get_class_id_as_smi);
   Label not_smi;
   // Test if Smi -> load Smi class for comparison.
   __ testq(RAX, Immediate(kSmiTagMask));
   __ j(NOT_ZERO, &not_smi, Assembler::kNearJump);
-  __ movq(RAX, Immediate(Smi::RawValue(kSmi)));
+  __ movq(RAX, Immediate(Smi::RawValue(kSmiCid)));
   __ ret();
 
   __ Bind(&not_smi);
   __ LoadClassId(RAX, RAX);
   __ SmiTag(RAX);
   __ ret();
 }
 
 
 // Use inline cache data array to invoke the target or continue in inline
@@ skipping 223 matching lines @@
 void StubCode::GenerateJumpToErrorHandlerStub(Assembler* assembler) {
   __ movq(RAX, RCX);  // error object.
   __ movq(RBP, RDX);  // target frame_pointer.
   __ movq(RSP, RSI);  // target stack_pointer.
   __ jmp(RDI);  // Jump to the exception handler code.
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64