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

vm/assembler_macros_x64.cc

 // Copyright (c) 2011, 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_macros.h"
 
 #include "vm/assembler.h"
@@ skipping 21 matching lines @@
     __ cmpq(instance_reg, Address(TMP, 0));
     __ j(ABOVE_EQUAL, failure, Assembler::kNearJump);
     // Successfully allocated the object, now update top to point to
     // next object start and store the class in the class field of object.
     __ movq(TMP, Immediate(heap->TopAddress()));
     __ movq(Address(TMP, 0), instance_reg);
     ASSERT(instance_size >= kHeapObjectTag);
     __ subq(instance_reg, Immediate(instance_size - kHeapObjectTag));
     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(FieldAddress(instance_reg, Object::tags_offset()), Immediate(tags));
   } else {
     __ jmp(failure);
   }
 }
 
 
 void AssemblerMacros::EnterDartFrame(Assembler* assembler,
                                      intptr_t frame_size) {
@@ skipping 30 matching lines @@
 void AssemblerMacros::EnterStubFrame(Assembler* assembler) {
   __ EnterFrame(0);
   __ pushq(Immediate(0));  // Push 0 in the saved PC area for stub frames.
 }
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64