| Index: src/x64/full-codegen-x64.cc
|
| diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc
|
| index c24512ecae390cc9d0821aa06d2e110f2207ecad..b5cbf87665f8596d961202cdc6d1c4161cb95936 100644
|
| --- a/src/x64/full-codegen-x64.cc
|
| +++ b/src/x64/full-codegen-x64.cc
|
| @@ -1917,19 +1917,15 @@ void FullCodeGenerator::VisitAssignment(Assignment* expr) {
|
| __ push(rax); // 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.
|
| PrepareForBailout(expr->binary_operation(), TOS_REG);
|
| @@ -2257,7 +2253,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
|
| @@ -2272,7 +2267,7 @@ void FullCodeGenerator::EmitInlineSmiBinaryOp(BinaryOperation* expr,
|
|
|
| __ bind(&stub_call);
|
| __ movq(rax, rcx);
|
| - BinaryOpStub stub(op, mode);
|
| + BinaryOpStub stub(op);
|
| CallIC(stub.GetCode(isolate()), RelocInfo::CODE_TARGET,
|
| expr->BinaryOperationFeedbackId());
|
| patch_site.EmitPatchInfo();
|
| @@ -2318,10 +2313,9 @@ void FullCodeGenerator::EmitInlineSmiBinaryOp(BinaryOperation* expr,
|
|
|
|
|
| void FullCodeGenerator::EmitBinaryOp(BinaryOperation* expr,
|
| - Token::Value op,
|
| - OverwriteMode mode) {
|
| + Token::Value op) {
|
| __ pop(rdx);
|
| - 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());
|
| @@ -4451,7 +4445,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {
|
| // Call stub for +1/-1.
|
| __ movq(rdx, rax);
|
| __ Move(rax, Smi::FromInt(1));
|
| - BinaryOpStub stub(expr->binary_op(), NO_OVERWRITE);
|
| + BinaryOpStub stub(expr->binary_op());
|
| CallIC(stub.GetCode(isolate()),
|
| RelocInfo::CODE_TARGET,
|
| expr->CountBinOpFeedbackId());
|
|
|