[GR-22308] Instance class field can be named 'static'.

PullRequest: js/1457

Author: iamstolis

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

@@ -1563,9 +1563,12 @@ private ClassNode classTail(int classLineNumber, long classToken, IdentNode clas
                     break;
                 }
                 boolean isStatic = false;
-                if (type == STATIC && lookahead() != LPAREN) {
-                    isStatic = true;
-                    next();
+                if (type == STATIC) {
+                    TokenType nextToken = lookahead();
+                    if (nextToken != LPAREN && nextToken != ASSIGN && nextToken != SEMICOLON && nextToken != RBRACE) {
+                        isStatic = true;
+                        next();
+                    } // else method/field named 'static'
                 }
                 long classElementToken = token;
                 int classElementLine = line;

graal-js/src/com.oracle.truffle.js.test/js/class_field_named_static.js

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+ */
+
+/**
+ * Tests of class field named 'static'.
+ * 
+ * @option ecmascript-version=2021
+ */
+
+load('assert.js');
+
+class C { static }
+
+assertFalse(C.hasOwnProperty('static'));
+assertTrue(new C().hasOwnProperty('static'));
+
+class D {
+    static
+    static
+    static
+}
+
+assertTrue(D.hasOwnProperty('static'));
+assertTrue(new D().hasOwnProperty('static'));
+
+true;

graal-js/test/test262.json

@@ -1681,14 +1681,6 @@
     "filePath" : "language/expressions/class/elements/private-field-after-optional-chain.js",
     "status" : "FAIL",
     "comment" : "new failures update 2020-04-01"
-  }, {
-    "filePath" : "language/expressions/class/elements/static-as-valid-instance-field-assigned.js",
-    "status" : "FAIL",
-    "comment" : "new failures update 2020-04-01"
-  }, {
-    "filePath" : "language/expressions/class/elements/static-as-valid-instance-field.js",
-    "status" : "FAIL",
-    "comment" : "new failures update 2020-04-01"
   }, {
     "filePath" : "language/expressions/class/elements/syntax/early-errors/grammar-special-meth-ctor-async-meth.js",
     "status" : "FAIL",
@@ -1709,14 +1701,6 @@
     "filePath" : "language/statements/class/elements/private-field-after-optional-chain.js",
     "status" : "FAIL",
     "comment" : "new failures update 2020-04-01"
-  }, {
-    "filePath" : "language/statements/class/elements/static-as-valid-instance-field-assigned.js",
-    "status" : "FAIL",
-    "comment" : "new failures update 2020-04-01"
-  }, {
-    "filePath" : "language/statements/class/elements/static-as-valid-instance-field.js",
-    "status" : "FAIL",
-    "comment" : "new failures update 2020-04-01"
   }, {
     "filePath" : "language/statements/class/elements/syntax/early-errors/grammar-special-meth-ctor-async-meth.js",
     "status" : "FAIL",