Index: src/x64/full-codegen-x64.cc |
diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc |
index 4a99287d3eed533e2586350eb4a980e7a18d2ce0..8857d166ce40085e241ce5a37310ebe9e71584a2 100644 |
--- a/src/x64/full-codegen-x64.cc |
+++ b/src/x64/full-codegen-x64.cc |
@@ -1597,6 +1597,9 @@ void FullCodeGenerator::EmitAccessor(Expression* expression) { |
void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
Comment cmnt(masm_, "[ ObjectLiteral"); |
+ |
+ int depth = 1; |
+ expr->BuildConstantProperties(isolate(), &depth); |
Handle<FixedArray> constant_properties = expr->constant_properties(); |
int flags = expr->fast_elements() |
? ObjectLiteral::kFastElements |
@@ -1606,7 +1609,7 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
: ObjectLiteral::kNoFlags; |
int properties_count = constant_properties->length() / 2; |
if ((FLAG_track_double_fields && expr->may_store_doubles()) || |
- expr->depth() > 1 || Serializer::enabled() || |
+ depth > 1 || Serializer::enabled() || |
flags != ObjectLiteral::kFastElements || |
properties_count > FastCloneShallowObjectStub::kMaximumClonedProperties) { |
__ movq(rdi, Operand(rbp, JavaScriptFrameConstants::kFunctionOffset)); |
@@ -1725,6 +1728,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
Comment cmnt(masm_, "[ ArrayLiteral"); |
+ int depth = 1; |
+ expr->BuildConstantElements(isolate(), &depth); |
ZoneList<Expression*>* subexprs = expr->values(); |
int length = subexprs->length(); |
Handle<FixedArray> constant_elements = expr->constant_elements(); |
@@ -1751,8 +1756,7 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
DONT_TRACK_ALLOCATION_SITE, |
length); |
__ CallStub(&stub); |
- } else if (expr->depth() > 1 || |
- Serializer::enabled() || |
+ } else if (depth > 1 || Serializer::enabled() || |
length > FastCloneShallowArrayStub::kMaximumClonedLength) { |
__ movq(rbx, Operand(rbp, JavaScriptFrameConstants::kFunctionOffset)); |
__ push(FieldOperand(rbx, JSFunction::kLiteralsOffset)); |