diff options
| author | 2017-01-26 11:56:12 +0000 | |
|---|---|---|
| committer | 2017-01-26 11:56:13 +0000 | |
| commit | e25f13fa1c1c8275bbb4abfa3ccbb8300e79b82e (patch) | |
| tree | 437d20423b68185f99065c6da29740dd913a3abb | |
| parent | 1ddaa2573e8ea7c69dd2015d6cfbd2021989c816 (diff) | |
| parent | 8c7c4f16aed712907da55ce8bb59e7c8e23be37d (diff) | |
Merge "Update vixl/arm32 backend after new allocation entrypoint change."
| -rw-r--r-- | compiler/optimizing/code_generator_arm_vixl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/code_generator_arm_vixl.cc b/compiler/optimizing/code_generator_arm_vixl.cc index ffaf18fb4d..893e465392 100644 --- a/compiler/optimizing/code_generator_arm_vixl.cc +++ b/compiler/optimizing/code_generator_arm_vixl.cc @@ -3998,8 +3998,8 @@ void LocationsBuilderARMVIXL::VisitNewArray(HNewArray* instruction) { new (GetGraph()->GetArena()) LocationSummary(instruction, LocationSummary::kCallOnMainOnly); InvokeRuntimeCallingConventionARMVIXL calling_convention; locations->SetOut(LocationFrom(r0)); - locations->SetInAt(0, LocationFrom(calling_convention.GetRegisterAt(1))); - locations->SetInAt(1, LocationFrom(calling_convention.GetRegisterAt(2))); + locations->SetInAt(0, LocationFrom(calling_convention.GetRegisterAt(0))); + locations->SetInAt(1, LocationFrom(calling_convention.GetRegisterAt(1))); } void InstructionCodeGeneratorARMVIXL::VisitNewArray(HNewArray* instruction) { |