Index: src/full-codegen/x87/full-codegen-x87.cc |
diff --git a/src/full-codegen/x87/full-codegen-x87.cc b/src/full-codegen/x87/full-codegen-x87.cc |
index 95eaaad5ae6c8c737be659be5a2fc250703d3594..d0e0b3d52e74e23320d9256d8ee6268eea888ce3 100644 |
--- a/src/full-codegen/x87/full-codegen-x87.cc |
+++ b/src/full-codegen/x87/full-codegen-x87.cc |
@@ -1559,8 +1559,9 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
case ObjectLiteral::Property::MATERIALIZED_LITERAL: |
case ObjectLiteral::Property::COMPUTED: |
if (property->emit_store()) { |
- __ push(Immediate(Smi::FromInt(NONE))); |
- __ CallRuntime(Runtime::kDefineDataPropertyUnchecked); |
+ __ Push(Smi::FromInt(NONE)); |
+ __ Push(Smi::FromInt(property->NeedsSetFunctionName())); |
+ __ CallRuntime(Runtime::kDefineDataPropertyInLiteral); |
} else { |
__ Drop(3); |
} |
@@ -1571,12 +1572,12 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
break; |
case ObjectLiteral::Property::GETTER: |
- __ push(Immediate(Smi::FromInt(NONE))); |
+ __ Push(Smi::FromInt(NONE)); |
__ CallRuntime(Runtime::kDefineGetterPropertyUnchecked); |
break; |
case ObjectLiteral::Property::SETTER: |
- __ push(Immediate(Smi::FromInt(NONE))); |
+ __ Push(Smi::FromInt(NONE)); |
__ CallRuntime(Runtime::kDefineSetterPropertyUnchecked); |
break; |
} |
@@ -2285,16 +2286,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: |
- __ push(Immediate(Smi::FromInt(DONT_ENUM))); |
+ __ Push(Smi::FromInt(DONT_ENUM)); |
__ CallRuntime(Runtime::kDefineGetterPropertyUnchecked); |
break; |
case ObjectLiteral::Property::SETTER: |
- __ push(Immediate(Smi::FromInt(DONT_ENUM))); |
+ __ Push(Smi::FromInt(DONT_ENUM)); |
__ CallRuntime(Runtime::kDefineSetterPropertyUnchecked); |
break; |
} |