Enable createWasm to use async/await with closure

I really which we had a better solution here, but this makes the use
of async/await independent of closure usage.

Fixes: #23158

Author: sbc100

src/closure-externs/closure-externs.js

@@ -14,6 +14,7 @@
 // Special placeholder for `import.meta` and `await import`.
 var EMSCRIPTEN$IMPORT$META;
 var EMSCRIPTEN$AWAIT$IMPORT;
+var EMSCRIPTEN$AWAIT;
 
 // Don't minify createRequire
 var createRequire;

test/other/codesize/test_codesize_minimal_esm.gzsize

@@ -1 +1 @@
-1436
+1445

test/other/codesize/test_codesize_minimal_esm.jssize

@@ -1 +1 @@
-2995
+2990

tools/emscripten.py

@@ -444,8 +444,9 @@ def emscript(in_wasm, out_wasm, outfile_js, js_syms, finalize=True, base_metadat
     pre = None
 
     receiving = create_receiving(function_exports)
+    receiving += create_global_exports(global_exports)
 
-    module = create_module(receiving, metadata, global_exports, forwarded_json['librarySymbols'])
+    module = create_module(receiving, metadata, forwarded_json['librarySymbols'])
 
     metadata.library_definitions = forwarded_json['libraryDefinitions']
 
@@ -877,13 +878,7 @@ def create_sending(metadata, library_symbols):
 
 
 def can_use_await():
-  # In MODULARIZE mode we can use `await` since the factory function itself
-  # is marked as `async` and the generated code all lives inside that factory
-  # function.
-  # However, because closure does not see this (it runs only on the inner code),
-  # it sees this as a top-level-await, which it does not yet support.
-  # FIXME(https://github.com/emscripten-core/emscripten/issues/23158)
-  return settings.MODULARIZE and not settings.USE_CLOSURE_COMPILER
+  return settings.MODULARIZE
 
 
 def make_export_wrappers(function_exports):
@@ -973,8 +968,7 @@ def create_receiving(function_exports):
   return '\n'.join(receiving) + '\n'
 
 
-def create_module(receiving, metadata, global_exports, library_symbols):
-  receiving += create_global_exports(global_exports)
+def create_module(receiving, metadata, library_symbols):
   module = []
 
   sending = create_sending(metadata, library_symbols)
@@ -993,7 +987,10 @@ def create_module(receiving, metadata, global_exports, library_symbols):
     if settings.WASM_ASYNC_COMPILATION:
       if can_use_await():
         # In modularize mode the generated code is within a factory function.
-        module.append("var wasmExports = await createWasm();\n")
+        # This magic string gets replaced by `await createWasm`.  It needed to allow
+        # closure and acorn to process the module without seeing this as a top-level
+        # await.
+        module.append("var wasmExports = EMSCRIPTEN$AWAIT(createWasm());\n")
       else:
         module.append("var wasmExports;\ncreateWasm();\n")
     else:

tools/link.py

@@ -2071,7 +2071,8 @@ def fix_es6_import_statements(js_file):
   src = read_file(js_file)
   write_file(js_file, src
              .replace('EMSCRIPTEN$IMPORT$META', 'import.meta')
-             .replace('EMSCRIPTEN$AWAIT$IMPORT', 'await import'))
+             .replace('EMSCRIPTEN$AWAIT$IMPORT', 'await import')
+             .replace('EMSCRIPTEN$AWAIT(createWasm())', 'await creasteWasm()'))
   save_intermediate('es6-module')