JSPI - Fix ccall. (#19800)

Add code to handle JSPI for ccall.

Author: brendandahl

.circleci/config.yml

@@ -655,7 +655,9 @@ jobs:
             other.test_native_call_before_init
             other.test_node_unhandled_rejection
             core2.test_hello_world
-            core0.test_pthread_join_and_asyncify"
+            core0.test_pthread_join_and_asyncify
+            core0.test_async_ccall_promise_jspi
+            core0.test_async_ccall_promise_exit_runtime_jspi"
       # Run some basic tests with the minimum version of node that we currently
       # support.
       - install-node-version:

src/library_ccall.js

@@ -85,11 +85,14 @@ mergeInto(LibraryManager.library, {
       if (stack !== 0) stackRestore(stack);
       return convertReturnValue(ret);
     }
+#if ASYNCIFY
+  var asyncMode = opts && opts.async;
+#endif
+
 #if ASYNCIFY == 1
     // Keep the runtime alive through all calls. Note that this call might not be
     // async, but for simplicity we push and pop in all calls.
     runtimeKeepalivePush();
-    var asyncMode = opts && opts.async;
     if (Asyncify.currData != previousAsync) {
 #if ASSERTIONS
       // A change in async operation happened. If there was already an async
@@ -111,6 +114,10 @@ mergeInto(LibraryManager.library, {
     }
 #endif
 
+#if ASYNCIFY == 2
+    if (asyncMode) return ret.then(onDone);
+#endif
+
     ret = onDone(ret);
 #if ASYNCIFY == 1
     // If this is an async ccall, ensure we return a promise

test/common.py

@@ -656,6 +656,9 @@ def require_wasm_eh(self):
       self.fail('either d8 or node >= 16 required to run wasm-eh tests.  Use EMTEST_SKIP_EH to skip')
 
   def require_jspi(self):
+    if not self.is_wasm():
+      self.skipTest('JSPI is not currently supported for WASM2JS')
+
     exp_args = ['--experimental-wasm-stack-switching', '--experimental-wasm-type-reflection']
     if config.NODE_JS and config.NODE_JS in self.js_engines:
       version = shared.check_node_version()

test/test_core.py

@@ -8239,12 +8239,18 @@ def test_async_ccall_good(self):
     self.do_runf('main.c', 'HelloWorld')
 
   @parameterized({
-    '': (False,),
-    'exit_runtime': (True,),
+    'asyncify': (False, 1),
+    'exit_runtime_asyncify': (True, 1),
+    'jspi': (False, 2),
+    'exit_runtime_jspi': (True, 2),
   })
   @no_wasm64('TODO: asyncify for wasm64')
-  def test_async_ccall_promise(self, exit_runtime):
-    self.set_setting('ASYNCIFY')
+  def test_async_ccall_promise(self, exit_runtime, asyncify):
+    if asyncify == 2:
+      self.require_jspi()
+      self.emcc_args += ['-Wno-experimental']
+      self.set_setting('ASYNCIFY_EXPORTS', ['stringf', 'floatf'])
+    self.set_setting('ASYNCIFY', asyncify)
     self.set_setting('EXIT_RUNTIME')
     self.set_setting('ASSERTIONS')
     self.set_setting('INVOKE_RUN', 0)