diff --git a/patches/node/.patches b/patches/node/.patches index 1108c209c3644..7b8be206464f2 100644 --- a/patches/node/.patches +++ b/patches/node/.patches @@ -25,7 +25,6 @@ fix_-wincompatible-pointer-types-discards-qualifiers_error.patch fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch fix_allow_preventing_initializeinspector_in_env.patch src_allow_embedders_to_provide_a_custom_pageallocator_to.patch -allow_preventing_preparestacktracecallback.patch fix_remove_outdated_--experimental-wasm-bigint_flag.patch fix_crypto_tests_to_run_with_bssl.patch src_inline_asynccleanuphookhandle_in_headers.patch diff --git a/patches/node/allow_preventing_preparestacktracecallback.patch b/patches/node/allow_preventing_preparestacktracecallback.patch deleted file mode 100644 index 2f0f8c336254f..0000000000000 --- a/patches/node/allow_preventing_preparestacktracecallback.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shelley Vohr -Date: Mon, 7 Dec 2020 16:54:23 -0800 -Subject: Allow preventing PrepareStackTraceCallback - -Node.js sets a stack trace handler specific to the v8::Context -corresponding to the current Environment. When we're running in a -non-Node.js v8::Context, there will be no correspondent Environment - we -therefore need to prevent this handler being set so that Blink falls back to its -default handling and displays the correct stacktrace. - -diff --git a/src/api/environment.cc b/src/api/environment.cc -index a8cf0d763f78c2752e3aa22479dadd9fa53c222f..8ccc0638b32039571c4a56725e21f0353b592984 100644 ---- a/src/api/environment.cc -+++ b/src/api/environment.cc -@@ -228,9 +228,11 @@ void SetIsolateErrorHandlers(v8::Isolate* isolate, const IsolateSettings& s) { - s.fatal_error_callback : OnFatalError; - isolate->SetFatalErrorHandler(fatal_error_cb); - -- auto* prepare_stack_trace_cb = s.prepare_stack_trace_callback ? -- s.prepare_stack_trace_callback : PrepareStackTraceCallback; -- isolate->SetPrepareStackTraceCallback(prepare_stack_trace_cb); -+ if ((s.flags & SHOULD_NOT_SET_PREPARE_STACK_TRACE_CALLBACK) == 0) { -+ auto* prepare_stack_trace_cb = s.prepare_stack_trace_callback ? -+ s.prepare_stack_trace_callback : PrepareStackTraceCallback; -+ isolate->SetPrepareStackTraceCallback(prepare_stack_trace_cb); -+ } - } - - void SetIsolateMiscHandlers(v8::Isolate* isolate, const IsolateSettings& s) { -diff --git a/src/node.h b/src/node.h -index 14893ad605b9f8c64b0b8fc28625e235655dcd63..f150725b54ee1315476d202797963369490d5152 100644 ---- a/src/node.h -+++ b/src/node.h -@@ -340,7 +340,8 @@ class NODE_EXTERN MultiIsolatePlatform : public v8::Platform { - enum IsolateSettingsFlags { - MESSAGE_LISTENER_WITH_ERROR_LEVEL = 1 << 0, - DETAILED_SOURCE_POSITIONS_FOR_PROFILING = 1 << 1, -- SHOULD_NOT_SET_PROMISE_REJECTION_CALLBACK = 1 << 2 -+ SHOULD_NOT_SET_PROMISE_REJECTION_CALLBACK = 1 << 2, -+ SHOULD_NOT_SET_PREPARE_STACK_TRACE_CALLBACK = 1 << 3 - }; - - struct IsolateSettings {