Index: src/x64/full-codegen-x64.cc |
diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc |
index ecc92c762443fdfc7ed1259e31c7a0b0ad2a8527..8121cb2c8d3a748467b8bd4d5f12e03c63aca3f4 100644 |
--- a/src/x64/full-codegen-x64.cc |
+++ b/src/x64/full-codegen-x64.cc |
@@ -1552,24 +1552,34 @@ void FullCodeGenerator::EmitAccessor(Expression* expression) { |
void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
Comment cmnt(masm_, "[ ObjectLiteral"); |
Handle<FixedArray> constant_properties = expr->constant_properties(); |
- __ movq(rdi, Operand(rbp, JavaScriptFrameConstants::kFunctionOffset)); |
- __ push(FieldOperand(rdi, JSFunction::kLiteralsOffset)); |
- __ Push(Smi::FromInt(expr->literal_index())); |
- __ Push(constant_properties); |
int flags = expr->fast_elements() |
? ObjectLiteral::kFastElements |
: ObjectLiteral::kNoFlags; |
flags |= expr->has_function() |
? ObjectLiteral::kHasFunction |
: ObjectLiteral::kNoFlags; |
- __ Push(Smi::FromInt(flags)); |
int properties_count = constant_properties->length() / 2; |
if (expr->depth() > 1) { |
+ __ movq(rdi, Operand(rbp, JavaScriptFrameConstants::kFunctionOffset)); |
+ __ push(FieldOperand(rdi, JSFunction::kLiteralsOffset)); |
+ __ Push(Smi::FromInt(expr->literal_index())); |
+ __ Push(constant_properties); |
+ __ Push(Smi::FromInt(flags)); |
__ CallRuntime(Runtime::kCreateObjectLiteral, 4); |
- } else if (flags != ObjectLiteral::kFastElements || |
+ } else if (Serializer::enabled() || flags != ObjectLiteral::kFastElements || |
properties_count > FastCloneShallowObjectStub::kMaximumClonedProperties) { |
+ __ movq(rdi, Operand(rbp, JavaScriptFrameConstants::kFunctionOffset)); |
+ __ push(FieldOperand(rdi, JSFunction::kLiteralsOffset)); |
+ __ Push(Smi::FromInt(expr->literal_index())); |
+ __ Push(constant_properties); |
+ __ Push(Smi::FromInt(flags)); |
__ CallRuntime(Runtime::kCreateObjectLiteralShallow, 4); |
} else { |
+ __ movq(rdi, Operand(rbp, JavaScriptFrameConstants::kFunctionOffset)); |
+ __ movq(rax, FieldOperand(rdi, JSFunction::kLiteralsOffset)); |
+ __ Move(rbx, Smi::FromInt(expr->literal_index())); |
+ __ Move(rcx, constant_properties); |
+ __ Move(rdx, Smi::FromInt(flags)); |
FastCloneShallowObjectStub stub(properties_count); |
__ CallStub(&stub); |
} |