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

runtime/vm/intermediate_language_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/intermediate_language.h"
 
 #include "vm/dart_entry.h"
@@ skipping 992 matching lines @@
   const Register array = locs()->in(0).reg();
   ASSERT(locs()->in(1).IsRegister());  // TODO(regis): Revisit.
   const Register index = locs()->in(1).reg();
 
   Address element_address(kNoRegister, 0);
 
   // The array register points to the backing store for external arrays.
   intptr_t offset = 0;
   if (!IsExternal()) {
     ASSERT(this->array()->definition()->representation() == kTagged);
-    offset = FlowGraphCompiler::DataOffsetFor(class_id()) - kHeapObjectTag;
+    offset = Instance::DataOffsetFor(class_id()) - kHeapObjectTag;
   }
 
   // Note that index is expected smi-tagged, (i.e, times 2) for all arrays
   // with index scale factor > 1. E.g., for Uint8Array and OneByteString the
   // index is expected to be untagged before accessing.
   ASSERT(kSmiTagShift == 1);
   switch (index_scale()) {
     case 1:
       __ add(index, array, Operand(index, ASR, kSmiTagSize));
       element_address = Address(index, offset);
@@ skipping 173 matching lines @@
   const Register array = locs()->in(0).reg();
   ASSERT(locs()->in(1).IsRegister());  // TODO(regis): Revisit.
   const Register index = locs()->in(1).reg();
 
   Address element_address(kNoRegister, 0);
 
   // The array register points to the backing store for external arrays.
   intptr_t offset = 0;
   if (!IsExternal()) {
     ASSERT(this->array()->definition()->representation() == kTagged);
-    offset = FlowGraphCompiler::DataOffsetFor(class_id()) - kHeapObjectTag;
+    offset = Instance::DataOffsetFor(class_id()) - kHeapObjectTag;
   }
 
   // Note that index is expected smi-tagged, (i.e, times 2) for all arrays
   // with index scale factor > 1. E.g., for Uint8Array and OneByteString the
   // index is expected to be untagged before accessing.
   ASSERT(kSmiTagShift == 1);
   switch (index_scale()) {
     case 1: {
       __ add(index, array, Operand(index, ASR, kSmiTagSize));
       element_address = Address(index, offset);
@@ skipping 3709 matching lines @@
   compiler->GenerateCall(token_pos(),
                          &label,
                          PcDescriptors::kOther,
                          locs());
   __ Drop(ArgumentCount());  // Discard arguments.
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM64