[GR-31574] Implement class static initialization blocks proposal.

PullRequest: js/2138

Author: woess

CHANGELOG.md

@@ -12,6 +12,7 @@ The main focus is on user-observable behavior of the engine.
 * Added support for `dayPeriod` and `fractionalSecondDigits` options of `Intl.DateTimeFormat`.
 * Changed foreign hash map access using `map[key]` syntax to convert the key to a string or symbol.
 * Implemented `Object.hasOwn` ([Accessible Object.hasOwnProperty](https://github.com/tc39/proposal-accessible-object-hasownproperty) proposal). It is available in ECMAScript 2022 (`--js.ecmascript-version=2022`).
+* Implemented [class static initialization blocks](https://github.com/tc39/proposal-class-static-block) proposal. It is available in ECMAScript 2022 (`--js.ecmascript-version=2022`).
 * Added experimental Polyglot `Context` option `--js.esm-eval-returns-exports`. When enabled, `eval()` of an ES module will return a Polyglot `Value` containing the ES module exported namespace object. The option is disabled by default.
 
 ## Version 21.2.0

graal-js/src/com.oracle.js.parser/src/com/oracle/js/parser/Parser.java

@@ -855,6 +855,13 @@ private boolean isES2021() {
         return env.ecmaScriptVersion >= 12;
     }
 
+    /**
+     * ES2022 or newer.
+     */
+    private boolean isES2022() {
+        return env.ecmaScriptVersion >= 13;
+    }
+
     private boolean isClassFields() {
         return ES2020_CLASS_FIELDS && env.classFields;
     }
@@ -1602,7 +1609,7 @@ private ClassNode classTail(int classLineNumber, long classToken, IdentNode clas
             ArrayList<PropertyNode> classElements = new ArrayList<>();
             Map<String, Integer> privateNameToAccessorIndexMap = new HashMap<>();
             int instanceFieldCount = 0;
-            int staticFieldCount = 0;
+            int staticElementCount = 0;
             boolean hasPrivateMethods = false;
             boolean hasPrivateInstanceMethods = false;
             for (;;) {
@@ -1618,7 +1625,17 @@ private ClassNode classTail(int classLineNumber, long classToken, IdentNode clas
                     TokenType nextToken = lookahead();
                     if (nextToken != LPAREN && nextToken != ASSIGN && nextToken != SEMICOLON && nextToken != RBRACE) {
                         isStatic = true;
+                        int staticLine = line;
+                        long staticToken = token;
                         next();
+
+                        if (type == LBRACE && isES2022()) {
+                            // static initialization block
+                            PropertyNode staticInit = staticInitializer(staticLine, staticToken);
+                            staticElementCount++;
+                            classElements.add(staticInit);
+                            continue;
+                        }
                     } // else method/field named 'static'
                 }
                 long classElementToken = token;
@@ -1642,7 +1659,7 @@ private ClassNode classTail(int classLineNumber, long classToken, IdentNode clas
                 if (!generator && !async && isClassFieldDefinition(nameTokenType)) {
                     classElement = fieldDefinition(classElementName, isStatic, classElementToken, computed);
                     if (isStatic) {
-                        staticFieldCount++;
+                        staticElementCount++;
                     } else {
                         instanceFieldCount++;
                     }
@@ -1733,7 +1750,7 @@ private ClassNode classTail(int classLineNumber, long classToken, IdentNode clas
 
             classScope.close();
             return new ClassNode(classToken, classFinish, className, classHeritage, constructor, classElements, classScope,
-                            instanceFieldCount, staticFieldCount, hasPrivateMethods, hasPrivateInstanceMethods);
+                            instanceFieldCount, staticElementCount, hasPrivateMethods, hasPrivateInstanceMethods);
         } finally {
             lc.pop(classNode);
         }
@@ -1986,6 +2003,32 @@ private Pair<FunctionNode, Boolean> fieldInitializer(int lineNumber, long fieldT
         return Pair.create(createFunctionNode(function, fieldToken, null, lineNumber, bodyBlock), isAnonymousFunctionDefinition);
     }
 
+    /**
+     * Parse <code>{ ClassStaticBlockBody }</code>.
+     */
+    private PropertyNode staticInitializer(int lineNumber, long staticToken) {
+        assert type == LBRACE;
+        int functionFlags = FunctionNode.IS_METHOD | FunctionNode.IS_CLASS_FIELD_INITIALIZER | FunctionNode.IS_ANONYMOUS;
+        ParserContextFunctionNode function = createParserContextFunctionNode(null, staticToken, functionFlags, lineNumber, Collections.emptyList(), 0);
+        function.setInternalName(INITIALIZER_FUNCTION_NAME);
+        lc.push(function);
+        Block bodyBlock;
+        try {
+            bodyBlock = functionBody(function);
+        } finally {
+            lc.pop(function);
+        }
+
+        // It is a Syntax Error if ContainsArguments of Initializer is true.
+        assert function.getFlag(FunctionNode.USES_ARGUMENTS) == 0;
+
+        // currently required for all nested functions.
+        lc.setCurrentFunctionFlag(FunctionNode.HAS_CLOSURES);
+
+        FunctionNode functionNode = createFunctionNode(function, staticToken, null, lineNumber, bodyBlock);
+        return new PropertyNode(staticToken, finish, null, functionNode, null, null, true, false, false, false, false, false);
+    }
+
     private boolean isPropertyName(long currentToken) {
         TokenType currentType = Token.descType(currentToken);
         if (ES6_COMPUTED_PROPERTY_NAME && currentType == LBRACKET && isES6()) {
@@ -3130,7 +3173,8 @@ private void breakStatement(boolean yield, boolean await) {
      */
     private void returnStatement(boolean yield, boolean await) {
         // check for return outside function
-        if (lc.getCurrentFunction().isScriptOrModule()) {
+        ParserContextFunctionNode currentFunction = lc.getCurrentFunction();
+        if (currentFunction.isScriptOrModule() || currentFunction.isClassStaticBlock()) {
             throw error(AbstractParser.message("invalid.return"));
         }
 
@@ -3232,15 +3276,20 @@ private Expression awaitExpression(boolean yield) {
         // Capture await token.
         long awaitToken = token;
 
+        ParserContextFunctionNode currentFunction = lc.getCurrentFunction();
+        if (currentFunction.isClassStaticBlock()) {
+            throw error(AbstractParser.message("unexpected.token", type.getNameOrType()));
+        }
+
         recordYieldOrAwait();
 
         nextOrEOL();
 
         Expression expression = unaryExpression(yield, true);
 
-        if (isModule && lc.getCurrentFunction().isModule()) {
+        if (isModule && currentFunction.isModule()) {
             // Top-level await module: mark the body of the module as async.
-            lc.getCurrentFunction().setFlag(FunctionNode.IS_ASYNC);
+            currentFunction.setFlag(FunctionNode.IS_ASYNC);
         }
         // Construct and add AWAIT node.
         return new UnaryNode(Token.recast(awaitToken, AWAIT), expression);
@@ -4236,7 +4285,7 @@ private PropertyFunction propertySetterFunction(long getSetToken, int functionLi
             lc.push(parameterBlock);
             try {
                 if (!env.syntaxExtensions || type != RPAREN) {
-                    formalParameter(yield, await);
+                    formalParameter(false, false);
                 } // else Nashorn allows no-argument setters
                 expect(RPAREN);
 
@@ -5359,7 +5408,7 @@ public void accept(IdentNode identNode) {
      */
     private Block functionBody(final ParserContextFunctionNode functionNode) {
         final boolean yield = functionNode.isGenerator();
-        final boolean await = functionNode.isAsync() || (isTopLevelAwait() && isModule && functionNode.isModule());
+        final boolean await = functionNode.isAsync() || (isTopLevelAwait() && isModule && functionNode.isModule()) || functionNode.isClassStaticBlock();
         final long bodyToken = token;
         final int bodyFinish;
         final boolean parseBody;

graal-js/src/com.oracle.js.parser/src/com/oracle/js/parser/ParserContextFunctionNode.java

@@ -547,6 +547,10 @@ public void setInternalName(String internalName) {
         this.internalName = internalName;
     }
 
+    public boolean isClassStaticBlock() {
+        return getFlag(FunctionNode.IS_CLASS_FIELD_INITIALIZER) != 0;
+    }
+
     public boolean isCoverArrowHead() {
         return coverArrowHead;
     }

graal-js/src/com.oracle.js.parser/src/com/oracle/js/parser/ir/ClassNode.java

@@ -57,7 +57,7 @@ public class ClassNode extends LexicalContextExpression implements LexicalContex
     private final List<PropertyNode> classElements;
     private final Scope scope;
     private final int instanceFieldCount;
-    private final int staticFieldCount;
+    private final int staticElementCount;
     private final boolean hasPrivateMethods;
     private final boolean hasPrivateInstanceMethods;
 
@@ -70,19 +70,19 @@ public class ClassNode extends LexicalContextExpression implements LexicalContex
      * @param finish finish
      */
     public ClassNode(final long token, final int finish, final IdentNode ident, final Expression classHeritage, final PropertyNode constructor, final List<PropertyNode> classElements,
-                    final Scope scope, final int instanceFieldCount, final int staticFieldCount, final boolean hasPrivateMethods, final boolean hasPrivateInstanceMethods) {
+                    final Scope scope, final int instanceFieldCount, final int staticElementCount, final boolean hasPrivateMethods, final boolean hasPrivateInstanceMethods) {
         super(token, finish);
         this.ident = ident;
         this.classHeritage = classHeritage;
         this.constructor = constructor;
         this.classElements = classElements;
         this.scope = scope;
         this.instanceFieldCount = instanceFieldCount;
-        this.staticFieldCount = staticFieldCount;
+        this.staticElementCount = staticElementCount;
         this.hasPrivateMethods = hasPrivateMethods;
         this.hasPrivateInstanceMethods = hasPrivateInstanceMethods;
-        assert instanceFieldCount == fieldCount(classElements, false);
-        assert staticFieldCount == fieldCount(classElements, true);
+        assert instanceFieldCount == elementCount(classElements, false);
+        assert staticElementCount == elementCount(classElements, true);
     }
 
     private ClassNode(final ClassNode classNode, final IdentNode ident, final Expression classHeritage, final PropertyNode constructor, final List<PropertyNode> classElements) {
@@ -92,16 +92,16 @@ private ClassNode(final ClassNode classNode, final IdentNode ident, final Expres
         this.constructor = constructor;
         this.classElements = classElements;
         this.scope = classNode.scope;
-        this.instanceFieldCount = fieldCount(classElements, false);
-        this.staticFieldCount = fieldCount(classElements, true);
+        this.instanceFieldCount = elementCount(classElements, false);
+        this.staticElementCount = elementCount(classElements, true);
         this.hasPrivateMethods = classNode.hasPrivateMethods;
         this.hasPrivateInstanceMethods = classNode.hasPrivateInstanceMethods;
     }
 
-    private static int fieldCount(List<PropertyNode> classElements, boolean isStatic) {
+    private static int elementCount(List<PropertyNode> classElements, boolean isStatic) {
         int count = 0;
         for (PropertyNode classElement : classElements) {
-            if (classElement.isClassField() && classElement.isStatic() == isStatic) {
+            if (classElement.isStatic() == isStatic && (classElement.isClassField() || classElement.isClassStaticBlock())) {
                 count++;
             }
         }
@@ -195,12 +195,12 @@ public int getInstanceFieldCount() {
         return instanceFieldCount;
     }
 
-    public boolean hasStaticFields() {
-        return staticFieldCount != 0;
+    public boolean hasStaticElements() {
+        return staticElementCount != 0;
     }
 
-    public int getStaticFieldCount() {
-        return staticFieldCount;
+    public int getStaticElementCount() {
+        return staticElementCount;
     }
 
     public boolean hasPrivateMethods() {

graal-js/src/com.oracle.js.parser/src/com/oracle/js/parser/ir/FunctionNode.java

@@ -230,7 +230,7 @@ public final class FunctionNode extends LexicalContextExpression implements Flag
     /** Does this function contain a {@code fn.apply(_, arguments)} call? */
     public static final int HAS_APPLY_ARGUMENTS_CALL = 1 << 29;
 
-    /** Is this function a class field initializer? */
+    /** Is this function a class field/static initializer? */
     public static final int IS_CLASS_FIELD_INITIALIZER = 1 << 30;
 
     /**

graal-js/src/com.oracle.js.parser/src/com/oracle/js/parser/ir/PropertyNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -133,7 +133,7 @@ public Node accept(final NodeVisitor<? extends LexicalContext> visitor) {
         if (visitor.enterPropertyNode(this)) {
             //@formatter:off
             return visitor.leavePropertyNode(
-                setKey((Expression) key.accept(visitor)).
+                setKey(key == null ? null : (Expression) key.accept(visitor)).
                 setValue(value == null ? null : (Expression) value.accept(visitor)).
                 setGetter(getter == null ? null : (FunctionNode) getter.accept(visitor)).
                 setSetter(setter == null ? null : (FunctionNode) setter.accept(visitor)));
@@ -150,33 +150,38 @@ public <R> R accept(TranslatorNodeVisitor<? extends LexicalContext, R> visitor)
 
     @Override
     public void toString(final StringBuilder sb, final boolean printType) {
+        if (isStatic) {
+            sb.append("static ");
+        }
+
         if (value != null) {
-            if (isStatic) {
-                sb.append("static ");
-            }
-            if (value instanceof FunctionNode && ((FunctionNode) value).isMethod()) {
+            if (isClassStaticBlock()) {
+                sb.append("{}");
+            } else if (value instanceof FunctionNode && ((FunctionNode) value).isMethod()) {
+                if (((FunctionNode) value).isAsync()) {
+                    sb.append("async ");
+                }
+                if (((FunctionNode) value).isGenerator()) {
+                    sb.append('*');
+                }
                 toStringKey(sb, printType);
                 ((FunctionNode) value).toStringTail(sb, printType);
             } else {
                 toStringKey(sb, printType);
                 sb.append(": ");
                 value.toString(sb, printType);
             }
+        } else if (isClassField()) {
+            toStringKey(sb, printType);
         }
 
         if (getter != null) {
-            if (isStatic) {
-                sb.append("static ");
-            }
             sb.append("get ");
             toStringKey(sb, printType);
             getter.toStringTail(sb, printType);
         }
 
         if (setter != null) {
-            if (isStatic) {
-                sb.append("static ");
-            }
             sb.append("set ");
             toStringKey(sb, printType);
             setter.toStringTail(sb, printType);
@@ -315,4 +320,8 @@ public String getPrivateName() {
     public boolean isAccessor() {
         return getter != null || setter != null;
     }
+
+    public boolean isClassStaticBlock() {
+        return isStatic() && getKey() == null;
+    }
 }

graal-js/src/com.oracle.truffle.js.parser/src/com/oracle/truffle/js/parser/GraalJSTranslator.java

@@ -3013,7 +3013,10 @@ private ObjectLiteralMemberNode enterObjectPropertyNode(PropertyNode property, b
                 JSWriteFrameSlotNode writePrivateNode = (JSWriteFrameSlotNode) privateVar.createWriteNode(null);
                 return factory.createPrivateMethodMember(property.isStatic(), value, writePrivateNode);
             }
+        } else if (isClass && property.isClassStaticBlock()) {
+            return factory.createStaticBlockMember(value);
         } else {
+            assert property.getKey() != null;
             return factory.createDataMember(property.getKeyName(), property.isStatic(), enumerable, value, property.isClassField());
         }
     }
@@ -3387,7 +3390,7 @@ public JavaScriptNode enterClassNode(ClassNode classNode) {
 
             JavaScriptNode classDefinition = factory.createClassDefinition(context, (JSFunctionExpressionNode) classFunction, classHeritage,
                             members.toArray(ObjectLiteralMemberNode.EMPTY), writeClassBinding, className,
-                            classNode.getInstanceFieldCount(), classNode.getStaticFieldCount(), classNode.hasPrivateInstanceMethods(), currentFunction().getBlockScopeSlot());
+                            classNode.getInstanceFieldCount(), classNode.getStaticElementCount(), classNode.hasPrivateInstanceMethods(), currentFunction().getBlockScopeSlot());
 
             if (classNode.hasPrivateMethods()) {
                 // internal constructor binding used for private brand checks.

graal-js/src/com.oracle.truffle.js.test.external/src/com/oracle/truffle/js/test/external/test262/Test262Runnable.java

@@ -182,6 +182,7 @@ public class Test262Runnable extends TestRunnable {
                     "class-fields-private",
                     "class-fields-public",
                     "class-methods-private",
+                    "class-static-block",
                     "class-static-fields-private",
                     "class-static-fields-public",
                     "class-static-methods-private",
@@ -242,7 +243,6 @@ public class Test262Runnable extends TestRunnable {
                     "arbitrary-module-namespace-names",
                     "array-find-from-last",
                     "class-fields-private-in",
-                    "class-static-block",
                     "resizable-arraybuffer",
                     "tail-call-optimization",
     }));
@@ -255,6 +255,7 @@ public class Test262Runnable extends TestRunnable {
                     "class-fields-private",
                     "class-fields-public",
                     "class-methods-private",
+                    "class-static-block",
                     "class-static-fields-private",
                     "class-static-fields-public",
                     "class-static-methods-private",

graal-js/src/com.oracle.truffle.js.test.external/src/com/oracle/truffle/js/test/external/testv8/TestV8Runnable.java

@@ -100,6 +100,7 @@ public class TestV8Runnable extends TestRunnable {
     }));
     private static final Set<String> ES2022_FLAGS = new HashSet<>(Arrays.asList(new String[]{
                     "--harmony-atomics-waitasync",
+                    "--harmony-class-static-blocks",
                     "--harmony-object-has-own",
                     "--harmony-regexp-match-indices",
                     "--harmony-top-level-await"

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/NodeFactory.java

@@ -815,6 +815,10 @@ public ObjectLiteralMemberNode createSpreadObjectMember(boolean isStatic, JavaSc
         return ObjectLiteralNode.newSpreadObjectMember(isStatic, value);
     }
 
+    public ObjectLiteralMemberNode createStaticBlockMember(JavaScriptNode value) {
+        return ObjectLiteralNode.newStaticBlockMember(value);
+    }
+
     public JavaScriptNode createClassDefinition(JSContext context, JSFunctionExpressionNode constructorFunction, JavaScriptNode classHeritage, ObjectLiteralMemberNode[] members,
                     JSWriteFrameSlotNode writeClassBinding, String className, int instanceFieldCount, int staticFieldCount, boolean hasPrivateInstanceMethods, FrameSlot blockScopeSlot) {
         return ClassDefinitionNode.create(context, constructorFunction, classHeritage, members,