From 2834ba5cfcab87b18112841607d61b99f1d4c2ec Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Wed, 24 Jan 2024 18:07:11 -0800 Subject: [PATCH] Avoid unnecessary dependency on `SYSCALLS` object. NFC I noticed that `proc_exit` was depending on `SYSCALLS` even though it wasn't actually using `SYSCALLS`. --- src/library.js | 3 ++- src/library_syscall.js | 5 ----- test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize | 2 +- test/other/metadce/test_metadce_libcxxabi_message_O3.jssize | 2 +- .../test_metadce_libcxxabi_message_O3_standalone.gzsize | 2 +- .../test_metadce_libcxxabi_message_O3_standalone.jssize | 2 +- test/other/metadce/test_metadce_mem_O3.gzsize | 2 +- test/other/metadce/test_metadce_mem_O3.jssize | 2 +- test/other/metadce/test_metadce_mem_O3_grow.gzsize | 2 +- test/other/metadce/test_metadce_mem_O3_grow.jssize | 2 +- .../other/metadce/test_metadce_mem_O3_grow_standalone.gzsize | 2 +- .../other/metadce/test_metadce_mem_O3_grow_standalone.jssize | 2 +- test/other/metadce/test_metadce_mem_O3_standalone.gzsize | 2 +- test/other/metadce/test_metadce_mem_O3_standalone.jssize | 2 +- test/other/metadce/test_metadce_mem_O3_standalone_lib.gzsize | 2 +- test/other/metadce/test_metadce_mem_O3_standalone_lib.jssize | 2 +- .../other/metadce/test_metadce_mem_O3_standalone_narg.gzsize | 2 +- .../other/metadce/test_metadce_mem_O3_standalone_narg.jssize | 2 +- .../metadce/test_metadce_mem_O3_standalone_narg_flto.gzsize | 2 +- .../metadce/test_metadce_mem_O3_standalone_narg_flto.jssize | 2 +- test/other/metadce/test_metadce_minimal_pthreads.gzsize | 2 +- test/other/metadce/test_metadce_minimal_pthreads.jssize | 2 +- test/other/test_unoptimized_code_size.js.size | 2 +- test/other/test_unoptimized_code_size_no_asserts.js.size | 2 +- test/other/test_unoptimized_code_size_strict.js.size | 2 +- 25 files changed, 25 insertions(+), 29 deletions(-) diff --git a/src/library.js b/src/library.js index b64cca2ef1a8e..cc9d3f69fcde3 100644 --- a/src/library.js +++ b/src/library.js @@ -3757,7 +3757,8 @@ function wrapSyscallFunction(x, library, isWasi) { } library[x] = eval('(' + t + ')'); - if (!WASMFS) { + // Automatically add dependency on `$SYSCALLS` + if (!WASMFS && t.includes('SYSCALLS')) { library[x + '__deps'].push('$SYSCALLS'); } #if PTHREADS diff --git a/src/library_syscall.js b/src/library_syscall.js index 318f30caf3f08..c49d5a25a0f25 100644 --- a/src/library_syscall.js +++ b/src/library_syscall.js @@ -157,11 +157,6 @@ var SyscallsLibrary = { }, _munmap_js__i53abi: true, - _munmap_js__deps: ['$SYSCALLS', -#if FILESYSTEM && SYSCALLS_REQUIRE_FILESYSTEM - '$FS', -#endif - ], _munmap_js: (addr, len, prot, flags, fd, offset) => { #if FILESYSTEM && SYSCALLS_REQUIRE_FILESYSTEM if (isNaN(offset)) return {{{ cDefs.EOVERFLOW }}}; diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize b/test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize index 5e7c8b88a0264..5cc2201e666e5 100644 --- a/test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize +++ b/test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize @@ -1 +1 @@ -2164 +2143 diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize b/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize index 2cea19324829c..425d3b02ea7cd 100644 --- a/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize +++ b/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize @@ -1 +1 @@ -4669 +4607 diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.gzsize b/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.gzsize index fca0e8a08c19c..f52b3ac70f57d 100644 --- a/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.gzsize +++ b/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.gzsize @@ -1 +1 @@ -2200 +2176 diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize b/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize index 4f652d136a346..092b8f173fcb7 100644 --- a/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize +++ b/test/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize @@ -1 +1 @@ -4720 +4658 diff --git a/test/other/metadce/test_metadce_mem_O3.gzsize b/test/other/metadce/test_metadce_mem_O3.gzsize index 1da5938934e27..c882b49a4f5e0 100644 --- a/test/other/metadce/test_metadce_mem_O3.gzsize +++ b/test/other/metadce/test_metadce_mem_O3.gzsize @@ -1 +1 @@ -2617 +2597 diff --git a/test/other/metadce/test_metadce_mem_O3.jssize b/test/other/metadce/test_metadce_mem_O3.jssize index 76674f153193b..685ae6327d350 100644 --- a/test/other/metadce/test_metadce_mem_O3.jssize +++ b/test/other/metadce/test_metadce_mem_O3.jssize @@ -1 +1 @@ -5568 +5507 diff --git a/test/other/metadce/test_metadce_mem_O3_grow.gzsize b/test/other/metadce/test_metadce_mem_O3_grow.gzsize index 7ab19b5b480cf..3d9dacc888525 100644 --- a/test/other/metadce/test_metadce_mem_O3_grow.gzsize +++ b/test/other/metadce/test_metadce_mem_O3_grow.gzsize @@ -1 +1 @@ -2783 +2758 diff --git a/test/other/metadce/test_metadce_mem_O3_grow.jssize b/test/other/metadce/test_metadce_mem_O3_grow.jssize index b8532c27386e8..e6d21f67608d1 100644 --- a/test/other/metadce/test_metadce_mem_O3_grow.jssize +++ b/test/other/metadce/test_metadce_mem_O3_grow.jssize @@ -1 +1 @@ -5891 +5829 diff --git a/test/other/metadce/test_metadce_mem_O3_grow_standalone.gzsize b/test/other/metadce/test_metadce_mem_O3_grow_standalone.gzsize index 70081150e1d5c..0b0d24a555ebb 100644 --- a/test/other/metadce/test_metadce_mem_O3_grow_standalone.gzsize +++ b/test/other/metadce/test_metadce_mem_O3_grow_standalone.gzsize @@ -1 +1 @@ -2475 +2451 diff --git a/test/other/metadce/test_metadce_mem_O3_grow_standalone.jssize b/test/other/metadce/test_metadce_mem_O3_grow_standalone.jssize index d5a3284157807..7f8695c552302 100644 --- a/test/other/metadce/test_metadce_mem_O3_grow_standalone.jssize +++ b/test/other/metadce/test_metadce_mem_O3_grow_standalone.jssize @@ -1 +1 @@ -5284 +5223 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone.gzsize index 3431981301794..94c0c0eb6b8d3 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone.gzsize +++ b/test/other/metadce/test_metadce_mem_O3_standalone.gzsize @@ -1 +1 @@ -2441 +2418 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone.jssize b/test/other/metadce/test_metadce_mem_O3_standalone.jssize index d0f91610a3485..e3caddc604db3 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone.jssize +++ b/test/other/metadce/test_metadce_mem_O3_standalone.jssize @@ -1 +1 @@ -5214 +5153 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_lib.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone_lib.gzsize index ee2583961172c..28bcf886cd53a 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone_lib.gzsize +++ b/test/other/metadce/test_metadce_mem_O3_standalone_lib.gzsize @@ -1 +1 @@ -2187 +2165 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_lib.jssize b/test/other/metadce/test_metadce_mem_O3_standalone_lib.jssize index 4f652d136a346..092b8f173fcb7 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone_lib.jssize +++ b/test/other/metadce/test_metadce_mem_O3_standalone_lib.jssize @@ -1 +1 @@ -4720 +4658 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone_narg.gzsize index fca0e8a08c19c..f52b3ac70f57d 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone_narg.gzsize +++ b/test/other/metadce/test_metadce_mem_O3_standalone_narg.gzsize @@ -1 +1 @@ -2200 +2176 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg.jssize b/test/other/metadce/test_metadce_mem_O3_standalone_narg.jssize index 4f652d136a346..092b8f173fcb7 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone_narg.jssize +++ b/test/other/metadce/test_metadce_mem_O3_standalone_narg.jssize @@ -1 +1 @@ -4720 +4658 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.gzsize index fca0e8a08c19c..f52b3ac70f57d 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.gzsize +++ b/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.gzsize @@ -1 +1 @@ -2200 +2176 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize b/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize index 4f652d136a346..092b8f173fcb7 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize +++ b/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize @@ -1 +1 @@ -4720 +4658 diff --git a/test/other/metadce/test_metadce_minimal_pthreads.gzsize b/test/other/metadce/test_metadce_minimal_pthreads.gzsize index 18af9a218e8c4..d05eeed63c5c3 100644 --- a/test/other/metadce/test_metadce_minimal_pthreads.gzsize +++ b/test/other/metadce/test_metadce_minimal_pthreads.gzsize @@ -1 +1 @@ -4924 +4923 diff --git a/test/other/metadce/test_metadce_minimal_pthreads.jssize b/test/other/metadce/test_metadce_minimal_pthreads.jssize index 2d765fee3384b..67700c91ca4af 100644 --- a/test/other/metadce/test_metadce_minimal_pthreads.jssize +++ b/test/other/metadce/test_metadce_minimal_pthreads.jssize @@ -1 +1 @@ -13665 +13664 diff --git a/test/other/test_unoptimized_code_size.js.size b/test/other/test_unoptimized_code_size.js.size index 3db2f751a8181..4db6f5c53b5cc 100644 --- a/test/other/test_unoptimized_code_size.js.size +++ b/test/other/test_unoptimized_code_size.js.size @@ -1 +1 @@ -58240 +58237 diff --git a/test/other/test_unoptimized_code_size_no_asserts.js.size b/test/other/test_unoptimized_code_size_no_asserts.js.size index 66e5f178ea78b..49b42338b5377 100644 --- a/test/other/test_unoptimized_code_size_no_asserts.js.size +++ b/test/other/test_unoptimized_code_size_no_asserts.js.size @@ -1 +1 @@ -31641 +31638 diff --git a/test/other/test_unoptimized_code_size_strict.js.size b/test/other/test_unoptimized_code_size_strict.js.size index 910c315eba6b4..3a5f6b6493387 100644 --- a/test/other/test_unoptimized_code_size_strict.js.size +++ b/test/other/test_unoptimized_code_size_strict.js.size @@ -1 +1 @@ -57082 +57079