[GR-67852] Backport to 25.0: Merge master into release branch.

PullRequest: js/3570

Author: woess

3rd_party_licenses.txt

@@ -512,7 +512,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
 
 ================================================================================
 
-Node.js 22.15.1
+Node.js 22.17.1
 
 Node.js is licensed for use as follows:
 

CHANGELOG.md

@@ -7,11 +7,12 @@ See [release calendar](https://www.graalvm.org/release-calendar/) for release da
 
 ## Version 25.0.0
 * ECMAScript 2025 mode/features enabled by default.
-* Updated Node.js to version 22.15.1.
+* Updated Node.js to version 22.17.1.
 * Implemented the [`Intl.DurationFormat`](https://github.com/tc39/proposal-intl-duration-format) proposal.
 * Made option `js.text-encoding` stable and allowed in `SandboxPolicy.CONSTRAINED`.
 * Implemented the [`import defer`](https://github.com/tc39/proposal-defer-import-eval) proposal. It is available in ECMAScript staging mode (`--js.ecmascript-version=staging`).
 * Implemented the [`Upsert`](https://github.com/tc39/proposal-upsert) proposal. It is available in ECMAScript staging mode (`--js.ecmascript-version=staging`).
+* Enabled source phase imports from WebAssembly modules (`import source mod from "./mod.wasm"`) by default if the `js.webassembly` option is enabled and the `js.source-phase-imports` option is not explicitly set to `false`.
 
 ## Version 24.2.0
 * Updated Node.js to version 22.13.1.

ci/common.jsonnet

@@ -56,7 +56,7 @@ local common_json = import "../common.json";
     [name]: jdk_base + common_json.jdks[name] + { jdk_version:: 21 }
     for name in ["oraclejdk21"] + variants("labsjdk-ce-21") + variants("labsjdk-ee-21")
   } + {
-    'oraclejdk23': jdk_base + common_json.jdks["oraclejdk23"] + { jdk_version:: 23 },
+    'oraclejdk24': jdk_base + common_json.jdks["oraclejdk24"] + { jdk_version:: 24 },
   } + {
     [name]: jdk_base + common_json.jdks[name] + { jdk_version:: parse_labsjdk_version(self), jdk_name:: "jdk-latest"}
     for name in ["oraclejdk-latest"] + variants("labsjdk-ce-latest") + variants("labsjdk-ee-latest")
@@ -205,6 +205,12 @@ local common_json = import "../common.json";
       },
     },
 
+    cmake:: {
+      packages+: {
+        cmake: "==3.22.2",
+      },
+    },
+
     gradle:: {
       downloads+: {
         GRADLE_JAVA_HOME: jdks_data["oraclejdk21"],
@@ -221,10 +227,8 @@ local common_json = import "../common.json";
     # GR-49566: SpotBugs does not yet run on JDK 22
     spotbugs: code_tools,
 
-    sulong:: {
-      packages+: {
-        cmake: "==3.22.2",
-      } + if self.os == "windows" then {
+    sulong:: self.cmake + {
+      packages+: if self.os == "windows" then {
         msvc_source: "==14.0",
       } else {},
     },
@@ -259,7 +263,7 @@ local common_json = import "../common.json";
       } else {},
     },
 
-    graalpy:: self.gradle + {
+    graalpy:: self.gradle + self.cmake + {
       packages+: if (self.os == "linux") then {
         libffi: '>=3.2.1',
         bzip2: '>=1.0.6',
@@ -286,9 +290,8 @@ local common_json = import "../common.json";
         if (self.os == "linux" && self.arch == "amd64") then {
           readline: '==6.3',
           pcre2: '==10.37',
-          curl: '==7.50.1',
           gnur: '==4.0.3-gcc4.8.5-pcre2',
-        }
+        } + if (std.objectHasAll(self, 'os_distro') && self['os_distro'] == 'ol' && std.objectHasAll(self, 'os_distro_version') && self['os_distro_version'] == '9') then {curl: '==7.78.0'} else {curl: '==7.50.1'}
         else if (self.os == "darwin" && self.arch == "amd64") then {
           'pcre2': '==10.37',
         } else {},
@@ -451,18 +454,21 @@ local common_json = import "../common.json";
     local aarch64 = { arch:: "aarch64", capabilities+: [self.arch] },
 
     local ol_distro = { os_distro:: "ol" },
+    local ol7_distro = ol_distro + { os_distro_version:: "7" },
+    local ol8_distro = ol_distro + { os_distro_version:: "8" },
+    local ol9_distro = ol_distro + { os_distro_version:: "9" },
 
     linux_amd64: self.linux_amd64_ol7,
-    linux_amd64_ol7: linux + amd64 + ol7 + ol_distro,
-    linux_amd64_ol8: linux + amd64 + ol8 + ol_distro,
-    linux_amd64_ol9: linux + amd64 + ol9 + ol_distro,
+    linux_amd64_ol7: linux + amd64 + ol7 + ol7_distro,
+    linux_amd64_ol8: linux + amd64 + ol8 + ol8_distro,
+    linux_amd64_ol9: linux + amd64 + ol9 + ol9_distro,
 
     linux_aarch64: self.linux_aarch64_ol7,
-    linux_aarch64_ol7: linux + aarch64 + ol7 + ol_distro,
-    linux_aarch64_ol8: linux + aarch64 + ol8 + ol_distro,
-    linux_aarch64_ol9: linux + aarch64 + ol9 + ol_distro,
+    linux_aarch64_ol7: linux + aarch64 + ol7 + ol7_distro,
+    linux_aarch64_ol8: linux + aarch64 + ol8 + ol8_distro,
+    linux_aarch64_ol9: linux + aarch64 + ol9 + ol9_distro,
 
-    linux_amd64_ubuntu: linux + amd64 + ubuntu22 + { os_distro:: "ubuntu" },
+    linux_amd64_ubuntu: linux + amd64 + ubuntu22 + { os_distro:: "ubuntu", os_distro_version:: "22" },
 
     darwin_amd64: darwin + amd64,
     darwin_aarch64: darwin + aarch64,

common.json

@@ -4,11 +4,11 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.51.2",
+  "mx_version": "7.54.5",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
-    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+22-2657", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+26-3156", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.7",  "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -43,15 +43,15 @@
     "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.6", "platformspecific": true },
 
-    "oraclejdk23":       {"name": "jpg-jdk",   "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "oraclejdk24":       {"name": "jpg-jdk",   "version": "24", "build_id": "jdk-24.0.1+9", "platformspecific": true, "extrabundles": ["static-libs"]},
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+22", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25+22-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25+22-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25+22-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25+22-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25+22-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25+22-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+32", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25+32-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25+32-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25+32-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25+32-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25+32-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25+32-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

graal-js/mx.graal-js/mx_graal_js.py

@@ -53,7 +53,7 @@
 TEST262_REPO = "https://" + "github.com/tc39/test262.git"
 
 # Git revision of Test262 to checkout
-TEST262_REV = "3316c0aaf676d657f5a6b33364fa7e579c78ac7f"
+TEST262_REV = "942e65f505e9d846c1b995750b5bce8c31d11fce"
 
 # Git repository of V8
 TESTV8_REPO = "https://" + "github.com/v8/v8.git"
@@ -529,7 +529,7 @@ def is_included(path):
 def mx_register_dynamic_suite_constituents(register_project, register_distribution):
     if register_project and register_distribution:
         isolate_build_options = ['-H:+AuxiliaryEngineCache', '-H:ReservedAuxiliaryImageBytes=2145482548'] if not mx.is_windows() else []
-        meta_pom = [p for p in _suite.dists if p.name == 'JS_COMMUNITY'][0]
+        meta_pom = [p for p in _suite.dists if p.name == 'JS_POM'][0]
         mx_truffle.register_polyglot_isolate_distributions(_suite, register_project, register_distribution,'js',
                                         'src', meta_pom.name, meta_pom.maven_group_id(), meta_pom.theLicense,
                                         isolate_build_options=isolate_build_options)
@@ -539,11 +539,9 @@ def is_wasm_available():
 
 # Functions called from suite.py
 
-def has_suite(name):
-    return mx.suite(name, fatalIfMissing=False)
-
 def graaljs_standalone_deps():
-    deps = mx_truffle.resolve_truffle_dist_names()
+    include_truffle_runtime = not mx.env_var_to_bool("EXCLUDE_TRUFFLE_RUNTIME")
+    deps = mx_truffle.resolve_truffle_dist_names(use_optimized_runtime=include_truffle_runtime)
     if is_wasm_available():
         deps += ['wasm:WASM']
     return deps
@@ -554,6 +552,7 @@ def libjsvm_build_args():
             '-H:+AuxiliaryEngineCache',
             '-H:ReservedAuxiliaryImageBytes=2145482548',
         ]
+        # GR-64948: On GraalVM 21 some Native Image stable options are incorrectly detected as experimental
         if mx_sdk_vm_ng.get_bootstrap_graalvm_jdk_version() < mx.VersionSpec("25"):
             image_build_args = ['-H:+UnlockExperimentalVMOptions', *image_build_args, '-H:-UnlockExperimentalVMOptions']
         return image_build_args
@@ -564,15 +563,6 @@ def libjsvm_build_args():
     suite=_suite,
     name='Graal.js',
     short_name='js',
-    standalone_dir_name='graaljs-community-<version>-<graalvm_os>-<arch>',
-    standalone_dir_name_enterprise='graaljs-<version>-<graalvm_os>-<arch>',
-    standalone_dependencies={
-        'GraalVM license files': ('', ['GRAALVM-README.md']),
-        'Graal.js license files': ('', []),
-    },
-    standalone_dependencies_enterprise={
-        'GraalVM enterprise license files': ('', ['GRAALVM-README.md']),
-    },
     license_files=[],
     third_party_license_files=[],
     dependencies=[
@@ -598,16 +588,23 @@ def libjsvm_build_args():
                 *(['wasm:WASM'] if is_wasm_available() else [])
             ],
             main_class='com.oracle.truffle.js.shell.JSLauncher',
-            build_args=[],
+            build_args=[
+                # Uncomment to disable JLine FFM provider at native image build time
+                # '-Dorg.graalvm.shadowed.org.jline.terminal.ffm.disable=true',
+                '--enable-native-access=org.graalvm.shadowed.jline',
+            ],
             build_args_enterprise=[
                 '-H:+AuxiliaryEngineCache',
                 '-H:ReservedAuxiliaryImageBytes=2145482548',
             ] if not mx.is_windows() else [],
             language='js',
+            default_vm_args=[
+                '--vm.-enable-native-access=org.graalvm.shadowed.jline',
+            ],
+            # Force launcher and jline on ImageModulePath (needed for --enable-native-access=org.graalvm.shadowed.jline)
+            use_modules='image',
         )
     ],
-    boot_jars=[],
-    installable=True,
     stability="supported",
 ))
 
@@ -624,7 +621,6 @@ def libjsvm_build_args():
         'graal-js:GRAALJS_GRAALVM_LICENSES',
     ],
     priority=5,
-    installable=True,
     stability="supported",
 ))
 
@@ -640,7 +636,6 @@ def libjsvm_build_args():
     support_distributions=[],
     library_configs=[],
     boot_jars=[],
-    installable=True,
     stability="supported",
 ))
 

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

@@ -25,7 +25,7 @@
         {
            "name" : "regex",
            "subdir" : True,
-           "version" : "ed067f1f7c575a638991d34bcab15f895a4b26b7",
+           "version" : "6a816eeb44abca4eb200b5e18db6f64dbd6d44fa",
            "urls" : [
                 {"url" : "https://github.com/oracle/graal.git", "kind" : "git"},
             ]
@@ -455,6 +455,9 @@
         "truffle.attach.library": "../jvmlibs/<lib:truffleattach>",
       },
       "liblang_relpath": "../lib/<lib:jsvm>",
+      "default_vm_args": [
+        "--vm.-enable-native-access=org.graalvm.shadowed.jline",
+      ],
     },
 
     "libjsvm": {
@@ -467,6 +470,9 @@
         "-Dpolyglot.image-build-time.PreinitializeContexts=js",
         # Configure launcher
         "-Dorg.graalvm.launcher.class=com.oracle.truffle.js.shell.JSLauncher",
+        # uncomment to disable JLine FFM provider at native image build time
+        #"-Dorg.graalvm.shadowed.org.jline.terminal.ffm.disable=true",
+        "--enable-native-access=org.graalvm.shadowed.jline",
       ],
       "dynamicBuildArgs": "libjsvm_build_args",
     },
@@ -477,6 +483,7 @@
       "moduleInfo" : {
         "name" : "org.graalvm.js",
         "exports" : [
+          "com.oracle.truffle.js.api",
           "com.oracle.truffle.js.lang to org.graalvm.truffle",
           "com.oracle.js.parser to org.graalvm.nodejs",
           "com.oracle.js.parser.ir to org.graalvm.nodejs",
@@ -532,16 +539,15 @@
       "useModulePath": True,
     },
 
-    "JS_COMMUNITY": {
+    "JS_POM": {
       "type": "pom",
       "runtimeDependencies": [
         "GRAALJS",
         "truffle:TRUFFLE_RUNTIME",
       ],
-      "description":     "GraalJS, a high-performance embeddable JavaScript runtime for Java. This POM dependency includes GraalJS dependencies and Truffle Community Edition.",
-      "descriptionGFTC": "GraalJS, a high-performance embeddable JavaScript runtime for Java. This POM dependency includes GraalJS dependencies and Truffle.",
+      "description":     "GraalJS, a high-performance embeddable JavaScript runtime for Java. This POM dependency includes GraalJS dependencies and Truffle.",
       "maven": {
-        "artifactId": "js-community",
+        "artifactId": "js",
         "tag": ["default", "public"],
       },
       "license": [
@@ -877,6 +883,7 @@
         "standalone_dist": "GRAALJS_NATIVE_STANDALONE",
         "community_archive_name": "graaljs-community",
         "enterprise_archive_name": "graaljs",
+        "language_id": "js",
     },
 
     "GRAALJS_JVM_STANDALONE_RELEASE_ARCHIVE": {
@@ -885,6 +892,7 @@
         "standalone_dist": "GRAALJS_JVM_STANDALONE",
         "community_archive_name": "graaljs-community-jvm",
         "enterprise_archive_name": "graaljs-jvm",
+        "language_id": "js",
     },
 
     "JS_INTEROP_MICRO_BENCHMARKS" : {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, 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
@@ -240,9 +240,9 @@ public boolean isForAwaitOf() {
     }
 
     /**
-     * Is this a for-in or for-of statement?
+     * Is this a for-in, for-of, or for-await-of statement?
      *
-     * @return true if this is a for-in or for-of loop
+     * @return true if this is a for-in, for-of, or for-await-of loop
      */
     public boolean isForInOrOf() {
         return isForIn() || isForOf() || isForAwaitOf();