From f68dc41f53f1accda9a754ce21cd646f4dbc48be Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Wed, 12 Apr 2023 18:45:56 -0700 Subject: [PATCH] Remove unnecessary dependency from deps_info.py. NFC This was recently introduced in #16627 but when to a different deps system in #18905 I noticed it is not necessary. --- test/other/metadce/test_metadce_cxx_ctors1.exports | 1 - test/other/metadce/test_metadce_cxx_ctors1.size | 2 +- test/other/metadce/test_metadce_cxx_ctors2.exports | 1 - test/other/metadce/test_metadce_cxx_ctors2.size | 2 +- test/other/metadce/test_metadce_cxx_noexcept.exports | 1 - test/other/metadce/test_metadce_cxx_noexcept.size | 2 +- tools/deps_info.py | 7 ++----- 7 files changed, 5 insertions(+), 11 deletions(-) diff --git a/test/other/metadce/test_metadce_cxx_ctors1.exports b/test/other/metadce/test_metadce_cxx_ctors1.exports index f4dc65925fb0b..7590b6e0dd3f1 100644 --- a/test/other/metadce/test_metadce_cxx_ctors1.exports +++ b/test/other/metadce/test_metadce_cxx_ctors1.exports @@ -1,4 +1,3 @@ -__cxa_increment_exception_refcount __cxa_is_pointer_type __errno_location __indirect_function_table diff --git a/test/other/metadce/test_metadce_cxx_ctors1.size b/test/other/metadce/test_metadce_cxx_ctors1.size index 912d2488a2a9c..fba69b18f9001 100644 --- a/test/other/metadce/test_metadce_cxx_ctors1.size +++ b/test/other/metadce/test_metadce_cxx_ctors1.size @@ -1 +1 @@ -123573 +123454 diff --git a/test/other/metadce/test_metadce_cxx_ctors2.exports b/test/other/metadce/test_metadce_cxx_ctors2.exports index 183246153c0dd..0605207136d30 100644 --- a/test/other/metadce/test_metadce_cxx_ctors2.exports +++ b/test/other/metadce/test_metadce_cxx_ctors2.exports @@ -1,4 +1,3 @@ -__cxa_increment_exception_refcount __cxa_is_pointer_type __errno_location __indirect_function_table diff --git a/test/other/metadce/test_metadce_cxx_ctors2.size b/test/other/metadce/test_metadce_cxx_ctors2.size index c05b9543c7300..96fcfdd147414 100644 --- a/test/other/metadce/test_metadce_cxx_ctors2.size +++ b/test/other/metadce/test_metadce_cxx_ctors2.size @@ -1 +1 @@ -123478 +123359 diff --git a/test/other/metadce/test_metadce_cxx_noexcept.exports b/test/other/metadce/test_metadce_cxx_noexcept.exports index f4dc65925fb0b..7590b6e0dd3f1 100644 --- a/test/other/metadce/test_metadce_cxx_noexcept.exports +++ b/test/other/metadce/test_metadce_cxx_noexcept.exports @@ -1,4 +1,3 @@ -__cxa_increment_exception_refcount __cxa_is_pointer_type __errno_location __indirect_function_table diff --git a/test/other/metadce/test_metadce_cxx_noexcept.size b/test/other/metadce/test_metadce_cxx_noexcept.size index 79e609efbb1cd..f4b7350835a3f 100644 --- a/test/other/metadce/test_metadce_cxx_noexcept.size +++ b/test/other/metadce/test_metadce_cxx_noexcept.size @@ -1 +1 @@ -126371 +126251 diff --git a/tools/deps_info.py b/tools/deps_info.py index 2d7460fe1886c..b05890878d923 100644 --- a/tools/deps_info.py +++ b/tools/deps_info.py @@ -186,12 +186,9 @@ def append_deps_info(js_symbol_deps): def get_deps_info(): if not settings.WASM_EXCEPTIONS and settings.LINK_AS_CXX: _deps_info['__cxa_end_catch'] = ['setThrew', '__cxa_decrement_exception_refcount'] - base_js_exception_deps = [ - '__cxa_is_pointer_type', - '__cxa_increment_exception_refcount', - ] + base_js_exception_deps = ['__cxa_is_pointer_type'] _deps_info['__cxa_throw'] = base_js_exception_deps - _deps_info['__cxa_begin_catch'] = base_js_exception_deps + _deps_info['__cxa_begin_catch'] = base_js_exception_deps + ['__cxa_increment_exception_refcount'] _deps_info['__cxa_find_matching_catch'] = base_js_exception_deps + ['__cxa_can_catch', 'setTempRet0'] for i in range(1, 10): _deps_info['__cxa_find_matching_catch_%d' % i] = _deps_info['__cxa_find_matching_catch']