diff options
author | 2016-03-10 14:23:35 +0000 | |
---|---|---|
committer | 2016-03-10 14:23:35 +0000 | |
commit | 9e86c579ea45a209c8fe1cbfbc354e9065990b45 (patch) | |
tree | 84e8b1de707e96845a81d94bd50e97d0cbb2f546 | |
parent | cc7b14da8da5fee74e0577edb72c6eee8cabd466 (diff) | |
parent | 31f477eb7f28c9e4647df3c18f7e4271436640be (diff) |
Merge "MIPS32: Fix test 082-inline-execute"
-rw-r--r-- | compiler/optimizing/intrinsics_mips.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/optimizing/intrinsics_mips.cc b/compiler/optimizing/intrinsics_mips.cc index e159701a46..ed0b5b7548 100644 --- a/compiler/optimizing/intrinsics_mips.cc +++ b/compiler/optimizing/intrinsics_mips.cc @@ -1464,7 +1464,9 @@ void IntrinsicLocationsBuilderMIPS::VisitStringCharAt(HInvoke* invoke) { kIntrinsified); locations->SetInAt(0, Location::RequiresRegister()); locations->SetInAt(1, Location::RequiresRegister()); - locations->SetOut(Location::SameAsFirstInput()); + // The inputs will be considered live at the last instruction and restored. This will overwrite + // the output with kNoOutputOverlap. + locations->SetOut(Location::RequiresRegister(), Location::kOutputOverlap); } void IntrinsicCodeGeneratorMIPS::VisitStringCharAt(HInvoke* invoke) { |