Enums cleanup.

runtime/vm/stub_code_arm.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_ARM)
 
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
@@ skipping 656 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);
     // If no size tag overflow, shift R1 left, else set R1 to zero.
     __ mov(R1, ShifterOperand(R3, LSL, shift), LS);
     __ mov(R1, ShifterOperand(0), HI);
 
     // Get the class index and insert it into the tags.
     __ LoadImmediate(IP, RawObject::ClassIdTag::encode(kArrayCid));
     __ orr(R1, R1, ShifterOperand(IP));
     __ str(R1, FieldAddress(R0, Array::tags_offset()));
 
@@ skipping 212 matching lines @@
     // R2: object size.
     // R3: next object start.
     __ str(R3, Address(R5, 0));
     __ add(R0, R0, ShifterOperand(kHeapObjectTag));
     __ UpdateAllocationStatsWithSize(context_class.id(), R2, R5);
 
     // 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);
     // If no size tag overflow, shift R2 left, else set R2 to zero.
     __ mov(R2, ShifterOperand(R2, LSL, shift), LS);
     __ mov(R2, ShifterOperand(0), HI);
 
     // Get the class index and insert it into the tags.
     // R2: size and bit tags.
     __ LoadImmediate(IP, RawObject::ClassIdTag::encode(context_class.id()));
     __ orr(R2, R2, ShifterOperand(IP));
     __ str(R2, FieldAddress(R0, Context::tags_offset()));
@@ skipping 931 matching lines @@
   const Register right = R0;
   __ ldr(left, Address(SP, 1 * kWordSize));
   __ ldr(right, Address(SP, 0 * kWordSize));
   GenerateIdenticalWithNumberCheckStub(assembler, left, right, temp);
   __ Ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM