[WIP] Enable WASM_BIGINT by default

Enables by default by temporarily reducing required Safari version.

Also includes bugfixes for WASM_BIGINT compatibility.

Author: dschuff

src/library_wasmfs_jsimpl.js

@@ -53,6 +53,7 @@ addToLibrary({
     return wasmFS$backends[backend].getSize(file);
   },
 
+  _wasmfs_jsimpl_set_size__i53abi: true,
   _wasmfs_jsimpl_set_size: (backend, file, size) => {
 #if ASSERTIONS
     assert(wasmFS$backends[backend]);

src/shell.js

@@ -49,7 +49,8 @@ var Module = typeof {{{ EXPORT_NAME }}} != 'undefined' ? {{{ EXPORT_NAME }}} : {
 #include "polyfill/objassign.js"
 #endif
 
-#if WASM_BIGINT && MIN_SAFARI_VERSION < 150000
+#if WASM_BIGINT && MIN_SAFARI_VERSION < 140100
+// TODO: Fix this back to 150000
 // See https://caniuse.com/mdn-javascript_builtins_bigint64array
 #include "polyfill/bigint64array.js"
 #endif

test/test_core.py

@@ -1954,10 +1954,8 @@ def test_em_js(self, args, force_c):
 
   @no_wasm2js('WASM_BIGINT is not compatible with wasm2js')
   def test_em_js_i64(self):
-    err = self.expect_fail([EMCC, '-Werror', test_file('core/test_em_js_i64.c')])
+    err = self.expect_fail([EMCC, '-Werror', '-sWASM_BIGINT=0', test_file('core/test_em_js_i64.c')])
     self.assertContained('emcc: error: using 64-bit arguments in EM_JS function without WASM_BIGINT is not yet fully supported: `foo`', err)
-
-    self.set_setting('WASM_BIGINT')
     self.node_args += shared.node_bigint_flags(self.get_nodejs())
     self.do_core_test('test_em_js_i64.c')
 
@@ -6995,11 +6993,10 @@ def test_EXPORTED_RUNTIME_METHODS(self):
   def test_dyncall_specific(self, *args):
     if self.get_setting('MEMORY64'):
       self.skipTest('not compatible with MEMORY64')
-    if self.get_setting('WASM_BIGINT'):
-      # define DYNCALLS because this test does test calling them directly, and
-      # in WASM_BIGINT mode we do not enable them by default (since we can do
-      # more without them - we don't need to legalize)
-      args = list(args) + ['-sDYNCALLS', '-DWASM_BIGINT']
+    # define DYNCALLS because this test does test calling them directly, and
+    # in WASM_BIGINT mode we do not enable them by default (since we can do
+    # more without them - we don't need to legalize)
+    args = list(args) + ['-sDYNCALLS', '-DWASM_BIGINT']
     cases = [
         ('DIRECT', []),
         ('DYNAMIC_SIG', ['-sDYNCALLS']),
@@ -8417,6 +8414,7 @@ def test_wasm2js(self):
     if self.is_wasm2js():
       self.skipTest('redundant to test wasm2js in wasm2js* mode')
     self.set_setting('WASM', 0)
+    self.set_setting('WASM_BIGINT', 0)
     self.do_core_test('test_hello_world.c')
     self.assertNotExists('test_hello_world.js.mem')
 
@@ -8448,7 +8446,7 @@ def test_wasm2js_fallback(self, args):
     if self.is_wasm2js():
       self.skipTest('redundant to test wasm2js in wasm2js* mode')
 
-    cmd = [EMCC, test_file('small_hello_world.c'), '-sWASM=2'] + args
+    cmd = [EMCC, test_file('small_hello_world.c'), '-sWASM=2', '-sWASM_BIGINT=0'] + args
     self.run_process(cmd)
 
     # First run with WebAssembly support enabled

test/test_other.py

@@ -8197,15 +8197,15 @@ def test_memory_growth_noasm(self):
     assert 'use asm' not in src
 
   def test_EM_ASM_i64(self):
+    self.do_other_test('test_em_asm_i64.cpp')
+    self.do_other_test('test_em_asm_i64.cpp', force_c=True)
+
+    self.set_setting('WASM_BIGINT', 0)
     expected = 'Invalid character 106("j") in readEmAsmArgs!'
     self.do_runf('other/test_em_asm_i64.cpp',
                  expected_output=expected,
                  assert_returncode=NON_ZERO)
 
-    self.set_setting('WASM_BIGINT')
-    self.do_other_test('test_em_asm_i64.cpp')
-    self.do_other_test('test_em_asm_i64.cpp', force_c=True)
-
   def test_eval_ctor_ordering(self):
     # ensure order of execution remains correct, even with a bad ctor
     def test(p1, p2, p3, last, expected):
@@ -12373,6 +12373,7 @@ def fail(args, details):
     # plain -O0
     legalization_message = 'to disable int64 legalization (which requires changes after link) use -sWASM_BIGINT'
     fail([], legalization_message)
+    fail(['-sMIN_SAFARI_VERSION=140100'], legalization_message)
     # optimized builds even without legalization
     optimization_message = '-O2+ optimizations always require changes, build with -O0 or -O1 instead'
     fail(required_flags + ['-O2'], optimization_message)

tools/feature_matrix.py

@@ -66,7 +66,7 @@ class Feature(IntEnum):
   Feature.JS_BIGINT_INTEGRATION: {
     'chrome': 67,
     'firefox': 68,
-    'safari': 150000,
+    'safari': 140100,
   },
   Feature.THREADS: {
     'chrome': 74,

tools/link.py

@@ -786,6 +786,10 @@ def phase_linker_setup(options, state, newargs):
     # to js.
     settings.WASM = 1
     settings.WASM2JS = 1
+    # Wasm bigint doesn't make sense with wasm2js, since it controls how the
+    # wasm and JS interact.
+    settings.WASM_BIGINT = 0
+    feature_matrix.disable_feature(feature_matrix.Feature.JS_BIGINT_INTEGRATION)
   if settings.WASM == 2:
     # Requesting both Wasm and Wasm2JS support
     settings.WASM2JS = 1
@@ -1386,6 +1390,8 @@ def phase_linker_setup(options, state, newargs):
   settings.SUPPORTS_PROMISE_ANY = feature_matrix.caniuse(feature_matrix.Feature.PROMISE_ANY)
   if not settings.BULK_MEMORY:
     settings.BULK_MEMORY = feature_matrix.caniuse(feature_matrix.Feature.BULK_MEMORY)
+  if 'WASM_BIGINT' not in user_settings:
+    settings.WASM_BIGINT = feature_matrix.caniuse(feature_matrix.Feature.JS_BIGINT_INTEGRATION)
 
   if settings.AUDIO_WORKLET:
     if settings.AUDIO_WORKLET == 1: