Skip to content

Commit 5394838

Browse files
authored
Remove unnecessary dependency from deps_info.py. NFC (#19166)
This was recently introduced in #16627 but when to a different deps system in #18905 I noticed it is not necessary.
1 parent 2e9314e commit 5394838

7 files changed

+5
-11
lines changed

test/other/metadce/test_metadce_cxx_ctors1.exports

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
__cxa_increment_exception_refcount
21
__cxa_is_pointer_type
32
__errno_location
43
__indirect_function_table
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
123573
1+
123454

test/other/metadce/test_metadce_cxx_ctors2.exports

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
__cxa_increment_exception_refcount
21
__cxa_is_pointer_type
32
__errno_location
43
__indirect_function_table
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
123478
1+
123359

test/other/metadce/test_metadce_cxx_noexcept.exports

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
__cxa_increment_exception_refcount
21
__cxa_is_pointer_type
32
__errno_location
43
__indirect_function_table
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
126371
1+
126251

tools/deps_info.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,9 @@ def append_deps_info(js_symbol_deps):
186186
def get_deps_info():
187187
if not settings.WASM_EXCEPTIONS and settings.LINK_AS_CXX:
188188
_deps_info['__cxa_end_catch'] = ['setThrew', '__cxa_decrement_exception_refcount']
189-
base_js_exception_deps = [
190-
'__cxa_is_pointer_type',
191-
'__cxa_increment_exception_refcount',
192-
]
189+
base_js_exception_deps = ['__cxa_is_pointer_type']
193190
_deps_info['__cxa_throw'] = base_js_exception_deps
194-
_deps_info['__cxa_begin_catch'] = base_js_exception_deps
191+
_deps_info['__cxa_begin_catch'] = base_js_exception_deps + ['__cxa_increment_exception_refcount']
195192
_deps_info['__cxa_find_matching_catch'] = base_js_exception_deps + ['__cxa_can_catch', 'setTempRet0']
196193
for i in range(1, 10):
197194
_deps_info['__cxa_find_matching_catch_%d' % i] = _deps_info['__cxa_find_matching_catch']

0 commit comments

Comments
 (0)