diff --git a/src/modules.js b/src/modules.js index 06176d023b488..28c3d14d003fd 100644 --- a/src/modules.js +++ b/src/modules.js @@ -385,6 +385,18 @@ function exportRuntime() { 'abort', 'wasmMemory', 'wasmExports', + 'HEAP', + 'HEAP_DATA_VIEW', + 'HEAP8', + 'HEAP16', + 'HEAPU8', + 'HEAPU16', + 'HEAP32', + 'HEAPU32', + 'HEAPF32', + 'HEAPF64', + 'HEAP64', + 'HEAPU64', ]; // These are actually native wasm functions these days but we allow exporting diff --git a/src/preamble.js b/src/preamble.js index 7526ae4d587f5..43cb8868613c6 100644 --- a/src/preamble.js +++ b/src/preamble.js @@ -141,19 +141,19 @@ var HEAP_DATA_VIEW; function updateMemoryViews() { var b = wasmMemory.buffer; #if SUPPORT_BIG_ENDIAN - Module['HEAP_DATA_VIEW'] = HEAP_DATA_VIEW = new DataView(b); -#endif - Module['HEAP8'] = HEAP8 = new Int8Array(b); - Module['HEAP16'] = HEAP16 = new Int16Array(b); - Module['HEAPU8'] = HEAPU8 = new Uint8Array(b); - Module['HEAPU16'] = HEAPU16 = new Uint16Array(b); - Module['HEAP32'] = HEAP32 = new Int32Array(b); - Module['HEAPU32'] = HEAPU32 = new Uint32Array(b); - Module['HEAPF32'] = HEAPF32 = new Float32Array(b); - Module['HEAPF64'] = HEAPF64 = new Float64Array(b); + HEAP_DATA_VIEW = HEAP_DATA_VIEW = new DataView(b); +#endif + HEAP8 = new Int8Array(b); + HEAP16 = new Int16Array(b); + HEAPU8 = new Uint8Array(b); + HEAPU16 = new Uint16Array(b); + HEAP32 = new Int32Array(b); + HEAPU32 = new Uint32Array(b); + HEAPF32 = new Float32Array(b); + HEAPF64 = new Float64Array(b); #if WASM_BIGINT - Module['HEAP64'] = HEAP64 = new BigInt64Array(b); - Module['HEAPU64'] = HEAPU64 = new BigUint64Array(b); + HEAP64 = new BigInt64Array(b); + HEAPU64 = new BigUint64Array(b); #endif } diff --git a/src/preamble_minimal.js b/src/preamble_minimal.js index ae70045563217..2df78375db72d 100644 --- a/src/preamble_minimal.js +++ b/src/preamble_minimal.js @@ -4,17 +4,6 @@ * SPDX-License-Identifier: MIT */ -{{{ - // Helper function to export a symbol on the module object - // if requested. - globalThis.maybeExport = (x) => MODULARIZE && EXPORT_ALL ? `Module['${x}'] = ` : ''; - // Export to the AudioWorkletGlobalScope the needed variables to access - // the heap. AudioWorkletGlobalScope is unable to access global JS vars - // in the compiled main JS file. - globalThis.maybeExportIfAudioWorklet = (x) => (MODULARIZE && EXPORT_ALL) || AUDIO_WORKLET ? `Module['${x}'] = ` : ''; - null; -}}} - #if SAFE_HEAP #include "runtime_safe_heap.js" #endif @@ -71,19 +60,19 @@ function updateMemoryViews() { assert(b instanceof SharedArrayBuffer, 'requested a shared WebAssembly.Memory but the returned buffer is not a SharedArrayBuffer, indicating that while the browser has SharedArrayBuffer it does not have WebAssembly threads support - you may need to set a flag'); #endif #if SUPPORT_BIG_ENDIAN - {{{ maybeExport('HEAP_DATA_VIEW') }}} HEAP_DATA_VIEW = new DataView(b); -#endif - {{{ maybeExport('HEAP8') }}} HEAP8 = new Int8Array(b); - {{{ maybeExport('HEAP16') }}} HEAP16 = new Int16Array(b); - {{{ maybeExport('HEAPU8') }}} HEAPU8 = new Uint8Array(b); - {{{ maybeExport('HEAPU16') }}} HEAPU16 = new Uint16Array(b); - {{{ maybeExport('HEAP32') }}} HEAP32 = new Int32Array(b); - {{{ maybeExportIfAudioWorklet('HEAPU32') }}} HEAPU32 = new Uint32Array(b); - {{{ maybeExportIfAudioWorklet('HEAPF32') }}} HEAPF32 = new Float32Array(b); - {{{ maybeExport('HEAPF64') }}} HEAPF64 = new Float64Array(b); + HEAP_DATA_VIEW = new DataView(b); +#endif + HEAP8 = new Int8Array(b); + HEAP16 = new Int16Array(b); + HEAPU8 = new Uint8Array(b); + HEAPU16 = new Uint16Array(b); + HEAP32 = new Int32Array(b); + HEAPU32 = new Uint32Array(b); + HEAPF32 = new Float32Array(b); + HEAPF64 = new Float64Array(b); #if WASM_BIGINT - {{{ maybeExport('HEAP64') }}} HEAP64 = new BigInt64Array(b); - {{{ maybeExport('HEAPU64') }}} HEAPU64 = new BigUint64Array(b); + HEAP64 = new BigInt64Array(b); + HEAPU64 = new BigUint64Array(b); #endif } diff --git a/test/other/metadce/test_metadce_cxx_ctors1.gzsize b/test/other/metadce/test_metadce_cxx_ctors1.gzsize index 598468564268e..526f7fd83abb9 100644 --- a/test/other/metadce/test_metadce_cxx_ctors1.gzsize +++ b/test/other/metadce/test_metadce_cxx_ctors1.gzsize @@ -1 +1 @@ -9953 +9998 diff --git a/test/other/metadce/test_metadce_cxx_ctors1.jssize b/test/other/metadce/test_metadce_cxx_ctors1.jssize index 5c133da55cdfe..3f6b3fedfa895 100644 --- a/test/other/metadce/test_metadce_cxx_ctors1.jssize +++ b/test/other/metadce/test_metadce_cxx_ctors1.jssize @@ -1 +1 @@ -24510 +24554 diff --git a/test/other/metadce/test_metadce_cxx_ctors2.gzsize b/test/other/metadce/test_metadce_cxx_ctors2.gzsize index 037be39d1d80e..8d8ccfdfce362 100644 --- a/test/other/metadce/test_metadce_cxx_ctors2.gzsize +++ b/test/other/metadce/test_metadce_cxx_ctors2.gzsize @@ -1 +1 @@ -9939 +9981 diff --git a/test/other/metadce/test_metadce_cxx_ctors2.jssize b/test/other/metadce/test_metadce_cxx_ctors2.jssize index 4d1461a02bdb6..5c1a5ab538891 100644 --- a/test/other/metadce/test_metadce_cxx_ctors2.jssize +++ b/test/other/metadce/test_metadce_cxx_ctors2.jssize @@ -1 +1 @@ -24478 +24522 diff --git a/test/other/metadce/test_metadce_cxx_except.gzsize b/test/other/metadce/test_metadce_cxx_except.gzsize index c719006eb5801..c0f45c79fa82d 100644 --- a/test/other/metadce/test_metadce_cxx_except.gzsize +++ b/test/other/metadce/test_metadce_cxx_except.gzsize @@ -1 +1 @@ -11034 +11063 diff --git a/test/other/metadce/test_metadce_cxx_except.jssize b/test/other/metadce/test_metadce_cxx_except.jssize index f5ceda9aa6f92..bba3ee6aeb8dc 100644 --- a/test/other/metadce/test_metadce_cxx_except.jssize +++ b/test/other/metadce/test_metadce_cxx_except.jssize @@ -1 +1 @@ -28382 +28426 diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.gzsize b/test/other/metadce/test_metadce_cxx_except_wasm.gzsize index d89ecd30cd70d..a3035d101eb97 100644 --- a/test/other/metadce/test_metadce_cxx_except_wasm.gzsize +++ b/test/other/metadce/test_metadce_cxx_except_wasm.gzsize @@ -1 +1 @@ -9921 +9959 diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.jssize b/test/other/metadce/test_metadce_cxx_except_wasm.jssize index 5d22ccf806690..9314fe4abd9a3 100644 --- a/test/other/metadce/test_metadce_cxx_except_wasm.jssize +++ b/test/other/metadce/test_metadce_cxx_except_wasm.jssize @@ -1 +1 @@ -24403 +24447 diff --git a/test/other/metadce/test_metadce_cxx_mangle.gzsize b/test/other/metadce/test_metadce_cxx_mangle.gzsize index 2ed7f908fcc5b..8bae77e24b533 100644 --- a/test/other/metadce/test_metadce_cxx_mangle.gzsize +++ b/test/other/metadce/test_metadce_cxx_mangle.gzsize @@ -1 +1 @@ -11041 +11068 diff --git a/test/other/metadce/test_metadce_cxx_mangle.jssize b/test/other/metadce/test_metadce_cxx_mangle.jssize index 0e54d7ee54796..aa6a576a2a16a 100644 --- a/test/other/metadce/test_metadce_cxx_mangle.jssize +++ b/test/other/metadce/test_metadce_cxx_mangle.jssize @@ -1 +1 @@ -28383 +28427 diff --git a/test/other/metadce/test_metadce_cxx_noexcept.gzsize b/test/other/metadce/test_metadce_cxx_noexcept.gzsize index 598468564268e..526f7fd83abb9 100644 --- a/test/other/metadce/test_metadce_cxx_noexcept.gzsize +++ b/test/other/metadce/test_metadce_cxx_noexcept.gzsize @@ -1 +1 @@ -9953 +9998 diff --git a/test/other/metadce/test_metadce_cxx_noexcept.jssize b/test/other/metadce/test_metadce_cxx_noexcept.jssize index 5c133da55cdfe..3f6b3fedfa895 100644 --- a/test/other/metadce/test_metadce_cxx_noexcept.jssize +++ b/test/other/metadce/test_metadce_cxx_noexcept.jssize @@ -1 +1 @@ -24510 +24554 diff --git a/test/other/metadce/test_metadce_cxx_wasmfs.gzsize b/test/other/metadce/test_metadce_cxx_wasmfs.gzsize index 87d9fa61e6774..da5111221b0b5 100644 --- a/test/other/metadce/test_metadce_cxx_wasmfs.gzsize +++ b/test/other/metadce/test_metadce_cxx_wasmfs.gzsize @@ -1 +1 @@ -5245 +5282 diff --git a/test/other/metadce/test_metadce_cxx_wasmfs.jssize b/test/other/metadce/test_metadce_cxx_wasmfs.jssize index e15496f7124ea..8ebbef08979b6 100644 --- a/test/other/metadce/test_metadce_cxx_wasmfs.jssize +++ b/test/other/metadce/test_metadce_cxx_wasmfs.jssize @@ -1 +1 @@ -12122 +12166 diff --git a/test/other/metadce/test_metadce_files_js_fs.gzsize b/test/other/metadce/test_metadce_files_js_fs.gzsize index 645b9eaa8a55d..71b284c84e15f 100644 --- a/test/other/metadce/test_metadce_files_js_fs.gzsize +++ b/test/other/metadce/test_metadce_files_js_fs.gzsize @@ -1 +1 @@ -7899 +7936 diff --git a/test/other/metadce/test_metadce_files_js_fs.jssize b/test/other/metadce/test_metadce_files_js_fs.jssize index e3e97e21f3c85..516a67b268001 100644 --- a/test/other/metadce/test_metadce_files_js_fs.jssize +++ b/test/other/metadce/test_metadce_files_js_fs.jssize @@ -1 +1 @@ -19538 +19588 diff --git a/test/other/metadce/test_metadce_files_wasmfs.gzsize b/test/other/metadce/test_metadce_files_wasmfs.gzsize index 71e9c9687b826..9963c06fc4dbb 100644 --- a/test/other/metadce/test_metadce_files_wasmfs.gzsize +++ b/test/other/metadce/test_metadce_files_wasmfs.gzsize @@ -1 +1 @@ -3165 +3212 diff --git a/test/other/metadce/test_metadce_files_wasmfs.jssize b/test/other/metadce/test_metadce_files_wasmfs.jssize index 39864fee7c8f6..f2891bc812a80 100644 --- a/test/other/metadce/test_metadce_files_wasmfs.jssize +++ b/test/other/metadce/test_metadce_files_wasmfs.jssize @@ -1 +1 @@ -6875 +6945 diff --git a/test/other/metadce/test_metadce_hello_O0.gzsize b/test/other/metadce/test_metadce_hello_O0.gzsize index 39c3a09269cd5..942449e20e15e 100644 --- a/test/other/metadce/test_metadce_hello_O0.gzsize +++ b/test/other/metadce/test_metadce_hello_O0.gzsize @@ -1 +1 @@ -8356 +8421 diff --git a/test/other/metadce/test_metadce_hello_O0.jssize b/test/other/metadce/test_metadce_hello_O0.jssize index c568e8d0847f1..68d76cab9c345 100644 --- a/test/other/metadce/test_metadce_hello_O0.jssize +++ b/test/other/metadce/test_metadce_hello_O0.jssize @@ -1 +1 @@ -22913 +23032 diff --git a/test/other/metadce/test_metadce_hello_O1.gzsize b/test/other/metadce/test_metadce_hello_O1.gzsize index fd1dbd889d1f9..31410c0cab693 100644 --- a/test/other/metadce/test_metadce_hello_O1.gzsize +++ b/test/other/metadce/test_metadce_hello_O1.gzsize @@ -1 +1 @@ -3016 +3064 diff --git a/test/other/metadce/test_metadce_hello_O1.jssize b/test/other/metadce/test_metadce_hello_O1.jssize index 4fae262bf9b02..6c86555fce684 100644 --- a/test/other/metadce/test_metadce_hello_O1.jssize +++ b/test/other/metadce/test_metadce_hello_O1.jssize @@ -1 +1 @@ -7769 +7853 diff --git a/test/other/metadce/test_metadce_hello_O2.gzsize b/test/other/metadce/test_metadce_hello_O2.gzsize index 71150e8800dcc..efa0ab6fce9eb 100644 --- a/test/other/metadce/test_metadce_hello_O2.gzsize +++ b/test/other/metadce/test_metadce_hello_O2.gzsize @@ -1 +1 @@ -2661 +2702 diff --git a/test/other/metadce/test_metadce_hello_O2.jssize b/test/other/metadce/test_metadce_hello_O2.jssize index bad2b418d646f..4362efad08806 100644 --- a/test/other/metadce/test_metadce_hello_O2.jssize +++ b/test/other/metadce/test_metadce_hello_O2.jssize @@ -1 +1 @@ -5530 +5588 diff --git a/test/other/metadce/test_metadce_hello_O3.gzsize b/test/other/metadce/test_metadce_hello_O3.gzsize index e2c12dfcdca3e..d9e63ef1b8fc0 100644 --- a/test/other/metadce/test_metadce_hello_O3.gzsize +++ b/test/other/metadce/test_metadce_hello_O3.gzsize @@ -1 +1 @@ -2577 +2620 diff --git a/test/other/metadce/test_metadce_hello_O3.jssize b/test/other/metadce/test_metadce_hello_O3.jssize index 6905a2a4ed94f..973907c4e4ab6 100644 --- a/test/other/metadce/test_metadce_hello_O3.jssize +++ b/test/other/metadce/test_metadce_hello_O3.jssize @@ -1 +1 @@ -5376 +5439 diff --git a/test/other/metadce/test_metadce_hello_Os.gzsize b/test/other/metadce/test_metadce_hello_Os.gzsize index e2c12dfcdca3e..d9e63ef1b8fc0 100644 --- a/test/other/metadce/test_metadce_hello_Os.gzsize +++ b/test/other/metadce/test_metadce_hello_Os.gzsize @@ -1 +1 @@ -2577 +2620 diff --git a/test/other/metadce/test_metadce_hello_Os.jssize b/test/other/metadce/test_metadce_hello_Os.jssize index 6905a2a4ed94f..973907c4e4ab6 100644 --- a/test/other/metadce/test_metadce_hello_Os.jssize +++ b/test/other/metadce/test_metadce_hello_Os.jssize @@ -1 +1 @@ -5376 +5439 diff --git a/test/other/metadce/test_metadce_hello_Oz.gzsize b/test/other/metadce/test_metadce_hello_Oz.gzsize index aed4b56065d98..12170310d2d0e 100644 --- a/test/other/metadce/test_metadce_hello_Oz.gzsize +++ b/test/other/metadce/test_metadce_hello_Oz.gzsize @@ -1 +1 @@ -2558 +2601 diff --git a/test/other/metadce/test_metadce_hello_Oz.jssize b/test/other/metadce/test_metadce_hello_Oz.jssize index 0cf9f71ea3b88..909fc98e896d0 100644 --- a/test/other/metadce/test_metadce_hello_Oz.jssize +++ b/test/other/metadce/test_metadce_hello_Oz.jssize @@ -1 +1 @@ -5343 +5406 diff --git a/test/other/metadce/test_metadce_hello_dylink.gzsize b/test/other/metadce/test_metadce_hello_dylink.gzsize index 288a9a5cb071d..8c2438e15022f 100644 --- a/test/other/metadce/test_metadce_hello_dylink.gzsize +++ b/test/other/metadce/test_metadce_hello_dylink.gzsize @@ -1 +1 @@ -6459 +6510 diff --git a/test/other/metadce/test_metadce_hello_dylink.jssize b/test/other/metadce/test_metadce_hello_dylink.jssize index 285a7cc7e75ee..cb9705967567e 100644 --- a/test/other/metadce/test_metadce_hello_dylink.jssize +++ b/test/other/metadce/test_metadce_hello_dylink.jssize @@ -1 +1 @@ -14303 +14362 diff --git a/test/other/metadce/test_metadce_hello_export_nothing.gzsize b/test/other/metadce/test_metadce_hello_export_nothing.gzsize index 679d3a3805feb..f48626da3a84f 100644 --- a/test/other/metadce/test_metadce_hello_export_nothing.gzsize +++ b/test/other/metadce/test_metadce_hello_export_nothing.gzsize @@ -1 +1 @@ -1931 +1979 diff --git a/test/other/metadce/test_metadce_hello_export_nothing.jssize b/test/other/metadce/test_metadce_hello_export_nothing.jssize index c933f5ac41e53..31a1f807b4325 100644 --- a/test/other/metadce/test_metadce_hello_export_nothing.jssize +++ b/test/other/metadce/test_metadce_hello_export_nothing.jssize @@ -1 +1 @@ -4162 +4218 diff --git a/test/other/metadce/test_metadce_hello_wasmfs.gzsize b/test/other/metadce/test_metadce_hello_wasmfs.gzsize index e2c12dfcdca3e..d9e63ef1b8fc0 100644 --- a/test/other/metadce/test_metadce_hello_wasmfs.gzsize +++ b/test/other/metadce/test_metadce_hello_wasmfs.gzsize @@ -1 +1 @@ -2577 +2620 diff --git a/test/other/metadce/test_metadce_hello_wasmfs.jssize b/test/other/metadce/test_metadce_hello_wasmfs.jssize index 6905a2a4ed94f..973907c4e4ab6 100644 --- a/test/other/metadce/test_metadce_hello_wasmfs.jssize +++ b/test/other/metadce/test_metadce_hello_wasmfs.jssize @@ -1 +1 @@ -5376 +5439 diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize b/test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize index 6a4fd21351996..b3c27164e383f 100644 --- a/test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize +++ b/test/other/metadce/test_metadce_libcxxabi_message_O3.gzsize @@ -1 +1 @@ -2141 +2189 diff --git a/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize b/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize index 148775a33a8cb..c179a536e8efa 100644 --- a/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize +++ b/test/other/metadce/test_metadce_libcxxabi_message_O3.jssize @@ -1 +1 @@ -4596 +4665 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 b62c68ea1f5da..476b093c45256 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 @@ -2173 +2228 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 209cee3145098..6aec326cee0ad 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 @@ -4647 +4718 diff --git a/test/other/metadce/test_metadce_mem_O3.gzsize b/test/other/metadce/test_metadce_mem_O3.gzsize index 49d31a38a5fd2..ea45272b02618 100644 --- a/test/other/metadce/test_metadce_mem_O3.gzsize +++ b/test/other/metadce/test_metadce_mem_O3.gzsize @@ -1 +1 @@ -2595 +2637 diff --git a/test/other/metadce/test_metadce_mem_O3.jssize b/test/other/metadce/test_metadce_mem_O3.jssize index edfd71e8f6777..b610ecac33217 100644 --- a/test/other/metadce/test_metadce_mem_O3.jssize +++ b/test/other/metadce/test_metadce_mem_O3.jssize @@ -1 +1 @@ -5496 +5558 diff --git a/test/other/metadce/test_metadce_mem_O3_grow.gzsize b/test/other/metadce/test_metadce_mem_O3_grow.gzsize index 6fb071591d88a..c66f6628c47f4 100644 --- a/test/other/metadce/test_metadce_mem_O3_grow.gzsize +++ b/test/other/metadce/test_metadce_mem_O3_grow.gzsize @@ -1 +1 @@ -2754 +2792 diff --git a/test/other/metadce/test_metadce_mem_O3_grow.jssize b/test/other/metadce/test_metadce_mem_O3_grow.jssize index c9a4db7eba921..f1a64599a3aaf 100644 --- a/test/other/metadce/test_metadce_mem_O3_grow.jssize +++ b/test/other/metadce/test_metadce_mem_O3_grow.jssize @@ -1 +1 @@ -5818 +5880 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 ac54f8beded56..a385b0c6e2512 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 @@ -2445 +2486 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 4dd60d34b0580..212d93183ba59 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 @@ -5206 +5268 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone.gzsize b/test/other/metadce/test_metadce_mem_O3_standalone.gzsize index 7cce2de38675e..2e5b071d22766 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone.gzsize +++ b/test/other/metadce/test_metadce_mem_O3_standalone.gzsize @@ -1 +1 @@ -2411 +2452 diff --git a/test/other/metadce/test_metadce_mem_O3_standalone.jssize b/test/other/metadce/test_metadce_mem_O3_standalone.jssize index 4488f39a24ed7..acd8018df11ce 100644 --- a/test/other/metadce/test_metadce_mem_O3_standalone.jssize +++ b/test/other/metadce/test_metadce_mem_O3_standalone.jssize @@ -1 +1 @@ -5136 +5198 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 1905eb8fcd709..f3346818e7541 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 @@ -2163 +2209 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 209cee3145098..7e1fd9331a8ad 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 @@ -4647 +4716 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 b62c68ea1f5da..476b093c45256 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 @@ -2173 +2228 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 209cee3145098..6aec326cee0ad 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 @@ -4647 +4718 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 b62c68ea1f5da..476b093c45256 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 @@ -2173 +2228 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 209cee3145098..6aec326cee0ad 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 @@ -4647 +4718 diff --git a/test/other/metadce/test_metadce_minimal_64.gzsize b/test/other/metadce/test_metadce_minimal_64.gzsize index 1c38c9071a6a5..68194d9781a41 100644 --- a/test/other/metadce/test_metadce_minimal_64.gzsize +++ b/test/other/metadce/test_metadce_minimal_64.gzsize @@ -1 +1 @@ -1725 +1781 diff --git a/test/other/metadce/test_metadce_minimal_64.jssize b/test/other/metadce/test_metadce_minimal_64.jssize index a47988fa3ccb3..232b6c6e4d2d2 100644 --- a/test/other/metadce/test_metadce_minimal_64.jssize +++ b/test/other/metadce/test_metadce_minimal_64.jssize @@ -1 +1 @@ -3635 +3698 diff --git a/test/other/metadce/test_metadce_minimal_O0.gzsize b/test/other/metadce/test_metadce_minimal_O0.gzsize index 6688253c74466..60e6c3459aebb 100644 --- a/test/other/metadce/test_metadce_minimal_O0.gzsize +++ b/test/other/metadce/test_metadce_minimal_O0.gzsize @@ -1 +1 @@ -7177 +7245 diff --git a/test/other/metadce/test_metadce_minimal_O0.jssize b/test/other/metadce/test_metadce_minimal_O0.jssize index bd5bcb77065b6..5e4681359c49b 100644 --- a/test/other/metadce/test_metadce_minimal_O0.jssize +++ b/test/other/metadce/test_metadce_minimal_O0.jssize @@ -1 +1 @@ -19537 +19666 diff --git a/test/other/metadce/test_metadce_minimal_O1.gzsize b/test/other/metadce/test_metadce_minimal_O1.gzsize index 5bcfdd68e8caf..648bc70339353 100644 --- a/test/other/metadce/test_metadce_minimal_O1.gzsize +++ b/test/other/metadce/test_metadce_minimal_O1.gzsize @@ -1 +1 @@ -1827 +1884 diff --git a/test/other/metadce/test_metadce_minimal_O1.jssize b/test/other/metadce/test_metadce_minimal_O1.jssize index ec44c91a80e86..96ca98800d132 100644 --- a/test/other/metadce/test_metadce_minimal_O1.jssize +++ b/test/other/metadce/test_metadce_minimal_O1.jssize @@ -1 +1 @@ -4419 +4499 diff --git a/test/other/metadce/test_metadce_minimal_O2.gzsize b/test/other/metadce/test_metadce_minimal_O2.gzsize index d1b8e2f29a872..a1efcad9e9f4e 100644 --- a/test/other/metadce/test_metadce_minimal_O2.gzsize +++ b/test/other/metadce/test_metadce_minimal_O2.gzsize @@ -1 +1 @@ -1660 +1704 diff --git a/test/other/metadce/test_metadce_minimal_O2.jssize b/test/other/metadce/test_metadce_minimal_O2.jssize index 0f1c48c0179c4..3db77484a6c22 100644 --- a/test/other/metadce/test_metadce_minimal_O2.jssize +++ b/test/other/metadce/test_metadce_minimal_O2.jssize @@ -1 +1 @@ -3362 +3410 diff --git a/test/other/metadce/test_metadce_minimal_O3.gzsize b/test/other/metadce/test_metadce_minimal_O3.gzsize index 871215b3e56b7..75c2bf7a2dc01 100644 --- a/test/other/metadce/test_metadce_minimal_O3.gzsize +++ b/test/other/metadce/test_metadce_minimal_O3.gzsize @@ -1 +1 @@ -1618 +1668 diff --git a/test/other/metadce/test_metadce_minimal_O3.jssize b/test/other/metadce/test_metadce_minimal_O3.jssize index 1d439c4d85b4a..c4998df1f811b 100644 --- a/test/other/metadce/test_metadce_minimal_O3.jssize +++ b/test/other/metadce/test_metadce_minimal_O3.jssize @@ -1 +1 @@ -3312 +3360 diff --git a/test/other/metadce/test_metadce_minimal_Os.gzsize b/test/other/metadce/test_metadce_minimal_Os.gzsize index 871215b3e56b7..75c2bf7a2dc01 100644 --- a/test/other/metadce/test_metadce_minimal_Os.gzsize +++ b/test/other/metadce/test_metadce_minimal_Os.gzsize @@ -1 +1 @@ -1618 +1668 diff --git a/test/other/metadce/test_metadce_minimal_Os.jssize b/test/other/metadce/test_metadce_minimal_Os.jssize index 1d439c4d85b4a..c4998df1f811b 100644 --- a/test/other/metadce/test_metadce_minimal_Os.jssize +++ b/test/other/metadce/test_metadce_minimal_Os.jssize @@ -1 +1 @@ -3312 +3360 diff --git a/test/other/metadce/test_metadce_minimal_Oz-ctors.gzsize b/test/other/metadce/test_metadce_minimal_Oz-ctors.gzsize index 480d250f51e23..af2b5c515faea 100644 --- a/test/other/metadce/test_metadce_minimal_Oz-ctors.gzsize +++ b/test/other/metadce/test_metadce_minimal_Oz-ctors.gzsize @@ -1 +1 @@ -1610 +1657 diff --git a/test/other/metadce/test_metadce_minimal_Oz-ctors.jssize b/test/other/metadce/test_metadce_minimal_Oz-ctors.jssize index d7a33ea4704b0..2e348c78251db 100644 --- a/test/other/metadce/test_metadce_minimal_Oz-ctors.jssize +++ b/test/other/metadce/test_metadce_minimal_Oz-ctors.jssize @@ -1 +1 @@ -3297 +3345 diff --git a/test/other/metadce/test_metadce_minimal_Oz.gzsize b/test/other/metadce/test_metadce_minimal_Oz.gzsize index 871215b3e56b7..75c2bf7a2dc01 100644 --- a/test/other/metadce/test_metadce_minimal_Oz.gzsize +++ b/test/other/metadce/test_metadce_minimal_Oz.gzsize @@ -1 +1 @@ -1618 +1668 diff --git a/test/other/metadce/test_metadce_minimal_Oz.jssize b/test/other/metadce/test_metadce_minimal_Oz.jssize index 1d439c4d85b4a..c4998df1f811b 100644 --- a/test/other/metadce/test_metadce_minimal_Oz.jssize +++ b/test/other/metadce/test_metadce_minimal_Oz.jssize @@ -1 +1 @@ -3312 +3360 diff --git a/test/other/metadce/test_metadce_minimal_pthreads.gzsize b/test/other/metadce/test_metadce_minimal_pthreads.gzsize index 3c0e933c139cb..d567f8a0b01f3 100644 --- a/test/other/metadce/test_metadce_minimal_pthreads.gzsize +++ b/test/other/metadce/test_metadce_minimal_pthreads.gzsize @@ -1 +1 @@ -4921 +4950 diff --git a/test/other/metadce/test_metadce_minimal_pthreads.jssize b/test/other/metadce/test_metadce_minimal_pthreads.jssize index 47aac242f9ac2..f9418a034674f 100644 --- a/test/other/metadce/test_metadce_minimal_pthreads.jssize +++ b/test/other/metadce/test_metadce_minimal_pthreads.jssize @@ -1 +1 @@ -13569 +13613 diff --git a/test/other/metadce/test_metadce_minimal_wasmfs.gzsize b/test/other/metadce/test_metadce_minimal_wasmfs.gzsize index 871215b3e56b7..75c2bf7a2dc01 100644 --- a/test/other/metadce/test_metadce_minimal_wasmfs.gzsize +++ b/test/other/metadce/test_metadce_minimal_wasmfs.gzsize @@ -1 +1 @@ -1618 +1668 diff --git a/test/other/metadce/test_metadce_minimal_wasmfs.jssize b/test/other/metadce/test_metadce_minimal_wasmfs.jssize index 1d439c4d85b4a..c4998df1f811b 100644 --- a/test/other/metadce/test_metadce_minimal_wasmfs.jssize +++ b/test/other/metadce/test_metadce_minimal_wasmfs.jssize @@ -1 +1 @@ -3312 +3360 diff --git a/test/other/test_unoptimized_code_size.js.size b/test/other/test_unoptimized_code_size.js.size index 65c47f2784f5f..b7af70b5b668e 100644 --- a/test/other/test_unoptimized_code_size.js.size +++ b/test/other/test_unoptimized_code_size.js.size @@ -1 +1 @@ -58086 +58208 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 996164ae69368..c35454ee929b4 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 @@ -31565 +31631 diff --git a/test/other/test_unoptimized_code_size_strict.js.size b/test/other/test_unoptimized_code_size_strict.js.size index bdb09b0d6def5..9766643942816 100644 --- a/test/other/test_unoptimized_code_size_strict.js.size +++ b/test/other/test_unoptimized_code_size_strict.js.size @@ -1 +1 @@ -56997 +56996 diff --git a/tools/link.py b/tools/link.py index 57f32d09280e0..b41534395ab70 100644 --- a/tools/link.py +++ b/tools/link.py @@ -1347,6 +1347,14 @@ def phase_linker_setup(options, state, newargs): # in global scope that is not suitable for MINIMAL_RUNTIME loader. settings.EXPORTED_RUNTIME_METHODS += ['stackSave', 'stackAlloc', 'stackRestore', 'wasmTable'] + if not settings.MINIMAL_RUNTIME and not settings.STRICT: + settings.EXPORTED_RUNTIME_METHODS += ['HEAP8', 'HEAPU8', + 'HEAP16', 'HEAPU16', + 'HEAP32', 'HEAPU32', + 'HEAPF32', 'HEAPF64'] + if settings.MEMORY64: + settings.EXPORTED_RUNTIME_METHODS += ['HEAP64', 'HEAPU64'] + if settings.FORCE_FILESYSTEM and not settings.MINIMAL_RUNTIME: # when the filesystem is forced, we export by default methods that filesystem usage # may need, including filesystem usage from standalone file packager output (i.e.