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

runtime/vm/intrinsifier_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"  // Needed here to get TARGET_ARCH_ARM64.
 #if defined(TARGET_ARCH_ARM64)
 
 #include "vm/intrinsifier.h"
 
 #include "vm/assembler.h"
@@ skipping 1116 matching lines @@
   ASSERT(!random_A_field.IsNull());
   ASSERT(random_A_field.is_const());
   const Instance& a_value = Instance::Handle(random_A_field.value());
   const int64_t a_int_value = Integer::Cast(a_value).AsInt64Value();
 
   __ ldr(R0, Address(SP, 0 * kWordSize));  // Receiver.
   __ ldr(R1, FieldAddress(R0, state_field.Offset()));  // Field '_state'.
 
   // Addresses of _state[0].
   const int64_t disp =
-      FlowGraphCompiler::DataOffsetFor(kTypedDataUint32ArrayCid) -
-      kHeapObjectTag;
+      Instance::DataOffsetFor(kTypedDataUint32ArrayCid) - kHeapObjectTag;
 
   __ LoadImmediate(R0, a_int_value, kNoPP);
   __ LoadFromOffset(R2, R1, disp, kNoPP);
   __ Lsr(R3, R2, 32);
   __ andi(R2, R2, 0xffffffff);
   __ mul(R2, R0, R2);
   __ add(R2, R2, Operand(R3));
   __ StoreToOffset(R2, R1, disp, kNoPP);
   __ ret();
 }
@@ skipping 403 matching lines @@
   Isolate* isolate = Isolate::Current();
   __ LoadImmediate(R1, reinterpret_cast<uword>(isolate), kNoPP);
   // Set return value to Isolate::current_tag_.
   __ ldr(R0, Address(R1, Isolate::current_tag_offset()));
   __ ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM64