Remove the extra closure in MODULARIZE=instance mode (#24073)

This mode now uses the same technique developed for
`WASM_ESM_INTEGRATRION` where we delay the processing `moduleArgs` and
the assignment to the Module object.

Author: sbc100

src/jsifier.mjs

@@ -736,8 +736,8 @@ function(${args}) {
         contentText = `var ${mangled} = ${snippet};`;
       }
 
-      if (WASM_ESM_INTEGRATION && (EXPORT_ALL || EXPORTED_FUNCTIONS.has(mangled)) && !isStub) {
-        // It ESM integration mode we mark JS library symbols are exported at
+      if (MODULARIZE == 'instance' && (EXPORT_ALL || EXPORTED_FUNCTIONS.has(mangled)) && !isStub) {
+        // It MODULARIZE=instance mode mark JS library symbols are exported at
         // the point of declaration.
         contentText = 'export ' + contentText;
       }
@@ -860,7 +860,7 @@ var proxiedFunctionTable = [
       includeFile(fileName);
     }
 
-    if (MODULARIZE && !WASM_ESM_INTEGRATION) {
+    if (MODULARIZE && MODULARIZE != 'instance') {
       includeSystemFile('postamble_modularize.js');
     }
 

src/modules.mjs

@@ -406,13 +406,10 @@ function addMissingLibraryStubs(unusedLibSymbols) {
 }
 
 function exportSymbol(name) {
-  if (WASM_ESM_INTEGRATION) {
-    // In ESM integration mode symbols are exported by being included in
-    // an export { foo, bar } list so we build up the simple list of names
-    return name;
-  }
+  // In MODULARIZE=instance mode symbols are exported by being included in
+  // an export { foo, bar } list so we build up the simple list of names
   if (MODULARIZE === 'instance') {
-    return `__exp_${name} = ${name};`;
+    return name;
   }
   return `Module['${name}'] = ${name};`;
 }
@@ -423,9 +420,9 @@ function exportRuntimeSymbols() {
   function maybeExport(name) {
     // If requested to be exported, export it.
     if (EXPORTED_RUNTIME_METHODS.has(name)) {
-      // Unless we are in WASM_ESM_INTEGRATION mode then HEAP objects are
+      // Unless we are in MODULARIZE=instance mode then HEAP objects are
       // exported separately in updateMemoryViews
-      if (WASM_ESM_INTEGRATION || !name.startsWith('HEAP')) {
+      if (MODULARIZE == 'instance' || !name.startsWith('HEAP')) {
         return exportSymbol(name);
       }
     }
@@ -526,7 +523,7 @@ function exportRuntimeSymbols() {
   const exports = runtimeElements.map(maybeExport);
   const results = exports.filter((name) => name);
 
-  if (WASM_ESM_INTEGRATION) {
+  if (MODULARIZE == 'instance') {
     return '// Runtime exports\nexport { ' + results.join(', ') + ' };\n';
   }
 
@@ -562,6 +559,7 @@ function exportRuntimeSymbols() {
 }
 
 function exportLibrarySymbols() {
+  assert(!MODULARIZE != 'instance');
   const results = ['// Begin JS library exports'];
   for (const ident of librarySymbols) {
     if (EXPORT_ALL || EXPORTED_FUNCTIONS.has(ident)) {
@@ -573,9 +571,9 @@ function exportLibrarySymbols() {
 }
 
 function exportJSSymbols() {
-  // In WASM_ESM_INTEGRATION mode JS library symbols are marked with `export`
+  // In MODULARIZE=instance mode JS library symbols are marked with `export`
   // at the point of declaration.
-  if (WASM_ESM_INTEGRATION) return exportRuntimeSymbols();
+  if (MODULARIZE == 'instance') return exportRuntimeSymbols();
   return exportRuntimeSymbols() + '  ' + exportLibrarySymbols();
 }
 

src/postamble.js

@@ -299,14 +299,22 @@ function preInit() {
 #endif
 }
 
-#if WASM_ESM_INTEGRATION
-export default function init(moduleArg = {}) {
+#if MODULARIZE == 'instance'
+export default async function init(moduleArg = {}) {
   Module = moduleArg;
-  updateMemoryViews();
   processModuleArgs();
+#if WASM_ESM_INTEGRATION
+  updateMemoryViews();
+#else
+  wasmExports = await createWasm();
+  assignWasmExports();
+#endif
   preInit();
   run();
 }
+#if PTHREADS
+if (ENVIRONMENT_IS_PTHREAD) await init()
+#endif
 #else
 preInit();
 run();

src/postlibrary.js

@@ -1,10 +1,14 @@
 // This file is included after the automatically-generated JS library code
 // but before the wasm module is created.
- 
-#if WASM_ESM_INTEGRATION
+
+#if MODULARIZE == 'instance'
 function processModuleArgs() 
 #endif
 {
+#if IMPORTED_MEMORY
+  initMemory();
+#endif
+
   <<< ATMODULES >>>
 
 #if ASSERTIONS

src/preamble_minimal.js

@@ -53,4 +53,5 @@ var runtimeExited = false;
 
 #if IMPORTED_MEMORY
 #include "runtime_init_memory.js"
-#endif // IMPORTED_MEMORY
+initMemory();
+#endif

src/runtime_init_memory.js

@@ -11,8 +11,9 @@
 
 // check for full engine support (use string 'subarray' to avoid closure compiler confusion)
 
+function initMemory() {
 #if PTHREADS
-if (!ENVIRONMENT_IS_PTHREAD) {
+  if (ENVIRONMENT_IS_PTHREAD) return
 #endif // PTHREADS
 
 #if expectToReceiveOnModule('wasmMemory')
@@ -53,7 +54,5 @@ if (!ENVIRONMENT_IS_PTHREAD) {
   }
 
   updateMemoryViews();
-#if PTHREADS
 }
-#endif
 

src/runtime_shared.js

@@ -38,8 +38,7 @@ var wasmOffsetConverter;
 {{{
   // Helper function to export a heap symbol on the module object,
   // if requested.
-  const maybeExportHeap = (x) => {
-    // For now, we export all heap object when not building with MINIMAL_RUNTIME
+  const shouldExportHeap = (x) => {
     let shouldExport = !MINIMAL_RUNTIME && !STRICT;
     if (!shouldExport) {
       if (MODULARIZE && EXPORT_ALL) {
@@ -53,10 +52,10 @@ var wasmOffsetConverter;
         shouldExport = true;
       }
     }
-    if (shouldExport) {
-      if (MODULARIZE === 'instance' && !WASM_ESM_INTEGRATION) {
-        return `__exp_${x} = `
-      }
+    return shouldExport;
+  }
+  const maybeExportHeap = (x) => {
+    if (shouldExportHeap(x) && MODULARIZE != 'instance') {
       return `Module['${x}'] = `;
     }
     return '';

src/shell.js

@@ -20,10 +20,12 @@
 // after the generated code, you will need to define   var Module = {};
 // before the code. Then that object will be used in the code, and you
 // can continue to use Module afterwards as well.
-#if WASM_ESM_INTEGRATION
+#if MODULARIZE
+#if MODULARIZE == 'instance'
 var Module;
-#elif MODULARIZE
+#else
 var Module = moduleArg;
+#endif
 #elif USE_CLOSURE_COMPILER
 /** @type{Object} */
 var Module;

test/other/codesize/test_codesize_hello_dylink.gzsize

@@ -1 +1 @@
-5898
+5916

test/other/codesize/test_codesize_hello_dylink.jssize

@@ -1 +1 @@
-12953
+12961