emscripten-core · dschuff · Dec 18, 2024 · Nov 15, 2024 · Nov 22, 2024 · Nov 22, 2024
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -20,6 +20,9 @@ See docs/process.md for more on how version tagging works.
 
 3.1.75 (in development)
 -----------------------
+- The `WASM_BIGINT` feature has been enabled by default. This has the effect that
+  Wasm i64 values are passed and returned between Wasm and JS as BigInt values
+  rather than being split by Binaryen into pairs of Numbers.
 - When using `-sMODULARIZE` we now assert if the factory function is called with
   the JS `new` keyword.  e.g. `a = new Module()` rather than `b = Module()`.
   This paves the way for marking the function as `async` which does not allow

diff --git a/site/source/docs/tools_reference/settings_reference.rst b/site/source/docs/tools_reference/settings_reference.rst
@@ -2189,7 +2189,7 @@ legalize i64s into pairs of i32s, as the wasm VM will use a BigInt where an
 i64 is used. If WASM_BIGINT is present, the default minimum supported browser
 versions will be increased to the min version that supports BigInt.
 
-Default value: false
+Default value: true
 
 .. _emit_producers_section:
 

diff --git a/src/settings.js b/src/settings.js
@@ -1498,7 +1498,7 @@ var DYNCALLS = false;
 // i64 is used. If WASM_BIGINT is present, the default minimum supported browser
 // versions will be increased to the min version that supports BigInt.
 // [link]
-var WASM_BIGINT = false;
+var WASM_BIGINT = true;
 
 // WebAssembly defines a "producers section" which compilers and tools can
 // annotate themselves in, and LLVM emits this by default.

diff --git a/src/shell.js b/src/shell.js
@@ -34,7 +34,8 @@ var Module = typeof {{{ EXPORT_NAME }}} != 'undefined' ? {{{ EXPORT_NAME }}} : {
 #endif // USE_CLOSURE_COMPILER
 
 #if POLYFILL
-#if WASM_BIGINT && MIN_SAFARI_VERSION < 150000
+#if WASM_BIGINT && MIN_SAFARI_VERSION < 140100
+// TODO(https://github.com/emscripten-core/emscripten/issues/23184): Fix this back to 150000
 // See https://caniuse.com/mdn-javascript_builtins_bigint64array
 #include "polyfill/bigint64array.js"
 #endif

diff --git a/test/browser/test_small_js_flags.js.size b/test/browser/test_small_js_flags.js.size
@@ -1 +1 @@
-4297
+4380
diff --git a/test/code_size/embind_hello_wasm.json b/test/code_size/embind_hello_wasm.json
@@ -1,10 +1,10 @@
 {
   "a.html": 552,
   "a.html.gz": 380,
-  "a.js": 9593,
-  "a.js.gz": 4230,
-  "a.wasm": 7615,
-  "a.wasm.gz": 3471,
-  "total": 17760,
-  "total_gz": 8081
+  "a.js": 9879,
+  "a.js.gz": 4288,
+  "a.wasm": 7580,
+  "a.wasm.gz": 3449,
+  "total": 18011,
+  "total_gz": 8117
 }
diff --git a/test/code_size/embind_val_wasm.json b/test/code_size/embind_val_wasm.json
@@ -1,10 +1,10 @@
 {
   "a.html": 552,
   "a.html.gz": 380,
-  "a.js": 6724,
-  "a.js.gz": 2900,
-  "a.wasm": 9528,
-  "a.wasm.gz": 4896,
-  "total": 16804,
-  "total_gz": 8176
+  "a.js": 7153,
+  "a.js.gz": 3042,
+  "a.wasm": 9493,
+  "a.wasm.gz": 4872,
+  "total": 17198,
+  "total_gz": 8294
 }
diff --git a/test/common.py b/test/common.py
@@ -37,7 +37,7 @@
 from tools.shared import get_canonical_temp_dir, path_from_root
 from tools.utils import MACOS, WINDOWS, read_file, read_binary, write_binary, exit_with_error
 from tools.settings import COMPILE_TIME_SETTINGS
-from tools import shared, line_endings, building, config, utils
+from tools import shared, feature_matrix, line_endings, building, config, utils
 
 logger = logging.getLogger('common')
 
@@ -1164,6 +1164,8 @@ def setUp(self):
       if node_version < emcc_min_node_version:
         self.emcc_args += building.get_emcc_node_flags(node_version)
         self.emcc_args.append('-Wno-transpile')
+      if node_version[0] < feature_matrix.min_browser_versions[feature_matrix.Feature.JS_BIGINT_INTEGRATION]['node'] / 10000:
+        self.emcc_args.append('-sWASM_BIGINT=0')
 
     self.v8_args = ['--wasm-staging']
     self.env = {}

diff --git a/test/other/codesize/test_codesize_cxx_ctors1.exports b/test/other/codesize/test_codesize_cxx_ctors1.exports
@@ -2,11 +2,6 @@ __indirect_function_table
 __wasm_call_ctors
 _emscripten_stack_alloc
 _emscripten_stack_restore
-dynCall_iiiiiijj
-dynCall_iiiiij
-dynCall_iiiiijj
-dynCall_jiji
-dynCall_viijii
 emscripten_stack_get_current
 main
 memory
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.gzsize b/test/other/codesize/test_codesize_cxx_ctors1.gzsize
@@ -1 +1 @@
-8502
+8352
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.jssize b/test/other/codesize/test_codesize_cxx_ctors1.jssize
@@ -1 +1 @@
-20867
+20347
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.size b/test/other/codesize/test_codesize_cxx_ctors1.size
@@ -1 +1 @@
-129231
+128974
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.exports b/test/other/codesize/test_codesize_cxx_ctors2.exports
@@ -1,11 +1,6 @@
 __indirect_function_table
 _emscripten_stack_alloc
 _emscripten_stack_restore
-dynCall_iiiiiijj
-dynCall_iiiiij
-dynCall_iiiiijj
-dynCall_jiji
-dynCall_viijii
 emscripten_stack_get_current
 main
 memory
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.gzsize b/test/other/codesize/test_codesize_cxx_ctors2.gzsize
@@ -1 +1 @@
-8486
+8336
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.jssize b/test/other/codesize/test_codesize_cxx_ctors2.jssize
@@ -1 +1 @@
-20835
+20315
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.size b/test/other/codesize/test_codesize_cxx_ctors2.size
@@ -1 +1 @@
-128680
+128423
diff --git a/test/other/codesize/test_codesize_cxx_except.exports b/test/other/codesize/test_codesize_cxx_except.exports
@@ -8,12 +8,6 @@ __wasm_call_ctors
 _emscripten_stack_alloc
 _emscripten_stack_restore
 _emscripten_tempret_set
-dynCall_iiiiiijj
-dynCall_iiiiij
-dynCall_iiiiijj
-dynCall_jiiii
-dynCall_jiji
-dynCall_viijii
 emscripten_stack_get_current
 main
 memory

diff --git a/test/other/codesize/test_codesize_cxx_except.gzsize b/test/other/codesize/test_codesize_cxx_except.gzsize
@@ -1 +1 @@
-9533
+9358
diff --git a/test/other/codesize/test_codesize_cxx_except.jssize b/test/other/codesize/test_codesize_cxx_except.jssize
@@ -1 +1 @@
-24712
+24116
diff --git a/test/other/codesize/test_codesize_cxx_except.size b/test/other/codesize/test_codesize_cxx_except.size
@@ -1 +1 @@
-171361
+171008
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.exports b/test/other/codesize/test_codesize_cxx_except_wasm.exports
@@ -2,10 +2,5 @@ __indirect_function_table
 __trap
 __wasm_call_ctors
 _emscripten_stack_alloc
-dynCall_iiiiiijj
-dynCall_iiiiij
-dynCall_iiiiijj
-dynCall_jiji
-dynCall_viijii
 main
 memory
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
@@ -1 +1 @@
-8464
+8321
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.jssize b/test/other/codesize/test_codesize_cxx_except_wasm.jssize
@@ -1 +1 @@
-20760
+20240
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.size b/test/other/codesize/test_codesize_cxx_except_wasm.size
@@ -1 +1 @@
-142481
+142223
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.exports b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.exports
@@ -2,10 +2,5 @@ __indirect_function_table
 __trap
 __wasm_call_ctors
 _emscripten_stack_alloc
-dynCall_iiiiiijj
-dynCall_iiiiij
-dynCall_iiiiijj
-dynCall_jiji
-dynCall_viijii
 main
 memory
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize
@@ -1 +1 @@
-8464
+8321
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize
@@ -1 +1 @@
-20760
+20240
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.size b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.size
@@ -1 +1 @@
-145068
+144810
diff --git a/test/other/codesize/test_codesize_cxx_lto.gzsize b/test/other/codesize/test_codesize_cxx_lto.gzsize
@@ -1 +1 @@
-8413
+8348
diff --git a/test/other/codesize/test_codesize_cxx_lto.imports b/test/other/codesize/test_codesize_cxx_lto.imports
@@ -1,11 +1,11 @@
-a (fd_seek)
-b (emscripten_resize_heap)
-c (_tzset_js)
-d (_setitimer_js)
-e (_emscripten_runtime_keepalive_clear)
-f (_abort_js)
-g (proc_exit)
-h (fd_write)
+a (emscripten_resize_heap)
+b (_tzset_js)
+c (_setitimer_js)
+d (_emscripten_runtime_keepalive_clear)
+e (_abort_js)
+f (proc_exit)
+g (fd_write)
+h (fd_seek)
 i (fd_read)
 j (fd_close)
 k (environ_sizes_get)

diff --git a/test/other/codesize/test_codesize_cxx_lto.jssize b/test/other/codesize/test_codesize_cxx_lto.jssize
@@ -1 +1 @@
-20451
+20371
diff --git a/test/other/codesize/test_codesize_cxx_lto.sent b/test/other/codesize/test_codesize_cxx_lto.sent
@@ -1,11 +1,11 @@
-a (fd_seek)
-b (emscripten_resize_heap)
-c (_tzset_js)
-d (_setitimer_js)
-e (_emscripten_runtime_keepalive_clear)
-f (_abort_js)
-g (proc_exit)
-h (fd_write)
+a (emscripten_resize_heap)
+b (_tzset_js)
+c (_setitimer_js)
+d (_emscripten_runtime_keepalive_clear)
+e (_abort_js)
+f (proc_exit)
+g (fd_write)
+h (fd_seek)
 i (fd_read)
 j (fd_close)
 k (environ_sizes_get)

diff --git a/test/other/codesize/test_codesize_cxx_lto.size b/test/other/codesize/test_codesize_cxx_lto.size
@@ -1 +1 @@
-121923
+121924
diff --git a/test/other/codesize/test_codesize_cxx_mangle.exports b/test/other/codesize/test_codesize_cxx_mangle.exports
@@ -9,12 +9,6 @@ __wasm_call_ctors
 _emscripten_stack_alloc
 _emscripten_stack_restore
 _emscripten_tempret_set
-dynCall_iiiiiijj
-dynCall_iiiiij
-dynCall_iiiiijj
-dynCall_jiiii
-dynCall_jiji
-dynCall_viijii
 emscripten_stack_get_current
 free
 main

diff --git a/test/other/codesize/test_codesize_cxx_mangle.gzsize b/test/other/codesize/test_codesize_cxx_mangle.gzsize
@@ -1 +1 @@
-9538
+9361
diff --git a/test/other/codesize/test_codesize_cxx_mangle.jssize b/test/other/codesize/test_codesize_cxx_mangle.jssize
@@ -1 +1 @@
-24712
+24116
diff --git a/test/other/codesize/test_codesize_cxx_mangle.size b/test/other/codesize/test_codesize_cxx_mangle.size
@@ -1 +1 @@
-232870
+232517
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.exports b/test/other/codesize/test_codesize_cxx_noexcept.exports
@@ -2,11 +2,6 @@ __indirect_function_table
 __wasm_call_ctors
 _emscripten_stack_alloc
 _emscripten_stack_restore
-dynCall_iiiiiijj
-dynCall_iiiiij
-dynCall_iiiiijj
-dynCall_jiji
-dynCall_viijii
 emscripten_stack_get_current
 main
 memory
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.gzsize b/test/other/codesize/test_codesize_cxx_noexcept.gzsize
@@ -1 +1 @@
-8502
+8352
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.jssize b/test/other/codesize/test_codesize_cxx_noexcept.jssize
@@ -1 +1 @@
-20867
+20347
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.size b/test/other/codesize/test_codesize_cxx_noexcept.size
@@ -1 +1 @@
-132038
+131781
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.exports b/test/other/codesize/test_codesize_cxx_wasmfs.exports
@@ -2,14 +2,6 @@ __indirect_function_table
 __wasm_call_ctors
 _emscripten_stack_alloc
 _emscripten_stack_restore
-dynCall_iiiiiijj
-dynCall_iiiiij
-dynCall_iiiiijj
-dynCall_iiiij
-dynCall_iij
-dynCall_ji
-dynCall_jiji
-dynCall_viijii
 emscripten_stack_get_current
 main
 memory
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.gzsize b/test/other/codesize/test_codesize_cxx_wasmfs.gzsize
@@ -1 +1 @@
-3769
+3653
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.jssize b/test/other/codesize/test_codesize_cxx_wasmfs.jssize
@@ -1 +1 @@
-8493
+7914
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.size b/test/other/codesize/test_codesize_cxx_wasmfs.size
@@ -1 +1 @@
-169290
+168928
diff --git a/test/other/codesize/test_codesize_files_js_fs.gzsize b/test/other/codesize/test_codesize_files_js_fs.gzsize
@@ -1 +1 @@
-7638
+7656
diff --git a/test/other/codesize/test_codesize_files_js_fs.jssize b/test/other/codesize/test_codesize_files_js_fs.jssize
@@ -1 +1 @@
-18780
+18842
diff --git a/test/other/codesize/test_codesize_files_wasmfs.gzsize b/test/other/codesize/test_codesize_files_wasmfs.gzsize
@@ -1 +1 @@
-2866
+2882
diff --git a/test/other/codesize/test_codesize_files_wasmfs.jssize b/test/other/codesize/test_codesize_files_wasmfs.jssize
@@ -1 +1 @@
-6140
+6202
diff --git a/test/other/codesize/test_codesize_hello_O0.exports b/test/other/codesize/test_codesize_hello_O0.exports
@@ -2,7 +2,6 @@ __indirect_function_table
 __wasm_call_ctors
 _emscripten_stack_alloc
 _emscripten_stack_restore
-dynCall_jiji
 emscripten_stack_get_base
 emscripten_stack_get_current
 emscripten_stack_get_end

diff --git a/test/other/codesize/test_codesize_hello_O0.funcs b/test/other/codesize/test_codesize_hello_O0.funcs
@@ -25,9 +25,6 @@ $__wasi_syscall_ret
 $__wasm_call_ctors
 $_emscripten_stack_alloc
 $_emscripten_stack_restore
-$_emscripten_tempret_get
-$_emscripten_tempret_set
-$dynCall_jiji
 $emscripten_stack_get_base
 $emscripten_stack_get_current
 $emscripten_stack_get_end
@@ -42,7 +39,6 @@ $frexp
 $getint
 $getpid
 $init_pthread_self
-$legalstub$dynCall_jiji
 $main
 $memchr
 $out

diff --git a/test/other/codesize/test_codesize_hello_O0.gzsize b/test/other/codesize/test_codesize_hello_O0.gzsize
@@ -1 +1 @@
-8003
+8017
diff --git a/test/other/codesize/test_codesize_hello_O0.jssize b/test/other/codesize/test_codesize_hello_O0.jssize
@@ -1 +1 @@
-21535
+21597
diff --git a/test/other/codesize/test_codesize_hello_O0.size b/test/other/codesize/test_codesize_hello_O0.size
@@ -1 +1 @@
-14531
+15142
diff --git a/test/other/codesize/test_codesize_hello_O1.exports b/test/other/codesize/test_codesize_hello_O1.exports
@@ -2,7 +2,6 @@ __indirect_function_table
 __wasm_call_ctors
 _emscripten_stack_alloc
 _emscripten_stack_restore
-dynCall_jiji
 emscripten_stack_get_current
 main
 memory
diff --git a/test/other/codesize/test_codesize_hello_O1.funcs b/test/other/codesize/test_codesize_hello_O1.funcs
@@ -13,13 +13,9 @@ $__wasi_syscall_ret
 $__wasm_call_ctors
 $_emscripten_stack_alloc
 $_emscripten_stack_restore
-$_emscripten_tempret_get
-$_emscripten_tempret_set
-$dynCall_jiji
 $emscripten_stack_get_current
 $fputs
 $fwrite
-$legalstub$dynCall_jiji
 $main
 $puts
 $strlen
diff --git a/test/other/codesize/test_codesize_hello_O1.gzsize b/test/other/codesize/test_codesize_hello_O1.gzsize
@@ -1 +1 @@
-2713
+2697
diff --git a/test/other/codesize/test_codesize_hello_O1.jssize b/test/other/codesize/test_codesize_hello_O1.jssize
@@ -1 +1 @@
-6921
+6911
diff --git a/test/other/codesize/test_codesize_hello_O1.size b/test/other/codesize/test_codesize_hello_O1.size
@@ -1 +1 @@
-2535
+2634
diff --git a/test/other/codesize/test_codesize_hello_O2.exports b/test/other/codesize/test_codesize_hello_O2.exports
@@ -2,7 +2,6 @@ __indirect_function_table
 __wasm_call_ctors
 _emscripten_stack_alloc
 _emscripten_stack_restore
-dynCall_jiji
 emscripten_stack_get_current
 main
 memory