| Index: runtime/vm/intermediate_language_arm.cc
|
| diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc
|
| index 14ab139fba4a7f315d63e62f09f893afbea99771..28b7aaa4875bd8ba421c8f40920faa7cfd9d82a6 100644
|
| --- a/runtime/vm/intermediate_language_arm.cc
|
| +++ b/runtime/vm/intermediate_language_arm.cc
|
| @@ -2892,8 +2892,7 @@ static void EmitSmiShiftLeft(FlowGraphCompiler* compiler,
|
| }
|
| const intptr_t max_right = kSmiBits - Utils::HighestBit(left_int);
|
| const bool right_needs_check =
|
| - (right_range == NULL) ||
|
| - !right_range->IsWithin(0, max_right - 1);
|
| + !RangeUtils::IsWithin(right_range, 0, max_right - 1);
|
| if (right_needs_check) {
|
| __ cmp(right, Operand(reinterpret_cast<int32_t>(Smi::New(max_right))));
|
| __ b(deopt, CS);
|
| @@ -2905,7 +2904,7 @@ static void EmitSmiShiftLeft(FlowGraphCompiler* compiler,
|
| }
|
|
|
| const bool right_needs_check =
|
| - (right_range == NULL) || !right_range->IsWithin(0, (Smi::kBits - 1));
|
| + !RangeUtils::IsWithin(right_range, 0, (Smi::kBits - 1));
|
| if (is_truncating) {
|
| if (right_needs_check) {
|
| const bool right_may_be_negative =
|
| @@ -6348,8 +6347,8 @@ LocationSummary* ShiftMintOpInstr::MakeLocationSummary(Isolate* isolate,
|
| static const intptr_t kMintShiftCountLimit = 63;
|
|
|
| bool ShiftMintOpInstr::has_shift_count_check() const {
|
| - return (right()->definition()->range() == NULL)
|
| - || !right()->definition()->range()->IsWithin(0, kMintShiftCountLimit);
|
| + return !RangeUtils::IsWithin(
|
| + right()->definition()->range(), 0, kMintShiftCountLimit);
|
| }
|
|
|
|
|
|
|