Enums cleanup.

runtime/vm/stub_code_x64.cc

 // Copyright (c) 2013, 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/compiler.h"
 #include "vm/dart_entry.h"
@@ skipping 617 matching lines @@
     // RAX: new object start as a tagged pointer.
     // R12: new object end address.
     // R10: Array length as Smi.
     {
       Label size_tag_overflow, done;
       __ leaq(RBX, Address(R10, TIMES_4, fixed_size));  // R10 is Smi.
       ASSERT(kSmiTagShift == 1);
       __ andq(RBX, Immediate(-kObjectAlignment));
       __ cmpq(RBX, Immediate(RawObject::SizeTag::kMaxSizeTag));
       __ j(ABOVE, &size_tag_overflow, Assembler::kNearJump);
-      __ shlq(RBX, Immediate(RawObject::kSizeTagBit - kObjectAlignmentLog2));
+      __ shlq(RBX, Immediate(RawObject::kSizeTagPos - 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(kArrayCid)));
       __ movq(FieldAddress(RAX, Array::tags_offset()), RBX);
     }
@@ skipping 240 matching lines @@
 
     // Calculate the size tag.
     // RAX: new object.
     // R10: number of context variables.
     {
       Label size_tag_overflow, done;
       __ leaq(R13, Address(R10, TIMES_8, fixed_size));
       __ andq(R13, Immediate(-kObjectAlignment));
       __ cmpq(R13, Immediate(RawObject::SizeTag::kMaxSizeTag));
       __ j(ABOVE, &size_tag_overflow, Assembler::kNearJump);
-      __ shlq(R13, Immediate(RawObject::kSizeTagBit - kObjectAlignmentLog2));
+      __ shlq(R13, Immediate(RawObject::kSizeTagPos - kObjectAlignmentLog2));
       __ jmp(&done);
 
       __ Bind(&size_tag_overflow);
       // Set overflow size tag value.
       __ movq(R13, Immediate(0));
 
       __ Bind(&done);
       // RAX: new object.
       // R10: number of context variables.
       // R13: size and bit tags.
@@ skipping 935 matching lines @@
 
   __ movq(left, Address(RSP, 2 * kWordSize));
   __ movq(right, Address(RSP, 1 * kWordSize));
   GenerateIdenticalWithNumberCheckStub(assembler, left, right);
   __ ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64