[esm-integration] Enable imported memory (#24130)

This is the first step to getting threads working.

Author: sbc100

src/postlibrary.js

@@ -5,7 +5,9 @@
 function processModuleArgs() 
 #endif
 {
-#if IMPORTED_MEMORY
+#if IMPORTED_MEMORY && !WASM_ESM_INTEGRATION
+  // With WASM_ESM_INTEGRATION this has to happen at the top level and not
+  // delayed until processModuleArgs.
   initMemory();
 #endif
 

src/preamble.js

@@ -46,7 +46,7 @@ if (typeof WebAssembly != 'object') {
 
 // Wasm globals
 
-#if !WASM_ESM_INTEGRATION
+#if !WASM_ESM_INTEGRATION || IMPORTED_MEMORY
 var wasmMemory;
 #endif
 

src/runtime_init_memory.js

@@ -22,7 +22,7 @@ function initMemory() {
   } else
 #endif
   {
-    var INITIAL_MEMORY = {{{ makeModuleReceiveExpr('INITIAL_MEMORY', INITIAL_MEMORY) }}}
+    var INITIAL_MEMORY = {{{ makeModuleReceiveExpr('INITIAL_MEMORY', INITIAL_MEMORY) }}};
 
 #if ASSERTIONS
     assert(INITIAL_MEMORY >= {{{STACK_SIZE}}}, 'INITIAL_MEMORY should be larger than STACK_SIZE, was ' + INITIAL_MEMORY + '! (STACK_SIZE=' + {{{STACK_SIZE}}} + ')');
@@ -56,3 +56,6 @@ function initMemory() {
   updateMemoryViews();
 }
 
+#if WASM_ESM_INTEGRATION
+initMemory();
+#endif

test/test_core.py

@@ -9577,15 +9577,19 @@ def test_wasm_worker_malloc(self):
   def test_wasm_worker_wait_async(self):
     self.do_runf('atomic/test_wait_async.c', emcc_args=['-sWASM_WORKERS'])
 
+  @parameterized({
+    '': ([],),
+    'imported_memory': (['-sIMPORTED_MEMORY'],),
+  })
   @esm_integration
-  def test_esm_integration_main(self):
-    self.do_runf('hello_world.c', 'hello, world!')
+  def test_esm_integration_main(self, args):
+    self.do_runf('hello_world.c', 'hello, world!', emcc_args=args)
 
   @esm_integration
   def test_esm_integration(self):
     # TODO(sbc): WASM_ESM_INTEGRATION doesn't currently work with closure.
     # self.maybe_closure()
-    self.run_process([EMCC, '-o', 'hello_world.mjs', '-sEXPORTED_RUNTIME_METHODS=err', '-sEXPORTED_FUNCTIONS=_main,stringToNewUTF8', test_file('core/test_esm_integration.c')] + self.get_emcc_args())
+    self.run_process([EMCC, '-o', 'hello_world.mjs', '-sINCOMING_MODULE_JS_API=arguments', '-sEXPORTED_RUNTIME_METHODS=err', '-sEXPORTED_FUNCTIONS=_main,stringToNewUTF8', test_file('core/test_esm_integration.c')] + self.get_emcc_args())
     create_file('runner.mjs', '''
       import init, { err, stringToNewUTF8, _main, _foo } from "./hello_world.mjs";
       await init({arguments: ['foo', 'bar']});

tools/emscripten.py

@@ -964,8 +964,10 @@ def install_wrapper(sym):
 def create_receiving(function_exports):
   if settings.WASM_ESM_INTEGRATION:
     exports = [f'{f} as {asmjs_mangle(f)}' for f in function_exports]
-    exports.append('memory as wasmMemory')
-    exports.append('__indirect_function_table as wasmTable')
+    if not settings.IMPORTED_MEMORY:
+      exports.append('memory as wasmMemory')
+    if not settings.RELOCATABLE:
+      exports.append('__indirect_function_table as wasmTable')
     exports = ',\n  '.join(exports)
     return f"import {{\n  {exports}\n}} from './{settings.WASM_BINARY_FILE}';\n\n"
 

tools/link.py

@@ -794,10 +794,21 @@ def phase_linker_setup(options, linker_args):  # noqa: C901, PLR0912, PLR0915
   if settings.MODULARIZE and settings.MODULARIZE not in [1, 'instance']:
     exit_with_error(f'Invalid setting "{settings.MODULARIZE}" for MODULARIZE.')
 
+  def limit_incoming_module_api():
+    if options.oformat == OFormat.HTML and options.shell_path == DEFAULT_SHELL_HTML:
+      # Out default shell.html file has minimal set of INCOMING_MODULE_JS_API elements that it expects
+      default_setting('INCOMING_MODULE_JS_API', 'canvas,monitorRunDependencies,onAbort,onExit,print,setStatus'.split(','))
+    else:
+      default_setting('INCOMING_MODULE_JS_API', [])
+
   if settings.MODULARIZE == 'instance':
     diagnostics.warning('experimental', '-sMODULARIZE=instance is still experimental. Many features may not work or will change.')
     if options.oformat != OFormat.MJS:
       exit_with_error('emcc: MODULARIZE instance is only compatible with .mjs output files')
+    limit_incoming_module_api()
+    for s in ['wasmMemory', 'INITIAL_MEMORY']:
+      if s in settings.INCOMING_MODULE_JS_API:
+        exit_with_error(f'emcc: {s} cannot be in INCOMING_MODULE_JS_API in MODULARIZE=instance mode')
 
   if options.oformat in (OFormat.WASM, OFormat.BARE):
     if options.emit_tsd:
@@ -965,11 +976,7 @@ def phase_linker_setup(options, linker_args):  # noqa: C901, PLR0912, PLR0915
       # are needed in this mode.
       default_setting('AUTO_JS_LIBRARIES', 0)
       default_setting('ALLOW_UNIMPLEMENTED_SYSCALLS', 0)
-    if options.oformat == OFormat.HTML and options.shell_path == DEFAULT_SHELL_HTML:
-      # Out default shell.html file has minimal set of INCOMING_MODULE_JS_API elements that it expects
-      default_setting('INCOMING_MODULE_JS_API', 'canvas,monitorRunDependencies,onAbort,onExit,print,setStatus'.split(','))
-    else:
-      default_setting('INCOMING_MODULE_JS_API', [])
+    limit_incoming_module_api()
 
   if 'noExitRuntime' in settings.INCOMING_MODULE_JS_API:
     settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.append('$noExitRuntime')