commit 37035d6b368c786812ffb5944ccea512783cfa5c
author Vladimir Marko <vmarko@google.com> Mon Dec 09 13:42:32 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 09 13:42:33 2013 +0000
tree bb0c9fa350a7563ddd1b8ebbae92b3812633c45c
parent f4d4ce50947a059a979fc184139ad97def386146
parent 73e08b37512a2d38cdbaf9a3869dbd7554e6e1b1

Merge "Fix Mir2Lir::AllocFreeTemp() to return -1 on failure."

compiler/dex/quick/mips/utility_mips.cc

diff --git a/compiler/dex/quick/mips/utility_mips.cc b/compiler/dex/quick/mips/utility_mips.cc
index 2ba2c84..65c82c0 100644
--- a/compiler/dex/quick/mips/utility_mips.cc
+++ b/compiler/dex/quick/mips/utility_mips.cc
@@ -504,13 +504,13 @@
     }
   } else {
     if (pair) {
-      int r_tmp = AllocFreeTemp();
+      int r_tmp = AllocTemp();
       res = OpRegRegImm(kOpAdd, r_tmp, rBase, displacement);
       load = NewLIR3(opcode, r_dest, LOWORD_OFFSET, r_tmp);
       load2 = NewLIR3(opcode, r_dest_hi, HIWORD_OFFSET, r_tmp);
       FreeTemp(r_tmp);
     } else {
-      int r_tmp = (rBase == r_dest) ? AllocFreeTemp() : r_dest;
+      int r_tmp = (rBase == r_dest) ? AllocTemp() : r_dest;
       res = OpRegRegImm(kOpAdd, r_tmp, rBase, displacement);
       load = NewLIR3(opcode, r_dest, 0, r_tmp);
       if (r_tmp != r_dest)

compiler/dex/quick/ralloc_util.cc

diff --git a/compiler/dex/quick/ralloc_util.cc b/compiler/dex/quick/ralloc_util.cc
index 41a57af..cef013e 100644
--- a/compiler/dex/quick/ralloc_util.cc
+++ b/compiler/dex/quick/ralloc_util.cc
@@ -338,7 +338,7 @@
 int Mir2Lir::AllocFreeTemp() {
   return AllocTempBody(reg_pool_->core_regs,
              reg_pool_->num_core_regs,
-             &reg_pool_->next_core_reg, true);
+             &reg_pool_->next_core_reg, false);
 }
 
 int Mir2Lir::AllocTemp() {