Merge "Optimizing/ARM: Fix AddConstant() to adhere to set_cc." am: 0ac7a8e505

am: 84f8ba6329

* commit '84f8ba632953b08fd9d73c1e152cef9c9652c961':
  Optimizing/ARM: Fix AddConstant() to adhere to set_cc.

1 files changed, 8 insertions, 0 deletions

diff --git a/compiler/utils/arm/assembler_arm.h b/compiler/utils/arm/assembler_arm.h
index 98a1a8f9a1..b79c2f0f4e 100644
--- a/compiler/utils/arm/assembler_arm.h
+++ b/compiler/utils/arm/assembler_arm.h
@@ -878,7 +878,15 @@ class ArmAssembler : public Assembler {
                                      Register rn,
                                      Opcode opcode,
                                      uint32_t immediate,
+                                     SetCc set_cc,
                                      ShifterOperand* shifter_op) = 0;
+  bool ShifterOperandCanHold(Register rd,
+                             Register rn,
+                             Opcode opcode,
+                             uint32_t immediate,
+                             ShifterOperand* shifter_op) {
+    return ShifterOperandCanHold(rd, rn, opcode, immediate, kCcDontCare, shifter_op);
+  }
 
   virtual bool ShifterOperandCanAlwaysHold(uint32_t immediate) = 0;