Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index 1d9e9421b1c831805af498222cdf071f8344d0a0..1bde182cff7659373d5989a382ec90a3f5cfda7b 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -1906,24 +1906,16 @@ void LCodeGen::DoThrow(LThrow* instr) { |
void LCodeGen::DoAddI(LAddI* instr) { |
LOperand* left = instr->left(); |
LOperand* right = instr->right(); |
+ ASSERT(left->Equals(instr->result())); |
- if (LAddI::UseLea(instr->hydrogen()) && !left->Equals(instr->result())) { |
- if (right->IsConstantOperand()) { |
- int32_t offset = ToInteger32(LConstantOperand::cast(right)); |
- __ lea(ToRegister(instr->result()), MemOperand(ToRegister(left), offset)); |
- } else { |
- Operand address(ToRegister(left), ToRegister(right), times_1, 0); |
- __ lea(ToRegister(instr->result()), address); |
- } |
+ if (right->IsConstantOperand()) { |
+ __ add(ToOperand(left), ToInteger32Immediate(right)); |
} else { |
- if (right->IsConstantOperand()) { |
- __ add(ToOperand(left), ToInteger32Immediate(right)); |
- } else { |
- __ add(ToRegister(left), ToOperand(right)); |
- } |
- if (instr->hydrogen()->CheckFlag(HValue::kCanOverflow)) { |
- DeoptimizeIf(overflow, instr->environment()); |
- } |
+ __ add(ToRegister(left), ToOperand(right)); |
+ } |
+ |
+ if (instr->hydrogen()->CheckFlag(HValue::kCanOverflow)) { |
+ DeoptimizeIf(overflow, instr->environment()); |
} |
} |