Merge "ARM: VIXL32: Pass initial ART tests with new code generator."

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

diff --cc compiler/optimizing/code_generator_arm_vixl.cc
index b522e48,b1a941d..32287a0
--- 1/compiler/optimizing/code_generator_arm_vixl.cc
--- 2/compiler/optimizing/code_generator_arm_vixl.cc
+++ b/compiler/optimizing/code_generator_arm_vixl.cc
@@@ -232,13 -522,22 +519,8 @@@ void CodeGeneratorARMVIXL::SetupBlocked
        blocked_fpu_registers_[i] = true;
      }
    }
 -
 -  UpdateBlockedPairRegisters();
 -}
 -
 -// Blocks all register pairs containing blocked core registers.
 -void CodeGeneratorARMVIXL::UpdateBlockedPairRegisters() const {
 -  for (int i = 0; i < kNumberOfRegisterPairs; i++) {
 -    ArmManagedRegister current =
 -        ArmManagedRegister::FromRegisterPair(static_cast<RegisterPair>(i));
 -    if (blocked_core_registers_[current.AsRegisterPairLow()]
 -        || blocked_core_registers_[current.AsRegisterPairHigh()]) {
 -      blocked_register_pairs_[i] = true;
 -    }
 -  }
  }
  
- void InstructionCodeGeneratorARMVIXL::GenerateSuspendCheck(HSuspendCheck* instruction,
-                                                            HBasicBlock* successor) {
-   TODO_VIXL32(FATAL);
- }
- 
  InstructionCodeGeneratorARMVIXL::InstructionCodeGeneratorARMVIXL(HGraph* graph,
                                                                   CodeGeneratorARMVIXL* codegen)
        : InstructionCodeGenerator(graph, codegen),

diff --cc compiler/optimizing/code_generator_arm_vixl.h
Simple merge

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

diff --cc test/Android.run-test.mk
Simple merge