Fix for wasm64 when DYNCALLS is enabled (#20394)

I noticed that test/browser/async.cpp was failing in wasm64 mode.
This change fixes the failure, and also moves that test out of browser
testing and into core testing.

Author: sbc100

test/browser/async_longjmp.cpp renamed to test/core/test_asyncify_longjmp.c

@@ -0,0 +1,4 @@
+first
+result: 1 1
+second
+result: 2 -1

test/core/test_asyncify_longjmp.out

@@ -3445,15 +3445,6 @@ def test_async_virtual_2(self):
       print(opts)
       self.btest_exit('async_virtual_2.cpp', args=['-O' + str(opts), '-sASSERTIONS', '-sSAFE_HEAP', '-profiling', '-sASYNCIFY'])
 
-  # Test async sleeps in the presence of invoke_* calls, which can happen with
-  # longjmp or exceptions.
-  @parameterized({
-    'O0': ([],), # noqa
-    'O3': (['-O3'],), # noqa
-  })
-  def test_async_longjmp(self, args):
-    self.btest_exit('async_longjmp.cpp', args=args + ['-sASYNCIFY'])
-
   def test_async_mainloop(self):
     for opts in [0, 3]:
       print(opts)

test/test_browser.py

@@ -8276,6 +8276,12 @@ def test_setlocale(self):
   def test_vswprintf_utf8(self):
     self.do_core_test('test_vswprintf_utf8.c')
 
+  # Test async sleeps in the presence of invoke_* calls, which can happen with
+  # longjmp or exceptions.
+  def test_asyncify_longjmp(self):
+    self.set_setting('ASYNCIFY')
+    self.do_core_test('test_asyncify_longjmp.c')
+
   # Test that a main with arguments is automatically asyncified.
   @with_asyncify_and_jspi
   def test_async_main(self):

test/test_core.py

@@ -108,6 +108,9 @@ def isidentifier(name):
 
 def make_dynCall(sig, args):
   # wasm2c and asyncify are not yet compatible with direct wasm table calls
+  if settings.MEMORY64:
+    args = list(args)
+    args[0] = f'Number({args[0]})'
   if settings.DYNCALLS or not is_legal_sig(sig):
     args = ','.join(args)
     if not settings.MAIN_MODULE and not settings.SIDE_MODULE:
@@ -117,11 +120,8 @@ def make_dynCall(sig, args):
     else:
       return 'Module["dynCall_%s"](%s)' % (sig, args)
   else:
-    func_ptr = args[0]
-    if settings.MEMORY64:
-      func_ptr = f'Number({func_ptr})'
     call_args = ",".join(args[1:])
-    return f'getWasmTableEntry({func_ptr})({call_args})'
+    return f'getWasmTableEntry({args[0]})({call_args})'
 
 
 def make_invoke(sig):