Make 'instantiateWasm' callback resolve the result return from 'recei…

src/preamble.js

@@ -996,8 +996,7 @@ function getWasmImports() {
       try {
 #endif
         Module['instantiateWasm'](info, (mod, inst) => {
-          receiveInstance(mod, inst);
-          resolve(mod.exports);
+          resolve(receiveInstance(mod, inst));
         });
 #if ASSERTIONS
       } catch(e) {

test/test_manual_wasm_instantiate.c

@@ -4,12 +4,21 @@
 // found in the LICENSE file.
 
 #include <assert.h>
-#include <stdio.h>
+#include <emscripten.h>
 #include <emscripten/em_asm.h>
+#include <stdio.h>
+
+EM_ASYNC_JS(int, getResult, (), {
+  return Module.testWasmInstantiationSucceeded;
+});
 
 int main() {
   printf("in main\n");
+#ifdef ASYNCIFY_ENABLED
+  int result = getResult();
+#else
   int result = EM_ASM_INT({return Module.testWasmInstantiationSucceeded;});
+#endif
   assert(result);
   return 0;
 }

test/test_other.py

@@ -15826,7 +15826,8 @@ def test_instantiate_wasm(self):
         });
         return {}; // Compiling asynchronously, no exports.
       }''')
-    self.do_runf('test_manual_wasm_instantiate.c', emcc_args=['--pre-js=pre.js'])
+    # Test with ASYNCIFY here to ensure that that wasmExports gets set to the wrapped version of the wasm exports.
+    self.do_runf(test_file('test_manual_wasm_instantiate.c'),emcc_args=['--pre-js=pre.js','-sASYNCIFY','-DASYNCIFY_ENABLED'])
 
   def test_late_module_api_assignment(self):
     # When sync instantiation is used (or when async/await is used in MODULARIZE mode) certain