Index: src/x64/full-codegen-x64.cc |
diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc |
index 571cc337f641cf6fd82b04e511ca12ff42ebfd74..24747ee9e85b11d7e3fed1b50e70db0d2073e9b2 100644 |
--- a/src/x64/full-codegen-x64.cc |
+++ b/src/x64/full-codegen-x64.cc |
@@ -1651,13 +1651,11 @@ |
expr->CalculateEmitStore(zone()); |
AccessorTable accessor_table(zone()); |
- 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; |
+ for (int i = 0; i < expr->properties()->length(); i++) { |
+ ObjectLiteral::Property* property = expr->properties()->at(i); |
if (property->IsCompileTimeValue()) continue; |
- Literal* key = property->key()->AsLiteral(); |
+ Literal* key = property->key(); |
Expression* value = property->value(); |
if (!result_saved) { |
__ Push(rax); // Save result on the stack |
@@ -1737,65 +1735,6 @@ |
__ 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(rax); // Save result on the stack |
- result_saved = true; |
- } |
- |
- __ Push(Operand(rsp, 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(Smi::FromInt(NONE)); |
- __ CallRuntime(Runtime::kDefineDataPropertyUnchecked, 4); |
- } else { |
- __ Drop(3); |
- } |
- 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(rsp, 0)); |
@@ -2454,14 +2393,16 @@ |
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(rsp, kPointerSize)); // constructor |
} else { |
__ Push(Operand(rsp, 0)); // prototype |
} |
- EmitPropertyKey(property); |
+ VisitForStackValue(key); |
VisitForStackValue(value); |
EmitSetHomeObjectIfNeeded(value, 2); |
@@ -2474,11 +2415,11 @@ |
break; |
case ObjectLiteral::Property::GETTER: |
- __ CallRuntime(Runtime::kDefineGetterPropertyUnchecked, 3); |
+ __ CallRuntime(Runtime::kDefineClassGetter, 3); |
break; |
case ObjectLiteral::Property::SETTER: |
- __ CallRuntime(Runtime::kDefineSetterPropertyUnchecked, 3); |
+ __ CallRuntime(Runtime::kDefineClassSetter, 3); |
break; |
default: |