Index: src/mips/full-codegen-mips.cc |
diff --git a/src/mips/full-codegen-mips.cc b/src/mips/full-codegen-mips.cc |
index 03f2774f48c359ab16ca4583c1e55706d36ffaba..5f44e539d4c2ca10014c5e3fa664fcb6d7da60bd 100644 |
--- a/src/mips/full-codegen-mips.cc |
+++ b/src/mips/full-codegen-mips.cc |
@@ -1587,7 +1587,7 @@ void FullCodeGenerator::EmitAccessor(Expression* expression) { |
void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
Comment cmnt(masm_, "[ ObjectLiteral"); |
Handle<FixedArray> constant_properties = expr->constant_properties(); |
- __ lw(a3, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset)); |
+ __ lw(a3, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset)); |
__ lw(a3, FieldMemOperand(a3, JSFunction::kLiteralsOffset)); |
__ li(a2, Operand(Smi::FromInt(expr->literal_index()))); |
__ li(a1, Operand(constant_properties)); |
@@ -1598,12 +1598,13 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
? ObjectLiteral::kHasFunction |
: ObjectLiteral::kNoFlags; |
__ li(a0, Operand(Smi::FromInt(flags))); |
- __ Push(a3, a2, a1, a0); |
int properties_count = constant_properties->length() / 2; |
if (expr->depth() > 1) { |
+ __ Push(a3, a2, a1, a0); |
__ CallRuntime(Runtime::kCreateObjectLiteral, 4); |
- } else if (flags != ObjectLiteral::kFastElements || |
+ } else if (Serializer::enabled() || flags != ObjectLiteral::kFastElements || |
properties_count > FastCloneShallowObjectStub::kMaximumClonedProperties) { |
+ __ Push(a3, a2, a1, a0); |
__ CallRuntime(Runtime::kCreateObjectLiteralShallow, 4); |
} else { |
FastCloneShallowObjectStub stub(properties_count); |