commit 845c84823f3516ffa53f3ca6e679b3354c046eca
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 02 12:29:36 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 02 12:29:37 2016 +0000
tree 46a59ea3e9032b35d34e475510579699950df723
parent 6409f588d144d5c564dbb2e3658b8622f81230c6
parent bb51df8ae540347e4d2cbaa2d7def950dd11fe61

Merge "MIPS32: Fix string loads that use kDexCacheViaMethod."

compiler/optimizing/code_generator_mips.cc

diff --git a/compiler/optimizing/code_generator_mips.cc b/compiler/optimizing/code_generator_mips.cc
index f4a804f..12b1ab9 100644
--- a/compiler/optimizing/code_generator_mips.cc
+++ b/compiler/optimizing/code_generator_mips.cc
@@ -5695,7 +5695,12 @@
     default:
       break;
   }
-  locations->SetOut(Location::RequiresRegister());
+  if (load_kind == HLoadString::LoadKind::kDexCacheViaMethod) {
+    InvokeRuntimeCallingConvention calling_convention;
+    locations->SetOut(calling_convention.GetReturnLocation(load->GetType()));
+  } else {
+    locations->SetOut(Location::RequiresRegister());
+  }
 }
 
 void InstructionCodeGeneratorMIPS::VisitLoadString(HLoadString* load) {