| Index: src/x64/lithium-codegen-x64.cc
|
| diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc
|
| index 178e9d1a74bf853a2876b551a41a6b9aa4810bba..30f6e05257695d59825d9a2e5f578ec9eb4b5f7e 100644
|
| --- a/src/x64/lithium-codegen-x64.cc
|
| +++ b/src/x64/lithium-codegen-x64.cc
|
| @@ -4388,18 +4388,11 @@ void LCodeGen::DoTrapAllocationMemento(LTrapAllocationMemento* instr) {
|
|
|
| void LCodeGen::DoStringAdd(LStringAdd* instr) {
|
| ASSERT(ToRegister(instr->context()).is(rsi));
|
| - if (FLAG_new_string_add) {
|
| - ASSERT(ToRegister(instr->left()).is(rdx));
|
| - ASSERT(ToRegister(instr->right()).is(rax));
|
| - NewStringAddStub stub(instr->hydrogen()->flags(),
|
| - isolate()->heap()->GetPretenureMode());
|
| - CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr);
|
| - } else {
|
| - EmitPushTaggedOperand(instr->left());
|
| - EmitPushTaggedOperand(instr->right());
|
| - StringAddStub stub(instr->hydrogen()->flags());
|
| - CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr);
|
| - }
|
| + ASSERT(ToRegister(instr->left()).is(rdx));
|
| + ASSERT(ToRegister(instr->right()).is(rax));
|
| + StringAddStub stub(instr->hydrogen()->flags(),
|
| + isolate()->heap()->GetPretenureMode());
|
| + CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr);
|
| }
|
|
|
|
|
|
|