commit 334b51132a2fd1a396822a3aa80129224c94e721
author Nicolas Geoffray <ngeoffray@google.com> Thu Jan 26 11:57:51 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 26 11:57:52 2017 +0000
tree 9573f334a3efadff81343bce9c12e972084176c2
parent e25f13fa1c1c8275bbb4abfa3ccbb8300e79b82e
parent e9f36b7cb42348ef5c4eb3c88bd3cfdd56390a3e

Merge "Also blacklist 934 and 935 for no-relocate."

compiler/optimizing/code_generator_arm_vixl.cc

diff --git a/compiler/optimizing/code_generator_arm_vixl.cc b/compiler/optimizing/code_generator_arm_vixl.cc
index ffaf18f..893e465 100644
--- a/compiler/optimizing/code_generator_arm_vixl.cc
+++ b/compiler/optimizing/code_generator_arm_vixl.cc
@@ -3998,8 +3998,8 @@
       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) {