Index: src/full-codegen/ia32/full-codegen-ia32.cc |
diff --git a/src/full-codegen/ia32/full-codegen-ia32.cc b/src/full-codegen/ia32/full-codegen-ia32.cc |
index bf5aceec4dbb6f2e4e72212bb182b02aa8618841..59a40840229e664a5f9da00d0942932e60da7016 100644 |
--- a/src/full-codegen/ia32/full-codegen-ia32.cc |
+++ b/src/full-codegen/ia32/full-codegen-ia32.cc |
@@ -1564,8 +1564,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); |
} |
@@ -1576,12 +1577,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; |
} |
@@ -2301,16 +2302,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; |
} |