Index: src/arm/code-stubs-arm.cc |
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc |
index 8d237cd93c21a96fc09168453bd0fbad6c816298..9330eb1411723a56ba45f529d2a0d99eef1c7edf 100644 |
--- a/src/arm/code-stubs-arm.cc |
+++ b/src/arm/code-stubs-arm.cc |
@@ -4674,33 +4674,11 @@ void StringAddStub::Generate(MacroAssembler* masm) { |
// Just jump to runtime to add the two strings. |
__ bind(&call_runtime); |
- if ((flags_ & STRING_ADD_ERECT_FRAME) != 0) { |
- GenerateRegisterArgsPop(masm); |
- // Build a frame |
- { |
- FrameScope scope(masm, StackFrame::INTERNAL); |
- GenerateRegisterArgsPush(masm); |
- __ CallRuntime(Runtime::kStringAdd, 2); |
- } |
- __ Ret(); |
- } else { |
- __ TailCallRuntime(Runtime::kStringAdd, 2, 1); |
- } |
+ __ TailCallRuntime(Runtime::kStringAdd, 2, 1); |
if (call_builtin.is_linked()) { |
__ bind(&call_builtin); |
- if ((flags_ & STRING_ADD_ERECT_FRAME) != 0) { |
- GenerateRegisterArgsPop(masm); |
- // Build a frame |
- { |
- FrameScope scope(masm, StackFrame::INTERNAL); |
- GenerateRegisterArgsPush(masm); |
- __ InvokeBuiltin(builtin_id, CALL_FUNCTION); |
- } |
- __ Ret(); |
- } else { |
- __ InvokeBuiltin(builtin_id, JUMP_FUNCTION); |
- } |
+ __ InvokeBuiltin(builtin_id, JUMP_FUNCTION); |
} |
} |