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

runtime/vm/intrinsifier_arm.cc

Index: runtime/vm/intrinsifier_arm.cc
===================================================================
--- runtime/vm/intrinsifier_arm.cc	(revision 36576)
+++ runtime/vm/intrinsifier_arm.cc	(working copy)
@@ -1249,13 +1249,10 @@
     __ 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_0 = Instance::DataOffsetFor(kTypedDataUint32ArrayCid);
+    const int64_t disp_1 = disp_0 +
+        Instance::ElementSizeFor(kTypedDataUint32ArrayCid);
 
-    const int64_t disp_1 =
-        FlowGraphCompiler::ElementSizeFor(kTypedDataUint32ArrayCid) +
-        FlowGraphCompiler::DataOffsetFor(kTypedDataUint32ArrayCid);
-
     __ LoadImmediate(R0, a_int32_value);
     __ LoadFromOffset(kWord, R2, R1, disp_0 - kHeapObjectTag);
     __ LoadFromOffset(kWord, R3, R1, disp_1 - kHeapObjectTag);