Merge "ARM64: Instruction simplification for array accesses."

diff --cc compiler/optimizing/code_generator_arm64.cc
Simple merge

diff --cc compiler/optimizing/nodes.h
index 7cf6339,490bfc8..05552e5
--- 1/compiler/optimizing/nodes.h
--- 2/compiler/optimizing/nodes.h
+++ b/compiler/optimizing/nodes.h
@@@ -1079,12 -1079,18 +1079,20 @@@ class HLoopInformationOutwardIterator 
  
  #define FOR_EACH_CONCRETE_INSTRUCTION_ARM(M)
  
+ #ifndef ART_ENABLE_CODEGEN_arm64
  #define FOR_EACH_CONCRETE_INSTRUCTION_ARM64(M)
+ #else
+ #define FOR_EACH_CONCRETE_INSTRUCTION_ARM64(M)                          \
+   M(Arm64IntermediateAddress, Instruction)
+ #endif
  
 +#define FOR_EACH_CONCRETE_INSTRUCTION_MIPS(M)
 +
  #define FOR_EACH_CONCRETE_INSTRUCTION_MIPS64(M)
  
+ #ifndef ART_ENABLE_CODEGEN_x86
+ #define FOR_EACH_CONCRETE_INSTRUCTION_X86(M)
+ #else
  #define FOR_EACH_CONCRETE_INSTRUCTION_X86(M)                            \
    M(X86ComputeBaseMethodAddress, Instruction)                           \
    M(X86LoadFromConstantTable, Instruction)                              \