| Index: src/ia32/lithium-ia32.cc
|
| diff --git a/src/ia32/lithium-ia32.cc b/src/ia32/lithium-ia32.cc
|
| index f41a18e7b1656c4d7d30c4720885e81539473e7b..e5b69c1b5ad15d66ba222d99c41065f5a02eeccf 100644
|
| --- a/src/ia32/lithium-ia32.cc
|
| +++ b/src/ia32/lithium-ia32.cc
|
| @@ -738,15 +738,13 @@ LInstruction* LChunkBuilder::DoShift(Token::Value op,
|
| right = UseFixed(right_value, ecx);
|
| }
|
|
|
| + // Shift operations can only deoptimize if we do a logical shift by 0 and
|
| + // the result cannot be truncated to int32.
|
| bool does_deopt = false;
|
| - if (FLAG_opt_safe_uint32_operations) {
|
| - does_deopt = !instr->CheckFlag(HInstruction::kUint32);
|
| - } else {
|
| - // Shift operations can only deoptimize if we do a logical shift by 0 and
|
| - // the result cannot be truncated to int32.
|
| - bool may_deopt = (op == Token::SHR && constant_value == 0 &&
|
| - !instr->CheckFlag(HInstruction::kUint32));
|
| - if (may_deopt) {
|
| + if (op == Token::SHR && constant_value == 0) {
|
| + if (FLAG_opt_safe_uint32_operations) {
|
| + does_deopt = !instr->CheckFlag(HInstruction::kUint32);
|
| + } else {
|
| for (HUseIterator it(instr->uses()); !it.Done(); it.Advance()) {
|
| if (!it.value()->CheckFlag(HValue::kTruncatingToInt32)) {
|
| does_deopt = true;
|
|
|