Index: src/ia32/full-codegen-ia32.cc |
diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc |
index 4422e4eeec68192539da7af069c5733b69ba3360..0f6c851b0488c239c8d92862c214194ec5a96470 100644 |
--- a/src/ia32/full-codegen-ia32.cc |
+++ b/src/ia32/full-codegen-ia32.cc |
@@ -3636,21 +3636,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(edx); |
- 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(edx); |
+ StringAddStub stub(STRING_ADD_CHECK_BOTH, NOT_TENURED); |
+ __ CallStub(&stub); |
context()->Plug(eax); |
} |