From a1b846c9e5de5f380c7030beb8e4b7fabcbdb048 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2025 12:56:12 +0100 Subject: [PATCH] build: try removing embedder exception patch (#45464) * build: try removing embedder exception patch Co-authored-by: Shelley Vohr * fixup .patches after trop --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr Co-authored-by: John Kleinschmidt --- patches/node/.patches | 1 - ...bedder_exceptions_before_entering_v8.patch | 25 ------------------- 2 files changed, 26 deletions(-) delete mode 100644 patches/node/fix_capture_embedder_exceptions_before_entering_v8.patch diff --git a/patches/node/.patches b/patches/node/.patches index b0846c3883e6..6c93c758fcf4 100644 --- a/patches/node/.patches +++ b/patches/node/.patches @@ -22,7 +22,6 @@ test_formally_mark_some_tests_as_flaky.patch fix_do_not_resolve_electron_entrypoints.patch ci_ensure_node_tests_set_electron_run_as_node.patch fix_assert_module_in_the_renderer_process.patch -fix_capture_embedder_exceptions_before_entering_v8.patch test_make_test-node-output-v8-warning_generic.patch fix_revert_src_lb_reducing_c_calls_of_esm_legacy_main_resolve.patch fix_remove_deprecated_errno_constants.patch diff --git a/patches/node/fix_capture_embedder_exceptions_before_entering_v8.patch b/patches/node/fix_capture_embedder_exceptions_before_entering_v8.patch deleted file mode 100644 index ac22a29a4152..000000000000 --- a/patches/node/fix_capture_embedder_exceptions_before_entering_v8.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: deepak1556 -Date: Tue, 26 Dec 2023 02:10:42 +0900 -Subject: fix: capture embedder exceptions before entering V8 - -Upstrem bug: https://github.com/nodejs/node-v8/issues/274 - -The patch only addresses the callsites that triggered failing DCHECKS -in the nodejs test suite. Need to be followed-up with upstream -on the broader change as there maybe other callsites. - -diff --git a/src/handle_wrap.cc b/src/handle_wrap.cc -index 70db7ddbeab5963f1bdf6cb05ee2763d76011cec..6ffe2a2ad01f33ff68c6646df330ec3ac7781a19 100644 ---- a/src/handle_wrap.cc -+++ b/src/handle_wrap.cc -@@ -148,6 +148,9 @@ void HandleWrap::OnClose(uv_handle_t* handle) { - wrap->OnClose(); - wrap->handle_wrap_queue_.Remove(); - -+ if (env->isolate()->IsExecutionTerminating()) -+ return; -+ - if (!wrap->persistent().IsEmpty() && - wrap->object() - ->Has(env->context(), env->handle_onclose_symbol())