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 6652c92e9fd2f0a9dbdf1d48bab44a3ae11031bb..015ab2f7847a8748597a7fcd3c8d1520fe49c420 100644 |
--- a/src/full-codegen/ia32/full-codegen-ia32.cc |
+++ b/src/full-codegen/ia32/full-codegen-ia32.cc |
@@ -2483,24 +2483,12 @@ void FullCodeGenerator::EmitClassDefineProperties(ClassLiteral* lit, |
} |
} |
- // prototype |
- __ CallRuntime(Runtime::kToFastProperties, 1); |
- |
- // constructor |
- __ CallRuntime(Runtime::kToFastProperties, 1); |
- |
- if (is_strong(language_mode())) { |
- __ mov(scratch, |
- FieldOperand(eax, JSFunction::kPrototypeOrInitialMapOffset)); |
- __ push(eax); |
- __ Push(scratch); |
- // TODO(conradw): It would be more efficient to define the properties with |
- // the right attributes the first time round. |
- // Freeze the prototype. |
- __ CallRuntime(Runtime::kObjectFreeze, 1); |
- // Freeze the constructor. |
- __ CallRuntime(Runtime::kObjectFreeze, 1); |
- } |
+ // Set both the prototype and constructor to have fast properties, and also |
+ // freeze them in strong mode. |
+ __ CallRuntime(is_strong(language_mode()) |
+ ? Runtime::kFinalizeClassDefinitionStrong |
+ : Runtime::kFinalizeClassDefinition, |
+ 2); |
} |