Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index 89df802bdb1a908439ead5bcbfcc482e156b3d6b..afdf48059cd5088f0a425a000b3eca7b978d2205 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -4551,6 +4551,10 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) { |
if (operand_value->IsRegister()) { |
Register value = ToRegister(operand_value); |
__ Store(value, operand, representation); |
+ } else if (representation.IsInteger32()) { |
+ Immediate immediate = ToImmediate(operand_value, representation); |
+ ASSERT(!instr->hydrogen()->NeedsWriteBarrier()); |
+ __ mov(operand, immediate); |
} else { |
Handle<Object> handle_value = ToHandle(operand_value); |
ASSERT(!instr->hydrogen()->NeedsWriteBarrier()); |
@@ -4997,10 +5001,18 @@ void LCodeGen::DoDeferredStringCharFromCode(LStringCharFromCode* instr) { |
void LCodeGen::DoStringAdd(LStringAdd* instr) { |
ASSERT(ToRegister(instr->context()).is(esi)); |
- EmitPushTaggedOperand(instr->left()); |
- EmitPushTaggedOperand(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(edx)); |
+ ASSERT(ToRegister(instr->right()).is(eax)); |
+ 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); |
+ } |
} |