From caa6e65e386edb63c8316a00e5516d307400be5b Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Fri, 8 Nov 2019 10:02:43 -0800 Subject: [PATCH] chore: remove unnecessary patches (#21044) --- patches/node/.patches | 3 -- ...xport_environment_knodecontexttagptr.patch | 19 ------- .../fix_export_node_abort_and_assert.patch | 50 ----------------- ..._and_options_parser_for_debug_builds.patch | 54 ------------------- 4 files changed, 126 deletions(-) delete mode 100644 patches/node/export_environment_knodecontexttagptr.patch delete mode 100644 patches/node/fix_export_node_abort_and_assert.patch delete mode 100644 patches/node/fix_extern_the_nativemoduleenv_and_options_parser_for_debug_builds.patch diff --git a/patches/node/.patches b/patches/node/.patches index 423db22f37ed..0177f0b67131 100644 --- a/patches/node/.patches +++ b/patches/node/.patches @@ -11,14 +11,12 @@ fix_export_debugoptions.patch fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch feat_add_new_built_with_electron_variable_to_config_gypi.patch feat_add_flags_for_low-level_hooks_and_exceptions.patch -export_environment_knodecontexttagptr.patch fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch pass_all_globals_through_require.patch call_process_log_from_fallback_stream_on_windows.patch fixme_use_redefined_version_of_internalmodulestat.patch fixme_remove_async_id_assertion_check.patch fixme_comment_trace_event_macro.patch -fix_export_node_abort_and_assert.patch fix_key_gen_apis_are_not_available_in_boringssl.patch fix_do_not_define_debugoptions_s_constructors_in_header.patch src_disable_node_use_v8_platform_in_node_options.patch @@ -27,7 +25,6 @@ refactor_allow_embedder_overriding_of_internal_fs_calls.patch chore_prevent_warn_non_context-aware_native_modules_being_loaded.patch chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch inherit_electron_crashpad_pipe_name_in_child_process.patch -fix_extern_the_nativemoduleenv_and_options_parser_for_debug_builds.patch chore_read_nobrowserglobals_from_global_not_process.patch chore_split_createenvironment_into_createenvironment_and.patch chore_handle_default_configuration_not_being_set_in_the_electron_env.patch diff --git a/patches/node/export_environment_knodecontexttagptr.patch b/patches/node/export_environment_knodecontexttagptr.patch deleted file mode 100644 index 18b111cdefd1..000000000000 --- a/patches/node/export_environment_knodecontexttagptr.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jeremy Apthorp -Date: Tue, 2 Oct 2018 17:09:15 -0700 -Subject: export Environment::kNodeContextTagPtr - - -diff --git a/src/env.h b/src/env.h -index 82ed066f9cde4851fa3375d0faffe4bfcf2bf411..2dd6bdb75f02e2ccb07129996d16df99c0c4ccf2 100644 ---- a/src/env.h -+++ b/src/env.h -@@ -1304,7 +1304,7 @@ class Environment : public MemoryRetainer { - uint64_t thread_id_; - std::unordered_set sub_worker_contexts_; - -- static void* const kNodeContextTagPtr; -+ NODE_EXTERN static void* const kNodeContextTagPtr; - static int const kNodeContextTag; - - #if HAVE_INSPECTOR diff --git a/patches/node/fix_export_node_abort_and_assert.patch b/patches/node/fix_export_node_abort_and_assert.patch deleted file mode 100644 index 2c71b2886131..000000000000 --- a/patches/node/fix_export_node_abort_and_assert.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nitish Sakhawalkar -Date: Wed, 27 Mar 2019 14:17:15 -0700 -Subject: fix: Export node::Abort and Assert - - -diff --git a/src/node_errors.cc b/src/node_errors.cc -index 0214521144c607c084cabc941f006780bcd3cfa2..ea4113aa3b2b431c6d9bbfbf4b20f8ff59cd9182 100644 ---- a/src/node_errors.cc -+++ b/src/node_errors.cc -@@ -242,13 +242,13 @@ void AppendExceptionLine(Environment* env, - .FromMaybe(false)); - } - --[[noreturn]] void Abort() { -+[[noreturn]] void NODE_EXTERN Abort() { - DumpBacktrace(stderr); - fflush(stderr); - ABORT_NO_BACKTRACE(); - } - --[[noreturn]] void Assert(const AssertionInfo& info) { -+[[noreturn]] void NODE_EXTERN Assert(const AssertionInfo& info) { - char name[1024]; - GetHumanReadableProcessName(&name); - -diff --git a/src/util.h b/src/util.h -index a94e88f232fd3116fa842aed4d02a78fd0c54ffc..62ae0fe6e6beb77e456bff352246505531ec2005 100644 ---- a/src/util.h -+++ b/src/util.h -@@ -24,6 +24,8 @@ - - #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS - -+ -+#include "node.h" - #include "v8.h" - - #include -@@ -103,8 +105,8 @@ struct AssertionInfo { - const char* message; - const char* function; - }; --[[noreturn]] void Assert(const AssertionInfo& info); --[[noreturn]] void Abort(); -+[[noreturn]] void NODE_EXTERN Assert(const AssertionInfo& info); -+[[noreturn]] void NODE_EXTERN Abort(); - void DumpBacktrace(FILE* fp); - - // Windows 8+ does not like abort() in Release mode diff --git a/patches/node/fix_extern_the_nativemoduleenv_and_options_parser_for_debug_builds.patch b/patches/node/fix_extern_the_nativemoduleenv_and_options_parser_for_debug_builds.patch deleted file mode 100644 index 55e030cd7027..000000000000 --- a/patches/node/fix_extern_the_nativemoduleenv_and_options_parser_for_debug_builds.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Samuel Attard -Date: Mon, 15 Jul 2019 14:20:10 -0700 -Subject: fix: extern the NativeModuleEnv and options parser for debug builds - - -diff --git a/src/node_native_module_env.h b/src/node_native_module_env.h -index b91a5059cd1f19d87e5876c372f3ded60681a5df..f81cf8dfb892a8ddd9084c5d9477b17867cae82d 100644 ---- a/src/node_native_module_env.h -+++ b/src/node_native_module_env.h -@@ -12,7 +12,7 @@ namespace native_module { - - extern const bool has_code_cache; - --class NativeModuleEnv { -+class NODE_EXTERN NativeModuleEnv { - public: - static void Initialize(v8::Local target, - v8::Local unused, -diff --git a/src/node_options.h b/src/node_options.h -index ce86827024126c6b0d8462c811360057c298ec5b..d53307f9589d4487c220526b8e49b6c7fbd29daf 100644 ---- a/src/node_options.h -+++ b/src/node_options.h -@@ -44,7 +44,7 @@ class HostPort { - int port_; - }; - --class Options { -+class NODE_EXTERN Options { - public: - virtual void CheckOptions(std::vector* errors) {} - virtual ~Options() = default; -@@ -440,7 +440,7 @@ class NODE_EXTERN DebugOptionsParser : public OptionsParser { - - using StringVector = std::vector; - template --void Parse( -+void NODE_EXTERN Parse( - StringVector* const args, StringVector* const exec_args, - StringVector* const v8_args, OptionsType* const options, - OptionEnvvarSettings required_env_settings, StringVector* const errors); -diff --git a/src/node_options.cc b/src/node_options.cc -index 01dddb979042c098326a8b1ff37397642733f49b..f91a23c1d7ee8a141d349c486b7520c175094b8b 100644 ---- a/src/node_options.cc -+++ b/src/node_options.cc -@@ -237,7 +237,7 @@ const EnvironmentOptionsParser _eop_instance{_dop_instance}; - - // This Parse is not dead code. It is used by embedders (e.g., Electron). - template <> --void Parse( -+void NODE_EXTERN Parse( - StringVector* const args, StringVector* const exec_args, - StringVector* const v8_args, - DebugOptions* const options,