[MODULARIZE=instance] Enable dynamic linking (#24315)

Author: sbc100

.circleci/config.yml

@@ -803,6 +803,7 @@ jobs:
             core0.test_cubescript_jspi
             esm_integration.test_fs_js_api*
             instance.test_hello_world
+            instance.test_dylink_basics
             esm_integration.test_inlinejs3
             esm_integration.test_embind_val_basics
             "

src/preamble.js

@@ -819,7 +819,7 @@ async function instantiateAsync(binary, binaryFile, imports) {
 
 #if !WASM_ESM_INTEGRATION
 function getWasmImports() {
-#if PTHREADS || WASM_WORKERS
+#if PTHREADS || WASM_WORKERS || (IMPORTED_MEMORY && MODULARIZE == 'instance')
   assignWasmImports();
 #endif
 #if ASYNCIFY && (ASSERTIONS || ASYNCIFY == 2)

test/common.py

@@ -868,6 +868,13 @@ def decorator(func):
   return decorator
 
 
+def get_output_suffix(args):
+  if any(a in args for a in ('-sEXPORT_ES6', '-sWASM_ESM_INTEGRATION', '-sMODULARIZE=instance')):
+    return '.mjs'
+  else:
+    return '.js'
+
+
 class RunnerMeta(type):
   @classmethod
   def make_test(mcs, name, func, suffix, args):
@@ -1390,10 +1397,7 @@ def build(self, filename, libraries=None, includes=None, force_c=False, emcc_arg
     if emcc_args:
       all_emcc_args += emcc_args
     if not output_suffix:
-      if any(a in all_emcc_args for a in ('-sEXPORT_ES6', '-sWASM_ESM_INTEGRATION', '-sMODULARIZE=instance')):
-        output_suffix = '.mjs'
-      else:
-        output_suffix = '.js'
+      output_suffix = get_output_suffix(all_emcc_args)
 
     if output_basename:
       output = output_basename + output_suffix

test/test_core.py

@@ -3974,6 +3974,8 @@ def dylink_testf(self, main, side=None, expected=None, force_c=False, main_emcc_
       side += '_side' + ext
 
     # side settings
+    old_settings = dict(self.settings_mods)
+    self.clear_setting('MODULARIZE')
     self.clear_setting('MAIN_MODULE')
     self.set_setting('SIDE_MODULE')
     so_file = os.path.join(so_dir, so_name)
@@ -3985,6 +3987,7 @@ def dylink_testf(self, main, side=None, expected=None, force_c=False, main_emcc_
       shutil.move(out_file, so_file)
 
     # main settings
+    self.settings_mods = old_settings
     self.set_setting('MAIN_MODULE', main_module)
     self.clear_setting('SIDE_MODULE')
     self.emcc_args += main_emcc_args
@@ -3995,9 +3998,10 @@ def dylink_testf(self, main, side=None, expected=None, force_c=False, main_emcc_
 
     if isinstance(main, list):
       # main is just a library
-      delete_file('main.js')
-      self.run_process([EMCC] + main + self.get_emcc_args() + ['-o', 'main.js'])
-      self.do_run('main.js', expected, no_build=True, **kwargs)
+      outfile = self.output_name('main')
+      delete_file(outfile)
+      self.run_process([EMCC] + main + self.get_emcc_args() + ['-o', outfile])
+      self.do_run(outfile, expected, no_build=True, **kwargs)
     else:
       self.do_runf(main, expected, force_c=force_c, **kwargs)
 
@@ -4020,11 +4024,15 @@ def do_basic_dylink_test(self, **kwargs):
       }
     ''', 'other says 11.', 'int sidey();', force_c=True, **kwargs)
 
+  def output_name(self, basename):
+    suffix = common.get_output_suffix(self.get_emcc_args())
+    return basename + suffix
+
   @needs_dylink
   @crossplatform
   def test_dylink_basics(self):
     self.do_basic_dylink_test()
-    self.verify_in_strict_mode('main.js')
+    self.verify_in_strict_mode(self.output_name('main'))
 
   @with_dylink_reversed
   @no_wasm64('Requires table64 lowering in all cases')

tools/emscripten.py

@@ -1017,7 +1017,7 @@ def create_module(metadata, function_exports, global_exports, tag_exports,librar
     receiving += create_global_exports(global_exports)
     receiving += create_other_export_declarations(tag_exports)
 
-    if settings.PTHREADS or settings.WASM_WORKERS:
+    if settings.PTHREADS or settings.WASM_WORKERS or (settings.IMPORTED_MEMORY and settings.MODULARIZE == 'instance'):
       sending = textwrap.indent(sending, '  ').strip()
       module.append('''\
   var wasmImports;

tools/link.py

@@ -1540,8 +1540,8 @@ def limit_incoming_module_api():
     settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['_load_secondary_module']
 
   # wasm side modules have suffix .wasm
-  if settings.SIDE_MODULE and shared.suffix(target) == '.js':
-    diagnostics.warning('emcc', 'output suffix .js requested, but wasm side modules are just wasm files; emitting only a .wasm, no .js')
+  if settings.SIDE_MODULE and shared.suffix(target) in ('.js', '.mjs'):
+    diagnostics.warning('emcc', 'JavaScript output suffix requested, but wasm side modules are just wasm files; emitting only a .wasm, no .js')
 
   if options.sanitize:
     if settings.WASM_WORKERS: