| Index: src/ia32/full-codegen-ia32.cc
|
| diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc
|
| index 6d39cc1e6e5045bd2f7237e835f2384d37085f1b..257fb3fd61fe50775b0cf325cc44adc2d088ef0b 100644
|
| --- a/src/ia32/full-codegen-ia32.cc
|
| +++ b/src/ia32/full-codegen-ia32.cc
|
| @@ -1895,18 +1895,14 @@ void FullCodeGenerator::VisitAssignment(Assignment* expr) {
|
| __ push(eax); // Left operand goes on the stack.
|
| VisitForAccumulatorValue(expr->value());
|
|
|
| - OverwriteMode mode = expr->value()->ResultOverwriteAllowed()
|
| - ? OVERWRITE_RIGHT
|
| - : NO_OVERWRITE;
|
| SetSourcePosition(expr->position() + 1);
|
| if (ShouldInlineSmiCase(op)) {
|
| EmitInlineSmiBinaryOp(expr->binary_operation(),
|
| op,
|
| - mode,
|
| expr->target(),
|
| expr->value());
|
| } else {
|
| - EmitBinaryOp(expr->binary_operation(), op, mode);
|
| + EmitBinaryOp(expr->binary_operation(), op);
|
| }
|
|
|
| // Deoptimization point in case the binary operation may have side effects.
|
| @@ -2233,7 +2229,6 @@ void FullCodeGenerator::EmitKeyedPropertyLoad(Property* prop) {
|
|
|
| void FullCodeGenerator::EmitInlineSmiBinaryOp(BinaryOperation* expr,
|
| Token::Value op,
|
| - OverwriteMode mode,
|
| Expression* left,
|
| Expression* right) {
|
| // Do combined smi check of the operands. Left operand is on the
|
| @@ -2247,7 +2242,7 @@ void FullCodeGenerator::EmitInlineSmiBinaryOp(BinaryOperation* expr,
|
|
|
| __ bind(&stub_call);
|
| __ mov(eax, ecx);
|
| - BinaryOpStub stub(op, mode);
|
| + BinaryOpStub stub(op);
|
| CallIC(stub.GetCode(isolate()), RelocInfo::CODE_TARGET,
|
| expr->BinaryOperationFeedbackId());
|
| patch_site.EmitPatchInfo();
|
| @@ -2329,10 +2324,9 @@ void FullCodeGenerator::EmitInlineSmiBinaryOp(BinaryOperation* expr,
|
|
|
|
|
| void FullCodeGenerator::EmitBinaryOp(BinaryOperation* expr,
|
| - Token::Value op,
|
| - OverwriteMode mode) {
|
| + Token::Value op) {
|
| __ pop(edx);
|
| - BinaryOpStub stub(op, mode);
|
| + BinaryOpStub stub(op);
|
| JumpPatchSite patch_site(masm_); // unbound, signals no inlined smi code.
|
| CallIC(stub.GetCode(isolate()), RelocInfo::CODE_TARGET,
|
| expr->BinaryOperationFeedbackId());
|
| @@ -4467,7 +4461,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {
|
| // Call stub for +1/-1.
|
| __ mov(edx, eax);
|
| __ mov(eax, Immediate(Smi::FromInt(1)));
|
| - BinaryOpStub stub(expr->binary_op(), NO_OVERWRITE);
|
| + BinaryOpStub stub(expr->binary_op());
|
| CallIC(stub.GetCode(isolate()),
|
| RelocInfo::CODE_TARGET,
|
| expr->CountBinOpFeedbackId());
|
|
|