Index: src/ia32/full-codegen-ia32.cc |
diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc |
index 1ba409571534ee945cf8a3d16e972c61c5bcb1c4..45627eae1f934404527505f9705042283622f820 100644 |
--- a/src/ia32/full-codegen-ia32.cc |
+++ b/src/ia32/full-codegen-ia32.cc |
@@ -1617,11 +1617,13 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
expr->CalculateEmitStore(zone()); |
AccessorTable accessor_table(zone()); |
- for (int i = 0; i < expr->properties()->length(); i++) { |
- ObjectLiteral::Property* property = expr->properties()->at(i); |
+ int property_index = 0; |
+ for (; property_index < expr->properties()->length(); property_index++) { |
+ ObjectLiteral::Property* property = expr->properties()->at(property_index); |
+ if (property->is_computed_name()) break; |
if (property->IsCompileTimeValue()) continue; |
- Literal* key = property->key(); |
+ Literal* key = property->key()->AsLiteral(); |
Expression* value = property->value(); |
if (!result_saved) { |
__ push(eax); // Save result on the stack |
@@ -1701,6 +1703,65 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
__ CallRuntime(Runtime::kDefineAccessorPropertyUnchecked, 5); |
} |
+ // Object literals have two parts. The "static" part on the left contains no |
+ // computed property names, and so we can compute its map ahead of time; see |
+ // runtime.cc::CreateObjectLiteralBoilerplate. The second "dynamic" part |
+ // starts with the first computed property name, and continues with all |
+ // properties to its right. All the code from above initializes the static |
+ // component of the object literal, and arranges for the map of the result to |
+ // reflect the static order in which the keys appear. For the dynamic |
+ // properties, we compile them into a series of "SetOwnProperty" runtime |
+ // calls. This will preserve insertion order. |
+ for (; property_index < expr->properties()->length(); property_index++) { |
+ ObjectLiteral::Property* property = expr->properties()->at(property_index); |
+ |
+ Expression* value = property->value(); |
+ if (!result_saved) { |
+ __ push(eax); // Save result on the stack |
+ result_saved = true; |
+ } |
+ |
+ __ push(Operand(esp, 0)); // Duplicate receiver. |
+ |
+ if (property->kind() == ObjectLiteral::Property::PROTOTYPE) { |
+ DCHECK(!property->is_computed_name()); |
+ VisitForStackValue(value); |
+ if (property->emit_store()) { |
+ __ CallRuntime(Runtime::kInternalSetPrototype, 2); |
+ } else { |
+ __ Drop(2); |
+ } |
+ } else { |
+ EmitPropertyKey(property); |
+ VisitForStackValue(value); |
+ |
+ switch (property->kind()) { |
+ case ObjectLiteral::Property::CONSTANT: |
+ case ObjectLiteral::Property::MATERIALIZED_LITERAL: |
+ case ObjectLiteral::Property::COMPUTED: |
+ if (property->emit_store()) { |
+ __ push(Immediate(Smi::FromInt(NONE))); |
+ __ CallRuntime(Runtime::kDefineDataPropertyUnchecked, 4); |
+ } else { |
+ __ Drop(3); |
adamk
2014/12/16 19:57:48
Should this be Drop(4)? I see the same difference
arv (Not doing code reviews)
2014/12/16 20:09:37
There is an extra push in the if branch above.
|
+ } |
+ break; |
+ |
+ case ObjectLiteral::Property::PROTOTYPE: |
+ UNREACHABLE(); |
+ break; |
+ |
+ case ObjectLiteral::Property::GETTER: |
+ __ CallRuntime(Runtime::kDefineGetterPropertyUnchecked, 3); |
+ break; |
+ |
+ case ObjectLiteral::Property::SETTER: |
+ __ CallRuntime(Runtime::kDefineSetterPropertyUnchecked, 3); |
+ break; |
+ } |
+ } |
+ } |
+ |
if (expr->has_function()) { |
DCHECK(result_saved); |
__ push(Operand(esp, 0)); |
@@ -2394,16 +2455,14 @@ void FullCodeGenerator::EmitClassDefineProperties(ClassLiteral* lit) { |
for (int i = 0; i < lit->properties()->length(); i++) { |
ObjectLiteral::Property* property = lit->properties()->at(i); |
- Literal* key = property->key()->AsLiteral(); |
Expression* value = property->value(); |
- DCHECK(key != NULL); |
if (property->is_static()) { |
__ push(Operand(esp, kPointerSize)); // constructor |
} else { |
__ push(Operand(esp, 0)); // prototype |
} |
- VisitForStackValue(key); |
+ EmitPropertyKey(property); |
VisitForStackValue(value); |
EmitSetHomeObjectIfNeeded(value, 2); |
@@ -2416,11 +2475,11 @@ void FullCodeGenerator::EmitClassDefineProperties(ClassLiteral* lit) { |
break; |
case ObjectLiteral::Property::GETTER: |
- __ CallRuntime(Runtime::kDefineClassGetter, 3); |
+ __ CallRuntime(Runtime::kDefineGetterPropertyUnchecked, 3); |
break; |
case ObjectLiteral::Property::SETTER: |
- __ CallRuntime(Runtime::kDefineClassSetter, 3); |
+ __ CallRuntime(Runtime::kDefineSetterPropertyUnchecked, 3); |
break; |
default: |