[GR-57059] Batch backport from master into 24.1 release branch.

PullRequest: js/3228

Author: woess

CHANGELOG.md

@@ -12,6 +12,8 @@ See [release calendar](https://www.graalvm.org/release-calendar/) for release da
 * 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.15.1.
+* Made option `js.esm-eval-returns-exports` stable and allowed in `SandboxPolicy.UNTRUSTED`.
+* Added option `js.stack-trace-api` that enables/disables `Error.captureStackTrace`, `Error.prepareStackTrace` and `Error.stackTraceLimit`.
 
 ## Version 24.0.0
 * Implemented the [WebAssembly threads](https://github.com/WebAssembly/threads) proposal.

ci.jsonnet

@@ -6,7 +6,7 @@ local graalNodeJs = import 'graal-nodejs/ci.jsonnet';
   // Used to run fewer jobs
   local useOverlay = true,
 
-  local overlay = 'ecbe9b07a592111b950bcb2da30a993478a1488a',
+  local overlay = '8687d6f5e142a8fbcedab5a5d62f2c9b22b681b2',
 
   local no_overlay = 'cb733e564850cd37b685fcef6f3c16b59802b22c',
 

common.json

@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.25.5",
+  "mx_version": "7.27.5",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
@@ -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+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 }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+34", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-23+34-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-23+34-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-23+34-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-23+34-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-23+34-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-23+34-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

graal-js/ci.jsonnet

@@ -52,6 +52,8 @@ local ci = import '../ci.jsonnet';
       ['set-export', 'STANDALONE_HOME', ['mx', '--quiet', 'standalone-home', 'js', '--type=jvm']],
       ['${STANDALONE_HOME}/bin/js', '--jvm', '-e', "print('hello:' + Array.from(new Array(10), (x,i) => i*i ).join('|'))"],
       ['${STANDALONE_HOME}/bin/js', '--jvm', '../../js-benchmarks/harness.js', '--', '../../js-benchmarks/octane-richards.js', '--show-warmup'],
+      # maven-downloader smoke test
+      ['VERBOSE_GRAALVM_LAUNCHERS=true', '${STANDALONE_HOME}/bin/js-polyglot-get', '-o', 'maven downloader output', '-a', 'wasm', '-v', '23.1.3'],
     ],
     timelimit: '30:00',
   },
@@ -60,8 +62,8 @@ local ci = import '../ci.jsonnet';
     run+: [
       ['mx', 'build'],
       ['mx', '-v', 'maven-deploy', '--suppress-javadoc', '--validate', 'full', '--licenses', 'UPL,MIT', '--dry-run', 'ossrh', 'https://this-is-only-a-test'],
-      ['mx', '-p', '../../graal/vm', '--dynamicimports', '/tools,/compiler,/graal-js', 'build'],
-      ['mx', '-p', '../../graal/vm', '--dynamicimports', '/tools,/regex,/compiler,/truffle,/sdk,/graal-js', 'maven-deploy', '--suppress-javadoc', '--all-suites', '--version-string', 'GATE'],
+      ['mx', '-p', '../../graal/vm', '--dynamicimports', '/tools,/compiler,/graal-js,/wasm', 'build'],
+      ['mx', '-p', '../../graal/vm', '--dynamicimports', '/tools,/regex,/compiler,/truffle,/sdk,/graal-js,/wasm', 'maven-deploy', '--suppress-javadoc', '--all-suites', '--version-string', 'GATE'],
       ['cd', 'test/maven-demo'],
       ['mvn', '-Dgraalvm.version=GATE', '--batch-mode', 'package'],
       ['mvn', '-Dgraalvm.version=GATE', '--batch-mode', 'exec:exec'],
@@ -107,8 +109,8 @@ local ci = import '../ci.jsonnet';
     nativeimages+:: ['lib:jsvm'],
     graalvmtests:: '../../graalvm-tests',
     run+: [
-      ['mx', 'build'],
-      ['python', '../../graalvm-tests/test.py', '-g', ['mx', '--quiet', 'graalvm-home'], '--print-revisions', '--keep-on-error', 'test/aux-engine-cache'],
+      ['mx', 'build', '--dependencies', 'ALL_GRAALVM_ARTIFACTS'],
+      ['python', self.graalvmtests + '/test.py', '-g', ['mx', '--quiet', 'standalone-home', 'js'], '--print-revisions', '--keep-on-error', 'test/aux-engine-cache', 'test/repl'],
     ],
     timelimit: '1:00:00',
   },
@@ -174,7 +176,7 @@ local ci = import '../ci.jsonnet';
 
   // Benchmark builds; need to run on a benchmark machine
   local benchBuilds = generateBuilds([
-    graalJs + common.bench     + interopJmhBenchmarks                                                     + {name: 'interop-jmh'},
+    graalJs + common.dailyBench+ interopJmhBenchmarks                                                     + {name: 'interop-jmh'},
   ], platforms=[common.jdk21 + common.e3]),
 
   builds: styleBuilds + testingBuilds + otherBuilds + benchBuilds,

graal-js/mx.graal-js/graalvm_launchers/js-polyglot-get

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+source="${BASH_SOURCE[0]}"
+while [ -h "$source" ] ; do
+    prev_source="$source"
+    source="$(readlink "$source")";
+    if [[ "$source" != /* ]]; then
+        # if the link was relative, it was relative to where it came from
+        dir="$( cd -P "$( dirname "$prev_source" )" && pwd )"
+        source="$dir/$source"
+    fi
+done
+
+bin_dir="$( cd -P "$( dirname "$source" )" && pwd )"
+parent_dir="$( dirname "$bin_dir" )"
+
+if [ ! -x "${parent_dir}/jvm/bin/java" ]; then
+    echo "Error: ${parent_dir}/jvm/bin/java not found. $(basename "$0") is not available for the native standalone."
+    exit 1
+fi
+
+if [ "${VERBOSE_GRAALVM_LAUNCHERS}" == "true" ]; then
+    set -x
+fi
+
+exec "${parent_dir}/jvm/bin/java" "-p" "${parent_dir}/modules" "-m" "org.graalvm.maven.downloader/org.graalvm.maven.downloader.Main" "$@"

graal-js/mx.graal-js/graalvm_launchers/js-polyglot-get.cmd

@@ -0,0 +1,24 @@
+@echo off
+setlocal enabledelayedexpansion
+
+call :dirname "%~0" bin_dir
+call :dirname "%bin_dir%" parent_dir
+
+if not exist "%parent_dir%/jvm/bin/java.exe" (
+    echo "Error: %parent_dir%/jvm/bin/java.exe not found. %~nx0 is not available for the native standalone."
+    exit /b 1
+)
+
+if "%VERBOSE_GRAALVM_LAUNCHERS%"=="true" echo on
+
+"%parent_dir%/jvm/bin/java.exe" -p "%parent_dir%/modules" -m "org.graalvm.maven.downloader/org.graalvm.maven.downloader.Main" %*
+
+@echo off
+exit /b %errorlevel%
+
+:dirname file output
+  setlocal
+  set "dir=%~dp1"
+  set "dir=%dir:~0,-1%"
+  endlocal & set "%2=%dir%"
+  exit /b 0

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

@@ -47,7 +47,7 @@
 TEST262_REPO = "https://" + "github.com/tc39/test262.git"
 
 # Git revision of Test262 to checkout
-TEST262_REV = "007b333af22d8b8466be3394b9248345ac4445c9"
+TEST262_REV = "a15874163e6a4f19ee7cd3e47592af382af0f5fd"
 
 # Git repository of V8
 TESTV8_REPO = "https://" + "github.com/v8/v8.git"
@@ -159,9 +159,11 @@ def processDeps(self, deps):
     def apply(self, config):
         (vmArgs, mainClass, mainClassArgs) = config
         # Disable DefaultRuntime warning
-        vmArgs = vmArgs + ['-Dpolyglot.engine.WarnInterpreterOnly=false']
-        # Assert for enter/return parity of ProbeNode
-        vmArgs = vmArgs + ['-Dpolyglot.engine.AssertProbes=true', '-Dpolyglot.engine.AllowExperimentalOptions=true']
+        vmArgs += ['-Dpolyglot.engine.WarnInterpreterOnly=false']
+        vmArgs += ['-Dpolyglot.engine.AllowExperimentalOptions=true']
+        # Assert for enter/return parity of ProbeNode (if assertions are enabled only)
+        if next((arg.startswith('-e') for arg in reversed(vmArgs) if arg in ['-ea', '-da', '-enableassertions', '-disableassertions']), False):
+            vmArgs += ['-Dpolyglot.engine.AssertProbes=true']
         vmArgs += ['-Dpolyglotimpl.DisableClassPathIsolation=true']
         mainClassArgs += ['-JUnitOpenPackages', 'org.graalvm.js/*=com.oracle.truffle.js.test']
         mainClassArgs += ['-JUnitOpenPackages', 'org.graalvm.js/*=com.oracle.truffle.js.snapshot']
@@ -503,6 +505,7 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
     ],
     truffle_jars=[
         'graal-js:GRAALJS',
+        'sdk:MAVEN_DOWNLOADER',
     ],
     support_distributions=[
         'graal-js:GRAALJS_GRAALVM_SUPPORT',

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

@@ -24,7 +24,7 @@
         {
            "name" : "regex",
            "subdir" : True,
-           "version" : "6c4f42bf5368c480ef2c9c29f0163d30d827b001",
+           "version" : "0262bebe5db5f6f48ada94821a889a7b414279c4",
            "urls" : [
                 {"url" : "https://github.com/oracle/graal.git", "kind" : "git"},
             ]
@@ -438,6 +438,7 @@
           "com.oracle.truffle.js.lang to org.graalvm.nodejs",
           "com.oracle.truffle.js.nodes to org.graalvm.nodejs",
           "com.oracle.truffle.js.nodes.access to org.graalvm.nodejs",
+          "com.oracle.truffle.js.nodes.array to org.graalvm.nodejs",
           "com.oracle.truffle.js.nodes.arguments to org.graalvm.nodejs",
           "com.oracle.truffle.js.nodes.cast to org.graalvm.nodejs",
           "com.oracle.truffle.js.nodes.function to org.graalvm.nodejs",
@@ -690,12 +691,16 @@
 
     "GRAALJS_GRAALVM_SUPPORT" : {
       "native" : True,
+      "platformDependent" : True,
       "description" : "Graal.js support distribution for the GraalVM",
       "layout" : {
         "native-image.properties": "file:mx.graal-js/native-image.properties",
         "./": [
           "file:README.md",
         ],
+        "bin/": [
+          "file:mx.graal-js/graalvm_launchers/<cmd:js-polyglot-get>",
+        ]
       },
     },
 

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

@@ -615,7 +615,26 @@ public void parseFormalParameterList() {
             scanFirstToken();
 
             assert lc.getCurrentScope() == null;
-            formalParameterList(TokenType.EOF, false, false);
+
+            // Set up a fake function.
+            final int functionLine = line;
+            final long functionToken = Token.toDesc(FUNCTION, 0, source.getLength());
+            final IdentNode ident = new IdentNode(functionToken, Token.descPosition(functionToken), lexer.stringIntern(PROGRAM_NAME));
+            final ParserContextFunctionNode function = createParserContextFunctionNode(ident, functionToken, 0, functionLine);
+            function.clearFlag(FunctionNode.IS_PROGRAM);
+
+            lc.push(function);
+            try {
+                final ParserContextBlockNode parameterBlock = function.createParameterBlock();
+                lc.push(parameterBlock);
+                try {
+                    formalParameterList(TokenType.EOF, false, false);
+                } finally {
+                    restoreBlock(parameterBlock);
+                }
+            } finally {
+                lc.pop(function);
+            }
         } catch (ParserException e) {
             handleParseException(e);
         }
@@ -2681,9 +2700,7 @@ private IdentNode bindingIdentifier(boolean yield, boolean await, String context
 
     private void addIdentifierReference(String name) {
         Scope currentScope = lc.getCurrentScope();
-        if (currentScope != null) { // can be null when parsing/verifying a parameter list.
-            currentScope.addIdentifierReference(name);
-        }
+        currentScope.addIdentifierReference(name);
     }
 
     private Expression bindingPattern(boolean yield, boolean await) {

graal-js/src/com.oracle.truffle.js.scriptengine.test/src/com/oracle/truffle/js/scriptengine/test/JSONCompatibleTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, 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
@@ -41,8 +41,8 @@
 package com.oracle.truffle.js.scriptengine.test;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 
 import java.util.Arrays;
 import java.util.List;

graal-js/src/com.oracle.truffle.js.scriptengine.test/src/com/oracle/truffle/js/scriptengine/test/TestEngine.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, 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
@@ -76,7 +76,7 @@ public class TestEngine {
 
     private final ScriptEngineManager manager = new ScriptEngineManager();
 
-    @Rule public ExpectedException expectedException = ExpectedException.none();
+    @SuppressWarnings("deprecation") @Rule public ExpectedException expectedException = ExpectedException.none();
 
     private ScriptEngine getEngine() {
         return manager.getEngineByName(TESTED_ENGINE_NAME);

graal-js/src/com.oracle.truffle.js.shell/src/com/oracle/truffle/js/shell/JSLauncher.java

@@ -396,7 +396,7 @@ private static int handlePolyglotException(PolyglotException e) {
             printError(e, System.err);
             status = 7;
         } else if (!e.isInternalError()) {
-            printStackTraceSkipTrailingHost(e, System.err);
+            printGuestException(e, System.err);
             status = 7;
         } else {
             e.printStackTrace();
@@ -433,7 +433,7 @@ private static int runREPL(Context context) {
                 } else if (e.isSyntaxError()) {
                     printError(e, System.err);
                 } else if (!e.isInternalError()) {
-                    printStackTraceSkipTrailingHost(e, System.err);
+                    printGuestException(e, System.err);
                 } else {
                     e.printStackTrace();
                     return 8;
@@ -459,7 +459,57 @@ private static void printError(Throwable e, PrintStream output) {
         }
     }
 
-    private static void printStackTraceSkipTrailingHost(PolyglotException e, PrintStream output) {
+    private static Value getErrorsFromAggregateError(Value guestException) {
+        if (guestException.isException() && guestException.hasMembers()) {
+            Value errorMetaObject = guestException.getMetaObject();
+            if (errorMetaObject != null && "AggregateError".equals(errorMetaObject.getMetaSimpleName())) {
+                Value errors = guestException.getMember("errors");
+                if (errors != null && errors.hasArrayElements()) {
+                    return errors;
+                }
+            }
+        }
+        return null;
+    }
+
+    private static void printGuestException(PolyglotException e, PrintStream err) {
+        StringBuilder output = new StringBuilder();
+        printStackTraceSkipTrailingHost(e, output, "");
+        Value guestException = e.getGuestObject();
+        if (guestException != null) {
+            int safeLength = output.length();
+            try {
+                // Print all errors of an AggregateError
+                Value errors = getErrorsFromAggregateError(guestException);
+                if (errors != null) {
+                    long size = errors.getArraySize();
+                    output.append(" {").append(System.lineSeparator());
+                    output.append("  [errors]: [").append(System.lineSeparator());
+                    String indent = " ".repeat(4);
+                    for (long i = 0; i < size; i++) {
+                        Value error = errors.getArrayElement(i);
+                        if (error.isException()) {
+                            printStackTraceSkipTrailingHost(error.as(PolyglotException.class), output, indent);
+                        } else {
+                            output.append(error.toString());
+                        }
+                        if (i != size - 1) {
+                            output.append(",");
+                        }
+                        output.append(System.lineSeparator());
+                    }
+                    output.append("  ]").append(System.lineSeparator());
+                    output.append("}");
+                }
+            } catch (PolyglotException ignored) {
+                // Erase any incomplete output.
+                output.setLength(safeLength);
+            }
+        }
+        err.println(output);
+    }
+
+    private static void printStackTraceSkipTrailingHost(PolyglotException e, StringBuilder output, String indent) {
         List<PolyglotException.StackFrame> stackTrace = new ArrayList<>();
         for (PolyglotException.StackFrame s : e.getPolyglotStackTrace()) {
             stackTrace.add(s);
@@ -473,9 +523,11 @@ private static void printStackTraceSkipTrailingHost(PolyglotException e, PrintSt
                 break;
             }
         }
-        output.println(e.isHostException() ? e.asHostException().toString() : e.getMessage());
+        String message = e.isHostException() ? e.asHostException().toString() : e.getMessage();
+        output.append(indent).append(message);
         for (PolyglotException.StackFrame s : stackTrace) {
-            output.println("\tat " + s);
+            output.append(System.lineSeparator());
+            output.append(indent).append("    at ").append(s);
         }
     }
 

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

@@ -265,6 +265,7 @@ public class Test262Runnable extends TestRunnable {
                     "Intl.DurationFormat",
                     "IsHTMLDDA",
                     "explicit-resource-management",
+                    "promise-try",
                     "regexp-modifiers",
                     "tail-call-optimization",
     });

graal-js/src/com.oracle.truffle.js.test/js/GR-53714.js

@@ -9,6 +9,7 @@
  * Regression test of the handling of long values.
  * 
  * @option temporal
+ * @option v8-compat
  */
 
 load('assert.js');

graal-js/src/com.oracle.truffle.js.test/js/GR-54723.js

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 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.
+ */
+
+load("assert.js");
+
+var time = java.lang.System.currentTimeMillis?.();
+assertSame('number', typeof time);
+
+var result = java.lang.System.iDontExist?.();
+assertSame('undefined', typeof result);