[GR-53476] Backport to 24.0: Upgrading the underlying Node.js to version 18.20.2.

PullRequest: js/3122

Author: iamstolis

3rd_party_licenses.txt

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

CHANGELOG.md

@@ -5,6 +5,9 @@ The main focus is on user-observable behavior of the engine.
 Changelog may include unreleased versions.
 See [release calendar](https://www.graalvm.org/release-calendar/) for release dates.
 
+## Version 24.0.2
+* Updated Node.js to version 18.20.2.
+
 ## Version 24.0.1
 * Updated Node.js to version 18.19.1.
 

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/lang/JavaScriptLanguage.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
@@ -186,6 +186,8 @@ public final class JavaScriptLanguage extends TruffleLanguage<JSRealm> {
         ensureErrorClassesInitialized();
     }
 
+    private int realmCount;
+
     public JavaScriptLanguage() {
         this.promiseJobsQueueEmptyAssumption = Truffle.getRuntime().createAssumption("PromiseJobsQueueEmpty");
     }
@@ -359,6 +361,9 @@ private JSContext newJSContext(Env env) {
 
     @Override
     protected void initializeContext(JSRealm realm) {
+        synchronized (this) {
+            realmCount++;
+        }
         realm.initialize();
     }
 
@@ -457,6 +462,13 @@ protected void disposeContext(JSRealm realm) {
             realm.getContext().getTimeProfiler().printCumulative();
         }
         realm.dispose();
+        synchronized (this) {
+            if (--realmCount == 0) {
+                // Clear inverted maps that are no longer needed to ensure
+                // that they are not stored in aux engine cache
+                realm.getContext().clearSymbolInvertedMaps();
+            }
+        }
     }
 
     @Override

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/JSContext.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
@@ -269,6 +269,21 @@ public class JSContext {
     // Used to track singleton symbols allocations across aux engine cache runs.
     private Object symbolUsageMarker = new Object();
 
+    private final Map<Symbol, Void> unregisteredSymbols = new WeakHashMap<>();
+
+    @TruffleBoundary
+    public void unregisteredSymbolCreated(Symbol symbol) {
+        synchronized (this) {
+            unregisteredSymbols.put(symbol, null);
+        }
+    }
+
+    public void clearSymbolInvertedMaps() {
+        for (Symbol symbol : unregisteredSymbols.keySet()) {
+            symbol.clearInvertedMap();
+        }
+    }
+
     public void resetSymbolUsageMarker() {
         CompilerAsserts.neverPartOfCompilation();
         // Symbols that were used exactly once in previous executions, will most-likely

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/Symbol.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
@@ -69,67 +69,67 @@ public final class Symbol implements TruffleObject {
      * A method that determines if a constructor object recognizes an object as one of the
      * constructor's instances. Called by the semantics of the instanceof operator.
      */
-    public static final Symbol SYMBOL_HAS_INSTANCE = Symbol.create(Strings.constant("Symbol.hasInstance"));
+    public static final Symbol SYMBOL_HAS_INSTANCE = createWellKnown(Strings.constant("Symbol.hasInstance"));
     /**
      * A Boolean valued property that if true indicates that an object should be flatten to its
      * array elements by Array.prototype.concat.
      */
-    public static final Symbol SYMBOL_IS_CONCAT_SPREADABLE = Symbol.create(Strings.constant("Symbol.isConcatSpreadable"));
+    public static final Symbol SYMBOL_IS_CONCAT_SPREADABLE = createWellKnown(Strings.constant("Symbol.isConcatSpreadable"));
     /**
      * A method that returns the default iterator for an object. Called by the semantics of the
      * for-of statement.
      */
-    public static final Symbol SYMBOL_ITERATOR = Symbol.create(Strings.constant("Symbol.iterator"));
+    public static final Symbol SYMBOL_ITERATOR = createWellKnown(Strings.constant("Symbol.iterator"));
     /**
      * A method that returns the default asynchronous iterator for an object. Called by the
      * semantics of the for-await-of statement.
      */
-    public static final Symbol SYMBOL_ASYNC_ITERATOR = Symbol.create(Strings.constant("Symbol.asyncIterator"));
+    public static final Symbol SYMBOL_ASYNC_ITERATOR = createWellKnown(Strings.constant("Symbol.asyncIterator"));
     /**
      * A regular expression method that matches the regular expression against a string. Called by
      * the String.prototype.match method.
      */
-    public static final Symbol SYMBOL_MATCH = Symbol.create(Strings.constant("Symbol.match"));
+    public static final Symbol SYMBOL_MATCH = createWellKnown(Strings.constant("Symbol.match"));
     /**
      * A regular expression method that returns an iterator, that yields matches of the regular
      * expression against a string. Called by the String.prototype.matchAll method.
      */
-    public static final Symbol SYMBOL_MATCH_ALL = Symbol.create(Strings.constant("Symbol.matchAll"));
+    public static final Symbol SYMBOL_MATCH_ALL = createWellKnown(Strings.constant("Symbol.matchAll"));
     /**
      * A regular expression method that replaces matched substrings of a string. Called by the
      * String.prototype.replace method.
      */
-    public static final Symbol SYMBOL_REPLACE = Symbol.create(Strings.constant("Symbol.replace"));
+    public static final Symbol SYMBOL_REPLACE = createWellKnown(Strings.constant("Symbol.replace"));
     /**
      * A regular expression method that returns the index within a string that matches the regular
      * expression. Called by the String.prototype.search method.
      */
-    public static final Symbol SYMBOL_SEARCH = Symbol.create(Strings.constant("Symbol.search"));
+    public static final Symbol SYMBOL_SEARCH = createWellKnown(Strings.constant("Symbol.search"));
     /**
      * A function valued property that is the constructor function that is used to create derived
      * objects.
      */
-    public static final Symbol SYMBOL_SPECIES = Symbol.create(Strings.constant("Symbol.species"));
+    public static final Symbol SYMBOL_SPECIES = createWellKnown(Strings.constant("Symbol.species"));
     /**
      * A regular expression method that splits a string at the indices that match the regular
      * expression. Called by the String.prototype.split method.
      */
-    public static final Symbol SYMBOL_SPLIT = Symbol.create(Strings.constant("Symbol.split"));
+    public static final Symbol SYMBOL_SPLIT = createWellKnown(Strings.constant("Symbol.split"));
     /**
      * A method that converts an object to a corresponding primitive value. Called by the
      * ToPrimitive abstract operation.
      */
-    public static final Symbol SYMBOL_TO_PRIMITIVE = Symbol.create(Strings.constant("Symbol.toPrimitive"));
+    public static final Symbol SYMBOL_TO_PRIMITIVE = createWellKnown(Strings.constant("Symbol.toPrimitive"));
     /**
      * A property whose String value that is used in the creation of the default string description
      * of an object. Called by the built-in method Object.prototype.toString.
      */
-    public static final Symbol SYMBOL_TO_STRING_TAG = Symbol.create(Strings.constant("Symbol.toStringTag"));
+    public static final Symbol SYMBOL_TO_STRING_TAG = createWellKnown(Strings.constant("Symbol.toStringTag"));
     /**
      * A property whose value is an Object whose own property names are property names that are
      * excluded from the with environment bindings of the associated object.
      */
-    public static final Symbol SYMBOL_UNSCOPABLES = Symbol.create(Strings.constant("Symbol.unscopables"));
+    public static final Symbol SYMBOL_UNSCOPABLES = createWellKnown(Strings.constant("Symbol.unscopables"));
 
     /**
      * [[Description]] of Symbol if it is a String value, {@code null} otherwise ([[Description]] is
@@ -154,6 +154,12 @@ private Symbol(TruffleString description, boolean registered, boolean isPrivate)
     }
 
     public static Symbol create(TruffleString description) {
+        Symbol symbol = new Symbol(description, false, false);
+        JavaScriptLanguage.getCurrentLanguage().getJSContext().unregisteredSymbolCreated(symbol);
+        return symbol;
+    }
+
+    private static Symbol createWellKnown(TruffleString description) {
         return new Symbol(description, false, false);
     }
 
@@ -269,4 +275,9 @@ public void setInvertedMap(Map<WeakMap, Object> invMap) {
         assert this.invertedMap == null;
         this.invertedMap = invMap;
     }
+
+    void clearInvertedMap() {
+        this.invertedMap = null;
+    }
+
 }

graal-nodejs/.eslintrc.js

@@ -44,10 +44,7 @@ module.exports = {
   parserOptions: {
     babelOptions: {
       plugins: [
-        [
-          Module._findPath('@babel/plugin-syntax-import-attributes'),
-          { deprecatedAssertSyntax: true },
-        ],
+        Module._findPath('@babel/plugin-syntax-import-attributes'),
       ],
     },
     requireConfigFile: false,

graal-nodejs/CHANGELOG.md

@@ -32,7 +32,10 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V18.md#18.19.1">18.19.1</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V18.md#18.20.2">18.20.2</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V18.md#18.20.1">18.20.1</a><br/>
+<a href="doc/changelogs/CHANGELOG_V18.md#18.20.0">18.20.0</a><br/>
+<a href="doc/changelogs/CHANGELOG_V18.md#18.19.1">18.19.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V18.md#18.19.0">18.19.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V18.md#18.18.2">18.18.2</a><br/>
 <a href="doc/changelogs/CHANGELOG_V18.md#18.18.1">18.18.1</a><br/>

graal-nodejs/benchmark/_http-benchmarkers.js

@@ -12,11 +12,16 @@ exports.PORT = Number(process.env.PORT) || 12346;
 
 class AutocannonBenchmarker {
   constructor() {
+    const shell = (process.platform === 'win32');
     this.name = 'autocannon';
-    this.executable =
-      process.platform === 'win32' ? 'autocannon.cmd' : 'autocannon';
-    const result = child_process.spawnSync(this.executable, ['-h']);
-    this.present = !(result.error && result.error.code === 'ENOENT');
+    this.opts = { shell };
+    this.executable = shell ? 'autocannon.cmd' : 'autocannon';
+    const result = child_process.spawnSync(this.executable, ['-h'], this.opts);
+    if (shell) {
+      this.present = (result.status === 0);
+    } else {
+      this.present = !(result.error && result.error.code === 'ENOENT');
+    }
   }
 
   create(options) {
@@ -27,11 +32,15 @@ class AutocannonBenchmarker {
       '-n',
     ];
     for (const field in options.headers) {
-      args.push('-H', `${field}=${options.headers[field]}`);
+      if (this.opts.shell) {
+        args.push('-H', `'${field}=${options.headers[field]}'`);
+      } else {
+        args.push('-H', `${field}=${options.headers[field]}`);
+      }
     }
     const scheme = options.scheme || 'http';
     args.push(`${scheme}://127.0.0.1:${options.port}${options.path}`);
-    const child = child_process.spawn(this.executable, args);
+    const child = child_process.spawn(this.executable, args, this.opts);
     return child;
   }
 

graal-nodejs/benchmark/vm/compile-script-in-isolate-cache.js

@@ -0,0 +1,35 @@
+'use strict';
+
+// This benchmarks compiling scripts that hit the in-isolate compilation
+// cache (by having the same source).
+const common = require('../common.js');
+const fs = require('fs');
+const vm = require('vm');
+const fixtures = require('../../test/common/fixtures.js');
+const scriptPath = fixtures.path('snapshot', 'typescript.js');
+
+const bench = common.createBenchmark(main, {
+  type: ['with-dynamic-import-callback', 'without-dynamic-import-callback'],
+  n: [100],
+});
+
+const scriptSource = fs.readFileSync(scriptPath, 'utf8');
+
+function main({ n, type }) {
+  let script;
+  bench.start();
+  const options = {};
+  switch (type) {
+    case 'with-dynamic-import-callback':
+      // Use a dummy callback for now until we really need to benchmark it.
+      options.importModuleDynamically = async () => {};
+      break;
+    case 'without-dynamic-import-callback':
+      break;
+  }
+  for (let i = 0; i < n; i++) {
+    script = new vm.Script(scriptSource, options);
+  }
+  bench.end(n);
+  script.runInThisContext();
+}

graal-nodejs/common.gypi

@@ -36,7 +36,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.28',
+    'v8_embedder_string': '-node.36',
 
     ##### V8 defaults for Node.js #####