Index: src/arm64/lithium-codegen-arm64.cc |
diff --git a/src/arm64/lithium-codegen-arm64.cc b/src/arm64/lithium-codegen-arm64.cc |
index caa902e282db1a3de061ba5b3b8cae7f63f71d50..5b67ac2b63a4604e7072ec31b96b1220a9b98d52 100644 |
--- a/src/arm64/lithium-codegen-arm64.cc |
+++ b/src/arm64/lithium-codegen-arm64.cc |
@@ -3870,9 +3870,14 @@ void LCodeGen::DoFlooringDivByPowerOf2I(LFlooringDivByPowerOf2I* instr) { |
Register result = ToRegister32(instr->result()); |
int32_t divisor = instr->divisor(); |
+ // If the divisor is 1, return the dividend. |
+ if (divisor == 1) { |
+ __ Mov(result, dividend, kDiscardForSameWReg); |
+ return; |
+ } |
+ |
// If the divisor is positive, things are easy: There can be no deopts and we |
// can simply do an arithmetic right shift. |
- if (divisor == 1) return; |
int32_t shift = WhichPowerOf2Abs(divisor); |
if (divisor > 1) { |
__ Mov(result, Operand(dividend, ASR, shift)); |
@@ -3897,14 +3902,8 @@ void LCodeGen::DoFlooringDivByPowerOf2I(LFlooringDivByPowerOf2I* instr) { |
return; |
} |
- // Using a conditional data processing instruction would need 1 more register. |
- Label not_kmin_int, done; |
- __ B(vc, ¬_kmin_int); |
- __ Mov(result, kMinInt / divisor); |
- __ B(&done); |
- __ bind(¬_kmin_int); |
- __ Mov(result, Operand(dividend, ASR, shift)); |
- __ bind(&done); |
+ __ Asr(result, dividend, shift); |
+ __ Csel(result, result, kMinInt / divisor, vc); |
} |