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

runtime/vm/flow_graph_compiler.h

 // Copyright (c) 2012, 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.
 
 #ifndef VM_FLOW_GRAPH_COMPILER_H_
 #define VM_FLOW_GRAPH_COMPILER_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_descriptors.h"
@@ skipping 432 matching lines @@
       return CatchClauseNode::kInvalidTryIndex;
     }
     return current_block_->try_index();
   }
 
   bool may_reoptimize() const { return may_reoptimize_; }
 
   // Array/list element address computations.
   static intptr_t DataOffsetFor(intptr_t cid);
   static intptr_t ElementSizeFor(intptr_t cid);
-  Address ElementAddressForIntIndex(intptr_t cid,
+  Address ElementAddressForIntIndex(bool is_load,
+                                    bool is_external,
+                                    intptr_t cid,
                                     intptr_t index_scale,
                                     Register array,
                                     intptr_t offset);
-  Address ElementAddressForRegIndex(intptr_t cid,
+  Address ElementAddressForRegIndex(bool is_load,
+                                    bool is_external,
+                                    intptr_t cid,
                                     intptr_t index_scale,
                                     Register array,
                                     Register index);
-  Address ExternalElementAddressForIntIndex(intptr_t index_scale,
-                                            Register array,
-                                            intptr_t offset);
-  Address ExternalElementAddressForRegIndex(intptr_t index_scale,
-                                            Register array,
-                                            Register index);
 
   // Returns 'sorted' array in decreasing count order.
   static void SortICDataByCount(const ICData& ic_data,
                                 GrowableArray<CidTarget>* sorted);
 
  private:
   friend class CheckStackOverflowSlowPath;  // For pending_deoptimization_env_.
 
   void EmitFrameEntry();
 
@@ skipping 131 matching lines @@
   // that should be used when deoptimizing we store it in this variable.
   // In future AddDeoptStub should be moved out of the instruction template.
   Environment* pending_deoptimization_env_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_COMPILER_H_