Last cross-platform cleanup in preparation of improved ARM code for indexed

runtime/vm/intrinsifier_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"  // Needed here to get TARGET_ARCH_ARM.
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/intrinsifier.h"
 
 #include "vm/assembler.h"
@@ skipping 1231 matching lines @@
     const Instance& a_value = Instance::Handle(random_A_field.value());
     const int64_t a_int_value = Integer::Cast(a_value).AsInt64Value();
     // 'a_int_value' is a mask.
     ASSERT(Utils::IsUint(32, a_int_value));
     int32_t a_int32_value = static_cast<int32_t>(a_int_value);
 
     __ ldr(R0, Address(SP, 0 * kWordSize));  // Receiver.
     __ ldr(R1, FieldAddress(R0, state_field.Offset()));  // Field '_state'.
     // Addresses of _state[0] and _state[1].
 
-    const int64_t disp_0 =
-        FlowGraphCompiler::DataOffsetFor(kTypedDataUint32ArrayCid);
-
-    const int64_t disp_1 =
-        FlowGraphCompiler::ElementSizeFor(kTypedDataUint32ArrayCid) +
-        FlowGraphCompiler::DataOffsetFor(kTypedDataUint32ArrayCid);
+    const int64_t disp_0 = Instance::DataOffsetFor(kTypedDataUint32ArrayCid);
+    const int64_t disp_1 = disp_0 +
+        Instance::ElementSizeFor(kTypedDataUint32ArrayCid);
 
     __ LoadImmediate(R0, a_int32_value);
     __ LoadFromOffset(kWord, R2, R1, disp_0 - kHeapObjectTag);
     __ LoadFromOffset(kWord, R3, R1, disp_1 - kHeapObjectTag);
     __ mov(R6, ShifterOperand(0));  // Zero extend unsigned _state[kSTATE_HI].
     // Unsigned 32-bit multiply and 64-bit accumulate into R6:R3.
     __ umlal(R3, R6, R0, R2);  // R6:R3 <- R6:R3 + R0 * R2.
     __ StoreToOffset(kWord, R3, R1, disp_0 - kHeapObjectTag);
     __ StoreToOffset(kWord, R6, R1, disp_1 - kHeapObjectTag);
     __ Ret();
@@ skipping 396 matching lines @@
   Isolate* isolate = Isolate::Current();
   __ LoadImmediate(R1, reinterpret_cast<uword>(isolate));
   // Set return value to Isolate::current_tag_.
   __ ldr(R0, Address(R1, Isolate::current_tag_offset()));
   __ Ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM