diff options
| author | 2016-03-23 17:10:31 +0000 | |
|---|---|---|
| committer | 2016-03-23 17:10:31 +0000 | |
| commit | 541261e66273857c638677424215de91f3d65a6f (patch) | |
| tree | 8e2dd00e442612e22ba1473a49597a2ae2735e81 /compiler/optimizing/instruction_simplifier.cc | |
| parent | f8a3dea642fe638f54d181b7ca280b79ee519398 (diff) | |
| parent | 5b5b9319ff970979ed47d41a41283e4faeffb602 (diff) | |
Merge "Fix and improve shift and rotate operations."
Diffstat (limited to 'compiler/optimizing/instruction_simplifier.cc')
| -rw-r--r-- | compiler/optimizing/instruction_simplifier.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc index 820c696033..5b263b3191 100644 --- a/compiler/optimizing/instruction_simplifier.cc +++ b/compiler/optimizing/instruction_simplifier.cc @@ -240,8 +240,9 @@ void InstructionSimplifierVisitor::VisitShift(HBinaryOperation* instruction) { if (input_cst != nullptr) { int64_t cst = Int64FromConstant(input_cst); - int64_t mask = - (input_other->GetType() == Primitive::kPrimLong) ? kMaxLongShiftValue : kMaxIntShiftValue; + int64_t mask = (input_other->GetType() == Primitive::kPrimLong) + ? kMaxLongShiftDistance + : kMaxIntShiftDistance; if ((cst & mask) == 0) { // Replace code looking like // SHL dst, src, 0 |