[GR-54383] Prepare the 24.1 release branches.

PullRequest: js/3173

Author: ansalond

CHANGELOG.md

@@ -6,9 +6,11 @@ Changelog may include unreleased versions.
 See [release calendar](https://www.graalvm.org/release-calendar/) for release dates.
 
 ## Version 24.1.0
+* ECMAScript 2024 mode/features enabled by default.
 * Implemented the [Make eval-introduced global vars redeclarable](https://github.com/tc39/proposal-redeclarable-global-eval-vars) proposal.
 * Implemented the [Float16Array](https://github.com/tc39/proposal-float16array) proposal. It is available in ECMAScript staging mode (`--js.ecmascript-version=staging`).
 * Implemented the [Array.fromAsync](https://github.com/tc39/proposal-array-from-async) proposal. It is available in ECMAScript staging mode (`--js.ecmascript-version=staging`).
+* Implemented the [Resizable and Growable ArrayBuffers](https://github.com/tc39/proposal-resizablearraybuffer) proposal.
 * Updated Node.js to version 20.13.1.
 
 ## Version 24.0.0

common.json

@@ -8,7 +8,7 @@
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
-    "galahad-jdk":        {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+20-1618", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+25-2038", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk11":        {"name": "jpg-jdk",   "version": "11.0.11", "build_id": "jdk-11.0.11+9", "platformspecific": true, "extrabundles": ["static-libs"] },
 
@@ -45,13 +45,13 @@
     "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21.0.2+13-jvmci-23.1-b33-sulong", "platformspecific": true },
     "graalvm-ee-21":      {"name": "graalvm-java21", "version": "23.1.3", "platformspecific": true },
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+24", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-23+24-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-23+24-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-23+24-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-23+24-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-23+24-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-23+24-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+25", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-23+25-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-23+25-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-23+25-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-23+25-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-23+25-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-23+25-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

graal-js/mx.graal-js/suite.py

@@ -24,7 +24,7 @@
         {
            "name" : "regex",
            "subdir" : True,
-           "version" : "a80221fd7d7534c0d2df496f3ec5dba12fd0f8b3",
+           "version" : "6c4f42bf5368c480ef2c9c29f0163d30d827b001",
            "urls" : [
                 {"url" : "https://github.com/oracle/graal.git", "kind" : "git"},
             ]

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

@@ -41,6 +41,12 @@
 
 package com.oracle.js.parser;
 
+import static com.oracle.js.parser.ScriptEnvironment.ES_2015;
+import static com.oracle.js.parser.ScriptEnvironment.ES_2017;
+import static com.oracle.js.parser.ScriptEnvironment.ES_2020;
+import static com.oracle.js.parser.ScriptEnvironment.ES_2021;
+import static com.oracle.js.parser.ScriptEnvironment.ES_2022;
+import static com.oracle.js.parser.ScriptEnvironment.ES_STAGING;
 import static com.oracle.js.parser.TokenType.ACCESSOR;
 import static com.oracle.js.parser.TokenType.ARROW;
 import static com.oracle.js.parser.TokenType.AS;
@@ -910,42 +916,39 @@ private boolean useBlockScope() {
      * ES6 (a.k.a. ES2015) or newer.
      */
     private boolean isES6() {
-        return env.ecmaScriptVersion >= 6;
+        return env.ecmaScriptVersion >= ES_2015;
     }
 
     /**
      * ES2017 or newer.
      */
     private boolean isES2017() {
-        return env.ecmaScriptVersion >= 8;
+        return env.ecmaScriptVersion >= ES_2017;
     }
 
     /**
      * ES2020 or newer.
      */
     private boolean isES2020() {
-        return env.ecmaScriptVersion >= 11;
+        return env.ecmaScriptVersion >= ES_2020;
     }
 
     /**
      * ES2021 or newer.
      */
     private boolean isES2021() {
-        return env.ecmaScriptVersion >= 12;
+        return env.ecmaScriptVersion >= ES_2021;
     }
 
     /**
      * ES2022 or newer.
      */
     private boolean isES2022() {
-        return env.ecmaScriptVersion >= 13;
+        return env.ecmaScriptVersion >= ES_2022;
     }
 
-    /**
-     * ES2023 or newer.
-     */
-    private boolean isES2023() {
-        return env.ecmaScriptVersion >= 14;
+    private boolean isClassDecorators() {
+        return env.ecmaScriptVersion >= ES_STAGING;
     }
 
     private boolean isClassFields() {
@@ -1609,7 +1612,7 @@ private ClassNode classDeclaration(boolean yield, boolean await, boolean default
         assert type == CLASS || type == AT;
         List<Expression> classDecorators = null;
         if (type == AT) {
-            assert isES2023();
+            assert isClassDecorators();
             classDecorators = decoratorList(yield, await);
         }
 
@@ -1652,7 +1655,7 @@ private ClassNode classExpression(boolean yield, boolean await) {
         assert type == CLASS || type == AT;
         List<Expression> classDecorators = null;
         if (type == AT) {
-            assert isES2023();
+            assert isClassDecorators();
             classDecorators = decoratorList(yield, await);
         }
         int classLineNumber = line;
@@ -1745,7 +1748,7 @@ private ClassNode classTail(int classLineNumber, long classToken, IdentNode clas
                     hasClassElementDecorators = true;
                 }
                 boolean isAutoAccessor = false;
-                if (isES2023() && type == ACCESSOR) {
+                if (isClassDecorators() && type == ACCESSOR) {
                     TokenType nextToken = lookaheadNoLineTerminator();
                     if (nextToken != LPAREN && nextToken != ASSIGN && nextToken != SEMICOLON && nextToken != RBRACE && nextToken != EOL) {
                         isAutoAccessor = true;
@@ -1755,7 +1758,7 @@ private ClassNode classTail(int classLineNumber, long classToken, IdentNode clas
                 boolean isStatic = false;
                 if (type == STATIC) {
                     TokenType nextToken = lookahead();
-                    if (isES2023() && nextToken == ACCESSOR) {
+                    if (isClassDecorators() && nextToken == ACCESSOR) {
                         next();
                         nextToken = lookaheadNoLineTerminator();
                         if (nextToken != LPAREN && nextToken != ASSIGN && nextToken != SEMICOLON && nextToken != RBRACE && nextToken != EOL) {
@@ -7595,7 +7598,7 @@ private boolean lookaheadIsAsyncMethod(boolean allowPrivate) {
      * </pre>
      */
     public List<Expression> decoratorList(boolean yield, boolean await) {
-        assert isES2023();
+        assert isClassDecorators();
         List<Expression> decoratorList = new ArrayList<>();
         while (type == AT) {
             next();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, 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
@@ -47,6 +47,19 @@
  * Parser environment consists of command line options, and output and error writers, etc.
  */
 public final class ScriptEnvironment {
+
+    public static final int ES_2015 = 6;
+    public static final int ES_2016 = 7;
+    public static final int ES_2017 = 8;
+    public static final int ES_2018 = 9;
+    public static final int ES_2019 = 10;
+    public static final int ES_2020 = 11;
+    public static final int ES_2021 = 12;
+    public static final int ES_2022 = 13;
+    public static final int ES_2023 = 14;
+    public static final int ES_2024 = 15;
+    public static final int ES_STAGING = Integer.MAX_VALUE;
+
     /** Error writer for this environment */
     private final PrintWriter err;
 

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

@@ -41,6 +41,10 @@
 
 package com.oracle.js.parser;
 
+import static com.oracle.js.parser.ScriptEnvironment.ES_2015;
+import static com.oracle.js.parser.ScriptEnvironment.ES_2020;
+import static com.oracle.js.parser.ScriptEnvironment.ES_2021;
+import static com.oracle.js.parser.ScriptEnvironment.ES_STAGING;
 import static com.oracle.js.parser.TokenKind.BINARY;
 import static com.oracle.js.parser.TokenKind.BRACKET;
 import static com.oracle.js.parser.TokenKind.CONTEXTUAL;
@@ -79,13 +83,13 @@ public enum TokenType {
     BIT_AND        (BINARY,  "&",     8, true),
     AND            (BINARY,  "&&",    5, true),
     ASSIGN_BIT_AND (BINARY,  "&=",    2, false),
-    ASSIGN_AND     (BINARY,  "&&=",   2, false, 12),
+    ASSIGN_AND     (BINARY,  "&&=",   2, false, ES_2021),
     LPAREN         (BRACKET, "(",    17, true),
     RPAREN         (BRACKET, ")",     0, true),
     MUL            (BINARY,  "*",    13, true),
     ASSIGN_MUL     (BINARY,  "*=",    2, false),
-    EXP            (BINARY,  "**",   14, false, 6),
-    ASSIGN_EXP     (BINARY,  "**=",   2, false, 6),
+    EXP            (BINARY,  "**",   14, false, ES_2015),
+    ASSIGN_EXP     (BINARY,  "**=",   2, false, ES_2015),
     ADD            (BINARY,  "+",    12, true),
     INCPREFIX      (UNARY,   "++",   16, true),
     ASSIGN_ADD     (BINARY,  "+=",    2, false),
@@ -121,14 +125,14 @@ public enum TokenType {
     BIT_OR         (BINARY,  "|",     6, true),
     ASSIGN_BIT_OR  (BINARY,  "|=",    2, false),
     OR             (BINARY,  "||",    4, true),
-    ASSIGN_OR      (BINARY,  "||=",   2, false, 12),
+    ASSIGN_OR      (BINARY,  "||=",   2, false, ES_2021),
     RBRACE         (BRACKET, "}"),
     BIT_NOT        (UNARY,   "~",    15, false),
     ELLIPSIS       (UNARY,   "..."),
-    NULLISHCOALESC (BINARY,  "??",    4, true, 11),
-    ASSIGN_NULLCOAL(BINARY,  "??=",   2, false, 12),
-    OPTIONAL_CHAIN (BRACKET, "?.",   18, true, 11),
-    AT             (UNARY,   "@",    0,  true, 14),
+    NULLISHCOALESC (BINARY,  "??",    4, true, ES_2020),
+    ASSIGN_NULLCOAL(BINARY,  "??=",   2, false, ES_2021),
+    OPTIONAL_CHAIN (BRACKET, "?.",   18, true, ES_2020),
+    AT             (UNARY,   "@",    0,  true, ES_STAGING),
 
     // ECMA 7.6.1.1 Keywords, 7.6.1.2 Future Reserved Words.
     // All other Java keywords are commented out.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -61,6 +61,7 @@
 import com.oracle.truffle.api.strings.TruffleString;
 import com.oracle.truffle.js.parser.internal.ir.debug.JSONWriter;
 import com.oracle.truffle.js.runtime.Errors;
+import com.oracle.truffle.js.runtime.JSConfig;
 import com.oracle.truffle.js.runtime.JSContext;
 import com.oracle.truffle.js.runtime.JSException;
 import com.oracle.truffle.js.runtime.JSParserOptions;
@@ -182,7 +183,11 @@ protected Function<Number, TruffleString> getNumberToStringConverter() {
     private static ScriptEnvironment makeScriptEnvironment(JSParserOptions parserOptions) {
         ScriptEnvironment.Builder builder = ScriptEnvironment.builder();
         builder.strict(parserOptions.strict());
-        builder.ecmaScriptVersion(parserOptions.ecmaScriptVersion());
+        int ecmaScriptVersion = parserOptions.ecmaScriptVersion();
+        if (ecmaScriptVersion == JSConfig.StagingECMAScriptVersion) {
+            ecmaScriptVersion = ScriptEnvironment.ES_STAGING;
+        }
+        builder.ecmaScriptVersion(ecmaScriptVersion);
         builder.emptyStatements(parserOptions.emptyStatements());
         builder.syntaxExtensions(parserOptions.syntaxExtensions());
         builder.scripting(parserOptions.scripting());

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

@@ -250,6 +250,7 @@ public class Test262Runnable extends TestRunnable {
                     "regexp-named-groups",
                     "regexp-unicode-property-escapes",
                     "regexp-v-flag",
+                    "resizable-arraybuffer",
                     "rest-parameters",
                     "set-methods",
                     "string-trimming",
@@ -265,23 +266,16 @@ public class Test262Runnable extends TestRunnable {
                     "IsHTMLDDA",
                     "explicit-resource-management",
                     "regexp-modifiers",
-                    "resizable-arraybuffer",
                     "tail-call-optimization",
     });
     private static final Set<String> STAGING_FEATURES = featureSet(new String[]{
                     "Array.fromAsync",
-                    "Atomics.waitAsync",
                     "FinalizationRegistry.prototype.cleanupSome",
                     "Float16Array",
                     "Intl.Locale-info",
                     "ShadowRealm",
-                    "String.prototype.isWellFormed",
-                    "String.prototype.toWellFormed",
-                    "array-grouping",
-                    "arraybuffer-transfer",
                     "decorators",
                     "json-parse-with-source",
-                    "promise-with-resolvers",
     });
 
     public Test262Runnable(TestSuite suite, TestFile testFile) {

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

@@ -93,19 +93,16 @@ public class TestV8Runnable extends TestRunnable {
                     "--experimental-wasm-stringref",
                     "--experimental-wasm-type-reflection",
                     "--expose-fast-api",
-                    "--harmony-rab-gsab",
                     "--harmony-struct",
                     "--wasm-test-streaming"
     });
     private static final Set<String> STAGING_FLAGS = featureSet(new String[]{
                     "--harmony",
                     "--harmony-array-from-async",
-                    "--harmony-array-grouping",
                     "--harmony-intl-locale-info-func",
                     "--harmony-json-parse-with-source",
                     "--harmony-shadow-realm",
                     "--harmony-weak-refs-with-cleanup-some",
-                    "--js-promise-withresolvers",
     });
 
     private static final String FLAGS_PREFIX = "// Flags: ";

graal-js/src/com.oracle.truffle.js.test/js/decorators/hello_decorators_es2023.js renamed to graal-js/src/com.oracle.truffle.js.test/js/decorators/hello_decorators.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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.