Enable WASM_BIGINT by default

.circleci/config.yml

@@ -592,7 +592,7 @@ jobs:
             other.test_min_node_version
             other.test_node_emscripten_num_logical_cores
             core2.test_pthread_create
-            core2.test_i64_invoke_bigint
+            core2.test_i64_invoke
             core2.test_sse2
             core2.test_source_map
             core2.test_exceptions_wasm

emcc.py

@@ -1896,8 +1896,10 @@ def phase_linker_setup(options, state, newargs):
   if settings.LZ4:
     settings.EXPORTED_RUNTIME_METHODS += ['LZ4']
 
+  # WASM_BIGINT defaults to 1 when VMs support it, and when not using wasm2js
   default_setting('WASM_BIGINT',
-                  feature_matrix.caniuse(feature_matrix.Feature.JS_BIGINT_INTEGRATION))
+                  feature_matrix.caniuse(feature_matrix.Feature.JS_BIGINT_INTEGRATION) and \
+                  not settings.WASM2JS)
 
   if settings.PURE_WASI:
     settings.STANDALONE_WASM = 1

test/common.py

@@ -283,14 +283,13 @@ def metafunc(self, with_bigint):
         self.skipTest('wasm2js does not support WASM_BIGINT')
       if self.get_setting('WASM_BIGINT') is not None:
         self.skipTest('redundant in bigint test config')
-      self.set_setting('WASM_BIGINT')
-      self.node_args += shared.node_bigint_flags()
       f(self)
     else:
+      self.set_setting('WASM_BIGINT', '0')
       f(self)
 
-  metafunc._parameterize = {'': (False,),
-                            'bigint': (True,)}
+  metafunc._parameterize = {'no_bigint': (False,),
+                            '': (True,)}
   return metafunc
 
 

test/test_core.py

@@ -2327,11 +2327,9 @@ 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, '-sWASM=0', '-Werror', 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.do_core_test('test_em_js_i64.c')
 
   def test_em_js_address_taken(self):