| Index: src/arm/full-codegen-arm.cc
|
| diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc
|
| index b6fb70b5df0f5c86a621f6711c5f8a24e7f7be8d..cfd6fd6e9c1842301dbc9175d3ffaac51c260f8c 100644
|
| --- a/src/arm/full-codegen-arm.cc
|
| +++ b/src/arm/full-codegen-arm.cc
|
| @@ -1934,19 +1934,15 @@ void FullCodeGenerator::VisitAssignment(Assignment* expr) {
|
| __ push(r0); // Left operand goes on the stack.
|
| VisitForAccumulatorValue(expr->value());
|
|
|
| - OverwriteMode mode = expr->value()->ResultOverwriteAllowed()
|
| - ? OVERWRITE_RIGHT
|
| - : NO_OVERWRITE;
|
| SetSourcePosition(expr->position() + 1);
|
| AccumulatorValueContext context(this);
|
| 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.
|
| @@ -2273,7 +2269,6 @@ void FullCodeGenerator::EmitKeyedPropertyLoad(Property* prop) {
|
|
|
| void FullCodeGenerator::EmitInlineSmiBinaryOp(BinaryOperation* expr,
|
| Token::Value op,
|
| - OverwriteMode mode,
|
| Expression* left_expr,
|
| Expression* right_expr) {
|
| Label done, smi_case, stub_call;
|
| @@ -2293,7 +2288,7 @@ void FullCodeGenerator::EmitInlineSmiBinaryOp(BinaryOperation* expr,
|
| patch_site.EmitJumpIfSmi(scratch1, &smi_case);
|
|
|
| __ bind(&stub_call);
|
| - BinaryOpStub stub(op, mode);
|
| + BinaryOpStub stub(op);
|
| CallIC(stub.GetCode(isolate()), RelocInfo::CODE_TARGET,
|
| expr->BinaryOperationFeedbackId());
|
| patch_site.EmitPatchInfo();
|
| @@ -2368,10 +2363,9 @@ void FullCodeGenerator::EmitInlineSmiBinaryOp(BinaryOperation* expr,
|
|
|
|
|
| void FullCodeGenerator::EmitBinaryOp(BinaryOperation* expr,
|
| - Token::Value op,
|
| - OverwriteMode mode) {
|
| + Token::Value op) {
|
| __ pop(r1);
|
| - 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());
|
| @@ -4461,7 +4455,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {
|
| // Record position before stub call.
|
| SetSourcePosition(expr->position());
|
|
|
| - BinaryOpStub stub(Token::ADD, NO_OVERWRITE);
|
| + BinaryOpStub stub(Token::ADD);
|
| CallIC(stub.GetCode(isolate()),
|
| RelocInfo::CODE_TARGET,
|
| expr->CountBinOpFeedbackId());
|
|
|