summaryrefslogtreecommitdiff
path: root/compiler/optimizing/instruction_simplifier_shared.h
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2017-11-02 12:36:58 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-11-02 12:36:58 +0000
commitaf52bcb7532e25331d6528c05105423312e161fd (patch)
tree4709dfe2f99871909a16ad7ac2bc6c9e068aec95 /compiler/optimizing/instruction_simplifier_shared.h
parent9d3e8fa581d2848edbf2e071ad0baad4edc2f8a3 (diff)
parent33bff25bcd7a02d35c54f63740eadb1a4833fc92 (diff)
Merge "ART: Make InstructionSet an enum class and add kLast."
Diffstat (limited to 'compiler/optimizing/instruction_simplifier_shared.h')
-rw-r--r--compiler/optimizing/instruction_simplifier_shared.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/optimizing/instruction_simplifier_shared.h b/compiler/optimizing/instruction_simplifier_shared.h
index b016a8769e..758fc7663d 100644
--- a/compiler/optimizing/instruction_simplifier_shared.h
+++ b/compiler/optimizing/instruction_simplifier_shared.h
@@ -41,7 +41,8 @@ inline bool CanFitInShifterOperand(HInstruction* instruction) {
inline bool HasShifterOperand(HInstruction* instr, InstructionSet isa) {
// On ARM64 `neg` instructions are an alias of `sub` using the zero register
// as the first register input.
- bool res = instr->IsAdd() || instr->IsAnd() || (isa == kArm64 && instr->IsNeg()) ||
+ bool res = instr->IsAdd() || instr->IsAnd() ||
+ (isa == InstructionSet::kArm64 && instr->IsNeg()) ||
instr->IsOr() || instr->IsSub() || instr->IsXor();
return res;
}