From e076ed4a76ff05afe52bb2aa52f7c1bb3bba84b1 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Wed, 6 Jul 2022 17:26:52 -0700 Subject: [PATCH] Don't export 'run' runtime method by default Instead allow folks to export it via EXPORTED_RUNTIME_METHODS, just other similar functions such as `abort`. See #9334 and 4ccf542cefbb7fa174c84c7e4fefcf5721d8b338 --- ChangeLog.md | 2 ++ src/modules.js | 1 + src/postamble.js | 1 - tests/other/metadce/test_metadce_cxx_ctors1.jssize | 2 +- tests/other/metadce/test_metadce_cxx_ctors2.jssize | 2 +- tests/other/metadce/test_metadce_cxx_except.jssize | 2 +- tests/other/metadce/test_metadce_cxx_except_wasm.jssize | 2 +- tests/other/metadce/test_metadce_cxx_mangle.jssize | 2 +- tests/other/metadce/test_metadce_cxx_noexcept.jssize | 2 +- tests/other/metadce/test_metadce_hello_O0.jssize | 2 +- tests/other/metadce/test_metadce_hello_O1.jssize | 2 +- tests/other/metadce/test_metadce_hello_O2.jssize | 2 +- tests/other/metadce/test_metadce_hello_O3.jssize | 2 +- tests/other/metadce/test_metadce_hello_Os.jssize | 2 +- tests/other/metadce/test_metadce_hello_Oz.jssize | 2 +- tests/other/metadce/test_metadce_hello_export_nothing.jssize | 2 +- tests/other/metadce/test_metadce_libcxxabi_message_O3.jssize | 2 +- .../metadce/test_metadce_libcxxabi_message_O3_standalone.jssize | 2 +- tests/other/metadce/test_metadce_mem_O3.jssize | 2 +- tests/other/metadce/test_metadce_mem_O3_grow.jssize | 2 +- tests/other/metadce/test_metadce_mem_O3_grow_standalone.jssize | 2 +- tests/other/metadce/test_metadce_mem_O3_standalone.jssize | 2 +- tests/other/metadce/test_metadce_mem_O3_standalone_lib.jssize | 2 +- tests/other/metadce/test_metadce_mem_O3_standalone_narg.jssize | 2 +- .../metadce/test_metadce_mem_O3_standalone_narg_flto.jssize | 2 +- tests/other/metadce/test_metadce_minimal_O0.jssize | 2 +- tests/other/metadce/test_metadce_minimal_O1.jssize | 2 +- tests/other/metadce/test_metadce_minimal_O2.jssize | 2 +- tests/other/metadce/test_metadce_minimal_O3.jssize | 2 +- tests/other/metadce/test_metadce_minimal_Os.jssize | 2 +- tests/other/metadce/test_metadce_minimal_Oz-ctors.jssize | 2 +- tests/other/metadce/test_metadce_minimal_Oz.jssize | 2 +- tests/other/metadce/test_metadce_minimal_pthreads.jssize | 2 +- tests/other/test_unoptimized_code_size.js.size | 2 +- tests/other/test_unoptimized_code_size_no_asserts.js.size | 2 +- 35 files changed, 35 insertions(+), 33 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 76cc281dc0dc6..8b1c250f09ece 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -30,6 +30,8 @@ See docs/process.md for more on how version tagging works. explictly required. Exporting them via `EXPORTED_RUNTIME_METHODS` will continue to work. For internal usage (without exporting them) they can be added to `DEFAULT_LIBRARY_FUNCS_TO_INCLUDE`. (#17370) +- The `run` runtime function is no longer exported by default. It can be added + to `EXPORTED_RUNTIME_METHODS` if needed. 3.1.15 - 07/01/2022 ------------------- diff --git a/src/modules.js b/src/modules.js index 92808292d854d..f9aea5af2b608 100644 --- a/src/modules.js +++ b/src/modules.js @@ -471,6 +471,7 @@ function exportRuntime() { if (!MINIMAL_RUNTIME) { // MINIMAL_RUNTIME has moved these functions to library_strings.js runtimeElements = runtimeElements.concat([ + 'run', 'warnOnce', 'stackSave', 'stackRestore', diff --git a/src/postamble.js b/src/postamble.js index bfafdb3dcd83e..5554490f05a35 100644 --- a/src/postamble.js +++ b/src/postamble.js @@ -355,7 +355,6 @@ function run(args) { checkStackCookie(); #endif } -Module['run'] = run; #if ASSERTIONS #if EXIT_RUNTIME == 0 diff --git a/tests/other/metadce/test_metadce_cxx_ctors1.jssize b/tests/other/metadce/test_metadce_cxx_ctors1.jssize index fc766ee610995..886b510b75a96 100644 --- a/tests/other/metadce/test_metadce_cxx_ctors1.jssize +++ b/tests/other/metadce/test_metadce_cxx_ctors1.jssize @@ -1 +1 @@ -26211 +26202 diff --git a/tests/other/metadce/test_metadce_cxx_ctors2.jssize b/tests/other/metadce/test_metadce_cxx_ctors2.jssize index 932e01a3b433b..51d0989eb9a82 100644 --- a/tests/other/metadce/test_metadce_cxx_ctors2.jssize +++ b/tests/other/metadce/test_metadce_cxx_ctors2.jssize @@ -1 +1 @@ -26175 +26166 diff --git a/tests/other/metadce/test_metadce_cxx_except.jssize b/tests/other/metadce/test_metadce_cxx_except.jssize index 02d69b63f9e30..887cc42f4877f 100644 --- a/tests/other/metadce/test_metadce_cxx_except.jssize +++ b/tests/other/metadce/test_metadce_cxx_except.jssize @@ -1 +1 @@ -31605 +31596 diff --git a/tests/other/metadce/test_metadce_cxx_except_wasm.jssize b/tests/other/metadce/test_metadce_cxx_except_wasm.jssize index b4627feb17edb..6f093bd6cc3b2 100644 --- a/tests/other/metadce/test_metadce_cxx_except_wasm.jssize +++ b/tests/other/metadce/test_metadce_cxx_except_wasm.jssize @@ -1 +1 @@ -26365 +26356 diff --git a/tests/other/metadce/test_metadce_cxx_mangle.jssize b/tests/other/metadce/test_metadce_cxx_mangle.jssize index c7db52e334d9a..b1bbe5d50281c 100644 --- a/tests/other/metadce/test_metadce_cxx_mangle.jssize +++ b/tests/other/metadce/test_metadce_cxx_mangle.jssize @@ -1 +1 @@ -31705 +31696 diff --git a/tests/other/metadce/test_metadce_cxx_noexcept.jssize b/tests/other/metadce/test_metadce_cxx_noexcept.jssize index fc766ee610995..886b510b75a96 100644 --- a/tests/other/metadce/test_metadce_cxx_noexcept.jssize +++ b/tests/other/metadce/test_metadce_cxx_noexcept.jssize @@ -1 +1 @@ -26211 +26202 diff --git a/tests/other/metadce/test_metadce_hello_O0.jssize b/tests/other/metadce/test_metadce_hello_O0.jssize index e6c55a555bdcd..7d930f293292c 100644 --- a/tests/other/metadce/test_metadce_hello_O0.jssize +++ b/tests/other/metadce/test_metadce_hello_O0.jssize @@ -1 +1 @@ -26693 +26698 diff --git a/tests/other/metadce/test_metadce_hello_O1.jssize b/tests/other/metadce/test_metadce_hello_O1.jssize index b6db98c3b9c41..55c92ab7d5403 100644 --- a/tests/other/metadce/test_metadce_hello_O1.jssize +++ b/tests/other/metadce/test_metadce_hello_O1.jssize @@ -1 +1 @@ -9256 +9245 diff --git a/tests/other/metadce/test_metadce_hello_O2.jssize b/tests/other/metadce/test_metadce_hello_O2.jssize index e0cf2b11ae162..28d2ab292b993 100644 --- a/tests/other/metadce/test_metadce_hello_O2.jssize +++ b/tests/other/metadce/test_metadce_hello_O2.jssize @@ -1 +1 @@ -6648 +6640 diff --git a/tests/other/metadce/test_metadce_hello_O3.jssize b/tests/other/metadce/test_metadce_hello_O3.jssize index 10c153ee3d0f0..a77fd92cf17bb 100644 --- a/tests/other/metadce/test_metadce_hello_O3.jssize +++ b/tests/other/metadce/test_metadce_hello_O3.jssize @@ -1 +1 @@ -6008 +6000 diff --git a/tests/other/metadce/test_metadce_hello_Os.jssize b/tests/other/metadce/test_metadce_hello_Os.jssize index 10c153ee3d0f0..a77fd92cf17bb 100644 --- a/tests/other/metadce/test_metadce_hello_Os.jssize +++ b/tests/other/metadce/test_metadce_hello_Os.jssize @@ -1 +1 @@ -6008 +6000 diff --git a/tests/other/metadce/test_metadce_hello_Oz.jssize b/tests/other/metadce/test_metadce_hello_Oz.jssize index 0c56b2f54027c..d3d97531a17e2 100644 --- a/tests/other/metadce/test_metadce_hello_Oz.jssize +++ b/tests/other/metadce/test_metadce_hello_Oz.jssize @@ -1 +1 @@ -5967 +5959 diff --git a/tests/other/metadce/test_metadce_hello_export_nothing.jssize b/tests/other/metadce/test_metadce_hello_export_nothing.jssize index 3c4089ce00ff3..ae6d064561fe5 100644 --- a/tests/other/metadce/test_metadce_hello_export_nothing.jssize +++ b/tests/other/metadce/test_metadce_hello_export_nothing.jssize @@ -1 +1 @@ -4678 +4670 diff --git a/tests/other/metadce/test_metadce_libcxxabi_message_O3.jssize b/tests/other/metadce/test_metadce_libcxxabi_message_O3.jssize index 287023777c695..7663e733fc70a 100644 --- a/tests/other/metadce/test_metadce_libcxxabi_message_O3.jssize +++ b/tests/other/metadce/test_metadce_libcxxabi_message_O3.jssize @@ -1 +1 @@ -5217 +5209 diff --git a/tests/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize b/tests/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize index 0e181f17415e0..0e17bc69d644b 100644 --- a/tests/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize +++ b/tests/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize @@ -1 +1 @@ -5293 +5285 diff --git a/tests/other/metadce/test_metadce_mem_O3.jssize b/tests/other/metadce/test_metadce_mem_O3.jssize index 82ffb7512a8b6..67285038b66aa 100644 --- a/tests/other/metadce/test_metadce_mem_O3.jssize +++ b/tests/other/metadce/test_metadce_mem_O3.jssize @@ -1 +1 @@ -6157 +6152 diff --git a/tests/other/metadce/test_metadce_mem_O3_grow.jssize b/tests/other/metadce/test_metadce_mem_O3_grow.jssize index bbe7560886521..af08b9088cf0e 100644 --- a/tests/other/metadce/test_metadce_mem_O3_grow.jssize +++ b/tests/other/metadce/test_metadce_mem_O3_grow.jssize @@ -1 +1 @@ -6488 +6483 diff --git a/tests/other/metadce/test_metadce_mem_O3_grow_standalone.jssize b/tests/other/metadce/test_metadce_mem_O3_grow_standalone.jssize index 33f6a20952b66..06f029e599096 100644 --- a/tests/other/metadce/test_metadce_mem_O3_grow_standalone.jssize +++ b/tests/other/metadce/test_metadce_mem_O3_grow_standalone.jssize @@ -1 +1 @@ -5791 +5786 diff --git a/tests/other/metadce/test_metadce_mem_O3_standalone.jssize b/tests/other/metadce/test_metadce_mem_O3_standalone.jssize index b10377ff7e17a..a3d5648d66a2b 100644 --- a/tests/other/metadce/test_metadce_mem_O3_standalone.jssize +++ b/tests/other/metadce/test_metadce_mem_O3_standalone.jssize @@ -1 +1 @@ -5715 +5710 diff --git a/tests/other/metadce/test_metadce_mem_O3_standalone_lib.jssize b/tests/other/metadce/test_metadce_mem_O3_standalone_lib.jssize index 85cac5801dca8..3333699ae3fbd 100644 --- a/tests/other/metadce/test_metadce_mem_O3_standalone_lib.jssize +++ b/tests/other/metadce/test_metadce_mem_O3_standalone_lib.jssize @@ -1 +1 @@ -5218 +5210 diff --git a/tests/other/metadce/test_metadce_mem_O3_standalone_narg.jssize b/tests/other/metadce/test_metadce_mem_O3_standalone_narg.jssize index 0e181f17415e0..0e17bc69d644b 100644 --- a/tests/other/metadce/test_metadce_mem_O3_standalone_narg.jssize +++ b/tests/other/metadce/test_metadce_mem_O3_standalone_narg.jssize @@ -1 +1 @@ -5293 +5285 diff --git a/tests/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize b/tests/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize index 0e181f17415e0..0e17bc69d644b 100644 --- a/tests/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize +++ b/tests/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize @@ -1 +1 @@ -5293 +5285 diff --git a/tests/other/metadce/test_metadce_minimal_O0.jssize b/tests/other/metadce/test_metadce_minimal_O0.jssize index f65977cc35b15..09b20f4efc345 100644 --- a/tests/other/metadce/test_metadce_minimal_O0.jssize +++ b/tests/other/metadce/test_metadce_minimal_O0.jssize @@ -1 +1 @@ -21384 +21387 diff --git a/tests/other/metadce/test_metadce_minimal_O1.jssize b/tests/other/metadce/test_metadce_minimal_O1.jssize index 467e82cefa18b..a3d5648d66a2b 100644 --- a/tests/other/metadce/test_metadce_minimal_O1.jssize +++ b/tests/other/metadce/test_metadce_minimal_O1.jssize @@ -1 +1 @@ -5721 +5710 diff --git a/tests/other/metadce/test_metadce_minimal_O2.jssize b/tests/other/metadce/test_metadce_minimal_O2.jssize index e7718be44ee2d..299698941a730 100644 --- a/tests/other/metadce/test_metadce_minimal_O2.jssize +++ b/tests/other/metadce/test_metadce_minimal_O2.jssize @@ -1 +1 @@ -4446 +4438 diff --git a/tests/other/metadce/test_metadce_minimal_O3.jssize b/tests/other/metadce/test_metadce_minimal_O3.jssize index 1547a9838ca6a..dceb0b36e2dab 100644 --- a/tests/other/metadce/test_metadce_minimal_O3.jssize +++ b/tests/other/metadce/test_metadce_minimal_O3.jssize @@ -1 +1 @@ -3894 +3886 diff --git a/tests/other/metadce/test_metadce_minimal_Os.jssize b/tests/other/metadce/test_metadce_minimal_Os.jssize index 1547a9838ca6a..dceb0b36e2dab 100644 --- a/tests/other/metadce/test_metadce_minimal_Os.jssize +++ b/tests/other/metadce/test_metadce_minimal_Os.jssize @@ -1 +1 @@ -3894 +3886 diff --git a/tests/other/metadce/test_metadce_minimal_Oz-ctors.jssize b/tests/other/metadce/test_metadce_minimal_Oz-ctors.jssize index 7b4b64fffb917..04c509eefab8d 100644 --- a/tests/other/metadce/test_metadce_minimal_Oz-ctors.jssize +++ b/tests/other/metadce/test_metadce_minimal_Oz-ctors.jssize @@ -1 +1 @@ -3783 +3775 diff --git a/tests/other/metadce/test_metadce_minimal_Oz.jssize b/tests/other/metadce/test_metadce_minimal_Oz.jssize index 1547a9838ca6a..dceb0b36e2dab 100644 --- a/tests/other/metadce/test_metadce_minimal_Oz.jssize +++ b/tests/other/metadce/test_metadce_minimal_Oz.jssize @@ -1 +1 @@ -3894 +3886 diff --git a/tests/other/metadce/test_metadce_minimal_pthreads.jssize b/tests/other/metadce/test_metadce_minimal_pthreads.jssize index 8f688dfabc9d0..dc3f830ecd51d 100644 --- a/tests/other/metadce/test_metadce_minimal_pthreads.jssize +++ b/tests/other/metadce/test_metadce_minimal_pthreads.jssize @@ -1 +1 @@ -15983 +15974 diff --git a/tests/other/test_unoptimized_code_size.js.size b/tests/other/test_unoptimized_code_size.js.size index 4aa53c5e002c3..809d441bcf978 100644 --- a/tests/other/test_unoptimized_code_size.js.size +++ b/tests/other/test_unoptimized_code_size.js.size @@ -1 +1 @@ -93171 +93189 diff --git a/tests/other/test_unoptimized_code_size_no_asserts.js.size b/tests/other/test_unoptimized_code_size_no_asserts.js.size index 28fdbba835e08..1e47e8809c091 100644 --- a/tests/other/test_unoptimized_code_size_no_asserts.js.size +++ b/tests/other/test_unoptimized_code_size_no_asserts.js.size @@ -1 +1 @@ -54755 +54734