diff options
| author | 2015-12-17 23:38:59 +0000 | |
|---|---|---|
| committer | 2015-12-17 23:38:59 +0000 | |
| commit | 87e11dab8ca6b1ba0765cf39cc4041d86303b200 (patch) | |
| tree | 1be077dd22139047b96e210d49cf01c4f7185fb3 /compiler/utils/arm/assembler_arm32.h | |
| parent | 7a0495f2ac6f4d736ae722a1718e5d3e11f48753 (diff) | |
| parent | 84f8ba632953b08fd9d73c1e152cef9c9652c961 (diff) | |
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.
Diffstat (limited to 'compiler/utils/arm/assembler_arm32.h')
| -rw-r--r-- | compiler/utils/arm/assembler_arm32.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/utils/arm/assembler_arm32.h b/compiler/utils/arm/assembler_arm32.h index ce3a87275d..bf332feb62 100644 --- a/compiler/utils/arm/assembler_arm32.h +++ b/compiler/utils/arm/assembler_arm32.h @@ -297,7 +297,9 @@ class Arm32Assembler FINAL : public ArmAssembler { 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; |