Enums cleanup.

runtime/vm/stub_code_arm64.cc

 // Copyright (c) 2014, 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_ARM64)
 
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
@@ skipping 442 matching lines @@
     __ StoreIntoObjectNoBarrier(
         R0,
         FieldAddress(R0, Array::length_offset()),
         R2);
 
     // Calculate the size tag.
     // R0: new object start as a tagged pointer.
     // R2: array length as Smi.
     // R3: array size.
     // R7: new object end address.
-    const intptr_t shift = RawObject::kSizeTagBit - kObjectAlignmentLog2;
+    const intptr_t shift = RawObject::kSizeTagPos - kObjectAlignmentLog2;
     __ CompareImmediate(R3, RawObject::SizeTag::kMaxSizeTag, kNoPP);
     // If no size tag overflow, shift R1 left, else set R1 to zero.
     __ Lsl(TMP, R3, shift);
     __ csel(R1, TMP, R1, LS);
     __ csel(R1, ZR, R1, HI);
 
     // Get the class index and insert it into the tags.
     __ LoadImmediate(TMP, RawObject::ClassIdTag::encode(kArrayCid), kNoPP);
     __ orr(R1, R1, Operand(TMP));
     __ StoreFieldToOffset(R1, R0, Array::tags_offset());
@@ skipping 241 matching lines @@
     // R2: object size.
     // R3: next object start.
     __ str(R3, Address(R5));
     __ add(R0, R0, Operand(kHeapObjectTag));
     __ UpdateAllocationStatsWithSize(context_class.id(), R2, R5, kNoPP);
 
     // Calculate the size tag.
     // R0: new object.
     // R1: number of context variables.
     // R2: object size.
-    const intptr_t shift = RawObject::kSizeTagBit - kObjectAlignmentLog2;
+    const intptr_t shift = RawObject::kSizeTagPos - kObjectAlignmentLog2;
     __ CompareImmediate(R2, RawObject::SizeTag::kMaxSizeTag, kNoPP);
     // If no size tag overflow, shift R2 left, else set R2 to zero.
     __ Lsl(TMP, R2, shift);
     __ csel(R2, TMP, R2, LS);
     __ csel(R2, ZR, R2, HI);
 
     // Get the class index and insert it into the tags.
     // R2: size and bit tags.
     __ LoadImmediate(
         TMP, RawObject::ClassIdTag::encode(context_class.id()), kNoPP);
@@ skipping 768 matching lines @@
 
 
 void StubCode::GenerateOptimizedIdenticalWithNumberCheckStub(
     Assembler* assembler) {
   __ Stop("GenerateOptimizedIdenticalWithNumberCheckStub");
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM64