Index: src/mips/full-codegen-mips.cc |
diff --git a/src/mips/full-codegen-mips.cc b/src/mips/full-codegen-mips.cc |
index b217e06db4abd6a3aabe6605b32d0d7601a179f1..6947ca8781e48f9632952e4e5bef742b6178cdf8 100644 |
--- a/src/mips/full-codegen-mips.cc |
+++ b/src/mips/full-codegen-mips.cc |
@@ -1644,6 +1644,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(); |
__ lw(a3, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset)); |
__ lw(a3, FieldMemOperand(a3, JSFunction::kLiteralsOffset)); |
@@ -1658,7 +1661,7 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
__ li(a0, Operand(Smi::FromInt(flags))); |
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) { |
__ Push(a3, a2, a1, a0); |
@@ -1777,6 +1780,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(); |
@@ -1803,8 +1808,7 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
__ CallStub(&stub); |
__ IncrementCounter(isolate()->counters()->cow_arrays_created_stub(), |
1, a1, a2); |
- } else if (expr->depth() > 1 || |
- Serializer::enabled() || |
+ } else if (depth > 1 || Serializer::enabled() || |
length > FastCloneShallowArrayStub::kMaximumClonedLength) { |
__ Push(a3, a2, a1); |
__ CallRuntime(Runtime::kCreateArrayLiteral, 3); |