From 1323f07889c45a03c67bfa726953911bccf904c7 Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 15:51:07 -0500 Subject: [PATCH] chore: bump node to v18.14.0 (main) (#37129) * chore: bump node in DEPS to v18.14.0 * src: add support for externally shared js builtins https://github.com/nodejs/node/pull/44376 * test: fix test broken under --node-builtin-modules-path https://github.com/nodejs/node/pull/45894 * build: add option to disable shared readonly heap https://github.com/nodejs/node/pull/45887 * src: remove unnecessary semicolons https://github.com/nodejs/node/pull/46171 * src: remove return after abort https://github.com/nodejs/node/pull/46172 * chore: fixup patch indices * test_runner: parse yaml https://github.com/nodejs/node/pull/45815 * src: use simdutf for converting externalized builtins to UTF-16 https://github.com/nodejs/node/pull/46119 * src: rename internal module declaration as internal bindings https://github.com/nodejs/node/pull/45551 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr --- patches/node/.patches | 2 -- .../node/chore_remove_errant_semicolons.patch | 36 ------------------- .../node/chore_remove_unreached_return.patch | 22 ------------ 3 files changed, 60 deletions(-) delete mode 100644 patches/node/chore_remove_errant_semicolons.patch delete mode 100644 patches/node/chore_remove_unreached_return.patch diff --git a/patches/node/.patches b/patches/node/.patches index f71891395b3bf..27cff0e5d1e47 100644 --- a/patches/node/.patches +++ b/patches/node/.patches @@ -37,5 +37,3 @@ allow_embedder_to_control_codegenerationfromstringscallback.patch src_allow_optional_isolation_termination_in_node.patch test_mark_cpu_prof_tests_as_flaky_in_electron.patch lib_fix_broadcastchannel_initialization_location.patch -chore_remove_errant_semicolons.patch -chore_remove_unreached_return.patch diff --git a/patches/node/chore_remove_errant_semicolons.patch b/patches/node/chore_remove_errant_semicolons.patch deleted file mode 100644 index d7fb2a3f8368c..0000000000000 --- a/patches/node/chore_remove_errant_semicolons.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shelley Vohr -Date: Mon, 9 Jan 2023 13:53:36 +0100 -Subject: chore: remove errant semicolons - -- https://github.com/nodejs/node/pull/44179 -- https://github.com/nodejs/node/pull/44193 - -This should be upstreamed. - -diff --git a/src/node_realm.h b/src/node_realm.h -index 9ece8cb38958c364c6177118a5e7443c3a6bdf1a..0d3259a149e94b7d9657959c0ccac25a146978b4 100644 ---- a/src/node_realm.h -+++ b/src/node_realm.h -@@ -55,7 +55,7 @@ class Realm : public MemoryRetainer { - Realm& operator=(Realm&&) = delete; - - SET_MEMORY_INFO_NAME(Realm) -- SET_SELF_SIZE(Realm); -+ SET_SELF_SIZE(Realm) - void MemoryInfo(MemoryTracker* tracker) const override; - - void CreateProperties(); -diff --git a/src/node_util.h b/src/node_util.h -index 616b8c003b2d0dd80e01297ca3fe7e4926220ad7..9590842ae4764dd3363a4d74038d3351f0061177 100644 ---- a/src/node_util.h -+++ b/src/node_util.h -@@ -12,7 +12,7 @@ namespace util { - - class WeakReference : public SnapshotableObject { - public: -- SERIALIZABLE_OBJECT_METHODS(); -+ SERIALIZABLE_OBJECT_METHODS() - - static constexpr FastStringKey type_name{"node::util::WeakReference"}; - static constexpr EmbedderObjectType type_int = diff --git a/patches/node/chore_remove_unreached_return.patch b/patches/node/chore_remove_unreached_return.patch deleted file mode 100644 index 5cd700e5f8ac2..0000000000000 --- a/patches/node/chore_remove_unreached_return.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shelley Vohr -Date: Mon, 9 Jan 2023 14:34:01 +0100 -Subject: chore: remove unreached return - -https://github.com/nodejs/node/pull/44376 added a return after a call to -ABORT(), triggering an unreachable code error. - -This should be upstreamed. - -diff --git a/src/node_builtins.cc b/src/node_builtins.cc -index 25b02f9904127780c68db9b451a7dfcf02a6fc5e..1be20aea500fd9d606c5a38a86b4aef66b49d133 100644 ---- a/src/node_builtins.cc -+++ b/src/node_builtins.cc -@@ -247,7 +247,6 @@ void BuiltinLoader::AddExternalizedBuiltin(const char* id, - fprintf( - stderr, "Cannot load externalized builtin: \"%s:%s\".\n", id, filename); - ABORT(); -- return; - } - - icu::UnicodeString utf16 = icu::UnicodeString::fromUTF8(