Index: src/arm/full-codegen-arm.cc |
diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc |
index 224e0c79961c975beb4a0ce071387e06a0c972b6..32d7e60896c01af3d16bc6e05dc17dc72febad0e 100644 |
--- a/src/arm/full-codegen-arm.cc |
+++ b/src/arm/full-codegen-arm.cc |
@@ -3674,21 +3674,12 @@ void FullCodeGenerator::EmitStringCharAt(CallRuntime* expr) { |
void FullCodeGenerator::EmitStringAdd(CallRuntime* expr) { |
ZoneList<Expression*>* args = expr->arguments(); |
ASSERT_EQ(2, args->length()); |
+ VisitForStackValue(args->at(0)); |
+ VisitForAccumulatorValue(args->at(1)); |
- if (FLAG_new_string_add) { |
- VisitForStackValue(args->at(0)); |
- VisitForAccumulatorValue(args->at(1)); |
- |
- __ pop(r1); |
- NewStringAddStub stub(STRING_ADD_CHECK_BOTH, NOT_TENURED); |
- __ CallStub(&stub); |
- } else { |
- VisitForStackValue(args->at(0)); |
- VisitForStackValue(args->at(1)); |
- |
- StringAddStub stub(STRING_ADD_CHECK_BOTH); |
- __ CallStub(&stub); |
- } |
+ __ pop(r1); |
+ StringAddStub stub(STRING_ADD_CHECK_BOTH, NOT_TENURED); |
+ __ CallStub(&stub); |
context()->Plug(r0); |
} |