Call SetFunctionName as part of ClassDefinitionEvaluation

Author: anba

spec.html

@@ -19790,14 +19790,14 @@ <h1>Static Semantics: PropName</h1>
 
     <emu-clause id="sec-runtime-semantics-classdefinitionevaluation">
       <h1>Runtime Semantics: ClassDefinitionEvaluation</h1>
-      <p>With parameter _className_.</p>
+      <p>With parameters _classBinding_ and _className_.</p>
       <emu-grammar>ClassTail : ClassHeritage? `{` ClassBody? `}`</emu-grammar>
       <emu-alg>
         1. Let _lex_ be the LexicalEnvironment of the running execution context.
         1. Let _classScope_ be NewDeclarativeEnvironment(_lex_).
         1. Let _classScopeEnvRec_ be _classScope_'s EnvironmentRecord.
-        1. If _className_ is not *undefined*, then
-          1. Perform _classScopeEnvRec_.CreateImmutableBinding(_className_, *true*).
+        1. If _classBinding_ is not *undefined*, then
+          1. Perform _classScopeEnvRec_.CreateImmutableBinding(_classBinding_, *true*).
         1. If |ClassHeritage_opt| is not present, then
           1. Let _protoParent_ be the intrinsic object %ObjectPrototype%.
           1. Let _constructorParent_ be the intrinsic object %FunctionPrototype%.
@@ -19833,6 +19833,8 @@ <h1>Runtime Semantics: ClassDefinitionEvaluation</h1>
         1. If |ClassHeritage_opt| is present, set _F_.[[ConstructorKind]] to `"derived"`.
         1. Perform MakeConstructor(_F_, *false*, _proto_).
         1. Perform MakeClassConstructor(_F_).
+        1. If _className_ is not *undefined*, then
+          1. Perform SetFunctionName(_F_, _className_).
         1. Perform CreateMethodProperty(_proto_, `"constructor"`, _F_).
         1. If |ClassBody_opt| is not present, let _methods_ be a new empty List.
         1. Else, let _methods_ be NonConstructorMethodDefinitions of |ClassBody|.
@@ -19845,8 +19847,8 @@ <h1>Runtime Semantics: ClassDefinitionEvaluation</h1>
             1. Set the running execution context's LexicalEnvironment to _lex_.
             1. Return Completion(_status_).
         1. Set the running execution context's LexicalEnvironment to _lex_.
-        1. If _className_ is not *undefined*, then
-          1. Perform _classScopeEnvRec_.InitializeBinding(_className_, _F_).
+        1. If _classBinding_ is not *undefined*, then
+          1. Perform _classScopeEnvRec_.InitializeBinding(_classBinding_, _F_).
         1. Return _F_.
       </emu-alg>
     </emu-clause>
@@ -19856,20 +19858,18 @@ <h1>Runtime Semantics: BindingClassDeclarationEvaluation</h1>
       <emu-grammar>ClassDeclaration : `class` BindingIdentifier ClassTail</emu-grammar>
       <emu-alg>
         1. Let _className_ be StringValue of |BindingIdentifier|.
-        1. Let _value_ be the result of ClassDefinitionEvaluation of |ClassTail| with argument _className_.
+        1. Let _value_ be the result of ClassDefinitionEvaluation of |ClassTail| with arguments _className_ and _className_.
         1. ReturnIfAbrupt(_value_).
-        1. Let _hasNameProperty_ be ? HasOwnProperty(_value_, `"name"`).
-        1. If _hasNameProperty_ is *false*, perform SetFunctionName(_value_, _className_).
         1. Let _env_ be the running execution context's LexicalEnvironment.
         1. Perform ? InitializeBoundName(_className_, _value_, _env_).
         1. Return _value_.
       </emu-alg>
       <emu-grammar>ClassDeclaration : `class` ClassTail</emu-grammar>
       <emu-alg>
-        1. Return the result of ClassDefinitionEvaluation of |ClassTail| with argument *undefined*.
+        1. Return the result of ClassDefinitionEvaluation of |ClassTail| with arguments *undefined* and `"default"`.
       </emu-alg>
       <emu-note>
-        <p><emu-grammar>ClassDeclaration : `class` ClassTail</emu-grammar> only occurs as part of an |ExportDeclaration| and the setting of a name property and establishing its binding are handled as part of the evaluation action for that production. See <emu-xref href="#sec-exports-runtime-semantics-evaluation"></emu-xref>.</p>
+        <p><emu-grammar>ClassDeclaration : `class` ClassTail</emu-grammar> only occurs as part of an |ExportDeclaration| and establishing its binding is handled as part of the evaluation action for that production. See <emu-xref href="#sec-exports-runtime-semantics-evaluation"></emu-xref>.</p>
       </emu-note>
     </emu-clause>
 
@@ -19878,11 +19878,7 @@ <h1>Runtime Semantics: NamedEvaluation</h1>
       <p>With parameter _name_.</p>
       <emu-grammar>ClassExpression : `class` ClassTail</emu-grammar>
       <emu-alg>
-        1. Let _value_ be the result of evaluating this |ClassExpression|.
-        1. Let _hasNameProperty_ be ? HasOwnProperty(_value_, `"name"`).
-        1. If _hasNameProperty_ is *false*, then
-          1. Perform SetFunctionName(_value_, _name_).
-        1. Return _value_.
+        1. Return the result of ClassDefinitionEvaluation of |ClassTail| with arguments *undefined* and _name_.
       </emu-alg>
     </emu-clause>
 
@@ -19900,17 +19896,8 @@ <h1>Runtime Semantics: Evaluation</h1>
       <emu-alg>
         1. If |BindingIdentifier_opt| is not present, let _className_ be *undefined*.
         1. Else, let _className_ be StringValue of |BindingIdentifier|.
-        1. Let _value_ be the result of ClassDefinitionEvaluation of |ClassTail| with argument _className_.
-        1. ReturnIfAbrupt(_value_).
-        1. If _className_ is not *undefined*, then
-          1. Let _hasNameProperty_ be ? HasOwnProperty(_value_, `"name"`).
-          1. If _hasNameProperty_ is *false*, then
-            1. Perform SetFunctionName(_value_, _className_).
-        1. Return NormalCompletion(_value_).
+        1. Return the result of ClassDefinitionEvaluation of |ClassTail| with arguments _className_ and _className_.
       </emu-alg>
-      <emu-note>
-        <p>If the class definition included a `name` static method then that method is not over-written with a `name` data property for the class name.</p>
-      </emu-note>
     </emu-clause>
   </emu-clause>
 
@@ -23121,8 +23108,6 @@ <h1>Runtime Semantics: Evaluation</h1>
           1. ReturnIfAbrupt(_value_).
           1. Let _className_ be the sole element of BoundNames of |ClassDeclaration|.
           1. If _className_ is `"*default*"`, then
-            1. Let _hasNameProperty_ be ? HasOwnProperty(_value_, `"name"`).
-            1. If _hasNameProperty_ is *false*, perform SetFunctionName(_value_, `"default"`).
             1. Let _env_ be the running execution context's LexicalEnvironment.
             1. Perform ? InitializeBoundName(`"*default*"`, _value_, _env_).
           1. Return NormalCompletion(~empty~).