commit f5c09c3ed5bca4c34d8476dd9ed2714106fafbcf
author Vladimir Marko <vmarko@google.com> Thu Dec 17 12:08:08 2015 +0000
committer Vladimir Marko <vmarko@google.com> Thu Dec 17 15:13:39 2015 +0000
tree 6521df348c2fd8d692bb751ed8dffdf70c8f6051
parent 7f3b38cc23b638ab84ac01a94e90f0456da3b688

Optimizing/ARM: Fix AddConstant() to adhere to set_cc.

And improve it to use shorter code sequences.

Bug: 26121945

Change-Id: Ia4f1688652c195a7ca19af36d919388a550e2841

compiler/utils/arm/assembler_thumb2.h

diff --git a/compiler/utils/arm/assembler_thumb2.h b/compiler/utils/arm/assembler_thumb2.h
index 9aeece8..bf07b2d 100644
--- a/compiler/utils/arm/assembler_thumb2.h
+++ b/compiler/utils/arm/assembler_thumb2.h
@@ -342,7 +342,9 @@
                              Register rn,
                              Opcode opcode,
                              uint32_t immediate,
+                             SetCc set_cc,
                              ShifterOperand* shifter_op) OVERRIDE;
+  using ArmAssembler::ShifterOperandCanHold;  // Don't hide the non-virtual override.
 
   bool ShifterOperandCanAlwaysHold(uint32_t immediate) OVERRIDE;