Index: src/full-codegen/arm/full-codegen-arm.cc |
diff --git a/src/full-codegen/arm/full-codegen-arm.cc b/src/full-codegen/arm/full-codegen-arm.cc |
index b9d9a194a556ae99cce551c083a18bbfd3cd1bcc..caa50e8272ca6c4e0908ab58587292e440481430 100644 |
--- a/src/full-codegen/arm/full-codegen-arm.cc |
+++ b/src/full-codegen/arm/full-codegen-arm.cc |
@@ -1646,9 +1646,9 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
case ObjectLiteral::Property::MATERIALIZED_LITERAL: |
case ObjectLiteral::Property::COMPUTED: |
if (property->emit_store()) { |
- __ mov(r0, Operand(Smi::FromInt(NONE))); |
- __ push(r0); |
- __ CallRuntime(Runtime::kDefineDataPropertyUnchecked); |
+ __ Push(Smi::FromInt(NONE)); |
+ __ Push(Smi::FromInt(property->NeedsSetFunctionName())); |
+ __ CallRuntime(Runtime::kDefineDataPropertyInLiteral); |
} else { |
__ Drop(3); |
} |
@@ -1659,14 +1659,12 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
break; |
case ObjectLiteral::Property::GETTER: |
- __ mov(r0, Operand(Smi::FromInt(NONE))); |
- __ push(r0); |
+ __ Push(Smi::FromInt(NONE)); |
__ CallRuntime(Runtime::kDefineGetterPropertyUnchecked); |
break; |
case ObjectLiteral::Property::SETTER: |
- __ mov(r0, Operand(Smi::FromInt(NONE))); |
- __ push(r0); |
+ __ Push(Smi::FromInt(NONE)); |
__ CallRuntime(Runtime::kDefineSetterPropertyUnchecked); |
break; |
} |
@@ -2401,18 +2399,18 @@ void FullCodeGenerator::EmitClassDefineProperties(ClassLiteral* lit) { |
case ObjectLiteral::Property::PROTOTYPE: |
UNREACHABLE(); |
case ObjectLiteral::Property::COMPUTED: |
- __ CallRuntime(Runtime::kDefineClassMethod); |
+ __ Push(Smi::FromInt(DONT_ENUM)); |
+ __ Push(Smi::FromInt(property->NeedsSetFunctionName())); |
+ __ CallRuntime(Runtime::kDefineDataPropertyInLiteral); |
break; |
case ObjectLiteral::Property::GETTER: |
- __ mov(r0, Operand(Smi::FromInt(DONT_ENUM))); |
- __ push(r0); |
+ __ Push(Smi::FromInt(DONT_ENUM)); |
__ CallRuntime(Runtime::kDefineGetterPropertyUnchecked); |
break; |
case ObjectLiteral::Property::SETTER: |
- __ mov(r0, Operand(Smi::FromInt(DONT_ENUM))); |
- __ push(r0); |
+ __ Push(Smi::FromInt(DONT_ENUM)); |
__ CallRuntime(Runtime::kDefineSetterPropertyUnchecked); |
break; |