Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index 8049b689eacf5e4ca579e42fa61d130eaccb8dff..348b8ce20df764279b84963c12d6bc99b3aea259 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -4562,10 +4562,18 @@ void LCodeGen::DoTrapAllocationMemento(LTrapAllocationMemento* instr) { |
void LCodeGen::DoStringAdd(LStringAdd* instr) { |
ASSERT(ToRegister(instr->context()).is(cp)); |
- __ push(ToRegister(instr->left())); |
- __ push(ToRegister(instr->right())); |
- StringAddStub stub(instr->hydrogen()->flags()); |
- CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr); |
+ if (FLAG_new_string_add) { |
+ ASSERT(ToRegister(instr->left()).is(r1)); |
+ ASSERT(ToRegister(instr->right()).is(r0)); |
+ NewStringAddStub stub(instr->hydrogen()->flags(), |
+ isolate()->heap()->GetPretenureMode()); |
+ CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr); |
+ } else { |
+ __ push(ToRegister(instr->left())); |
+ __ push(ToRegister(instr->right())); |
+ StringAddStub stub(instr->hydrogen()->flags()); |
+ CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr); |
+ } |
} |