Skip to content

Commit 9e0033a

Browse files
committed
Allow the createWasm function to use async/await where possible
The advantage if using `await` in the cases where we can is that it avoids the generation or wrapper function for each export. So instead of ``` var wasmExport = createWasm(); // returns empty object ... var malloc = ((..) => (malloc = wasmExports['malloc'])() ``` We can just generate: ``` var wasmExport = createWasm(); // returns empty object ... var malloc = wasmExports['malloc']; ``` This only currently works in MODULARIZE mode where the code is running inside a factory function. Otherwise it would end up using top-level-await. One wrinkle here is that this is not currently supported when closure is enabled because we run closure only on the contents of the factory function so closure ends up seeing this as a top level await when its not.
1 parent adb972c commit 9e0033a

File tree

88 files changed

+131
-111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+131
-111
lines changed

ChangeLog.md

+5

src/preamble.js

+6-7
Original file line numberDiff line numberDiff line change
@@ -1036,11 +1036,11 @@ function getWasmImports() {
10361036
trueModule = null;
10371037
#endif
10381038
#if SHARED_MEMORY || RELOCATABLE
1039-
receiveInstance(result['instance'], result['module']);
1039+
return receiveInstance(result['instance'], result['module']);
10401040
#else
10411041
// TODO: Due to Closure regression https://github.com/google/closure-compiler/issues/3193, the above line no longer optimizes out down to the following line.
10421042
// When the regression is fixed, can restore the above PTHREADS-enabled path.
1043-
receiveInstance(result['instance']);
1043+
return receiveInstance(result['instance']);
10441044
#endif
10451045
}
10461046
#endif // WASM_ASYNC_COMPILATION
@@ -1076,8 +1076,7 @@ function getWasmImports() {
10761076
// Instantiate from the module posted from the main thread.
10771077
// We can just use sync instantiation in the worker.
10781078
var instance = new WebAssembly.Instance(module, getWasmImports());
1079-
receiveInstance(instance, module);
1080-
resolve();
1079+
resolve(receiveInstance(instance, module));
10811080
};
10821081
});
10831082
}
@@ -1095,16 +1094,16 @@ function getWasmImports() {
10951094
try {
10961095
#endif
10971096
var result = await instantiateAsync(wasmBinary, wasmBinaryFile, info);
1098-
receiveInstantiationResult(result);
1097+
var exports = receiveInstantiationResult(result);
10991098
#if LOAD_SOURCE_MAP
11001099
receiveSourceMapJSON(await getSourceMapAsync());
11011100
#endif
1102-
return result;
1101+
return exports;
11031102
#if MODULARIZE
11041103
} catch (e) {
11051104
// If instantiation fails, reject the module ready promise.
11061105
readyPromiseReject(e);
1107-
return;
1106+
return Promise.reject(e);
11081107
}
11091108
#endif
11101109
#else // WASM_ASYNC_COMPILATION
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4380
1+
4374

test/code_size/hello_webgl2_wasm.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 454,
33
"a.html.gz": 328,
4-
"a.js": 4532,
5-
"a.js.gz": 2315,
4+
"a.js": 4538,
5+
"a.js.gz": 2320,
66
"a.wasm": 10402,
77
"a.wasm.gz": 6703,
8-
"total": 15388,
9-
"total_gz": 9346
8+
"total": 15394,
9+
"total_gz": 9351
1010
}
+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"a.html": 346,
33
"a.html.gz": 262,
4-
"a.js": 22200,
5-
"a.js.gz": 11583,
6-
"total": 22546,
7-
"total_gz": 11845
4+
"a.js": 22206,
5+
"a.js.gz": 11589,
6+
"total": 22552,
7+
"total_gz": 11851
88
}

test/code_size/hello_webgl_wasm.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 454,
33
"a.html.gz": 328,
4-
"a.js": 4070,
5-
"a.js.gz": 2158,
4+
"a.js": 4076,
5+
"a.js.gz": 2163,
66
"a.wasm": 10402,
77
"a.wasm.gz": 6703,
8-
"total": 14926,
9-
"total_gz": 9189
8+
"total": 14932,
9+
"total_gz": 9194
1010
}
+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"a.html": 346,
33
"a.html.gz": 262,
4-
"a.js": 21726,
5-
"a.js.gz": 11413,
6-
"total": 22072,
7-
"total_gz": 11675
4+
"a.js": 21732,
5+
"a.js.gz": 11419,
6+
"total": 22078,
7+
"total_gz": 11681
88
}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8352
1+
8351
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20347
1+
20343
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8336
1+
8334
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20315
1+
20311
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9358
1+
9356
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24116
1+
24112
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20240
1+
20236
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20240
1+
20236
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8348
1+
8347
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20371
1+
20367
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9361
1+
9359
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24116
1+
24112
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8352
1+
8351
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20347
1+
20343
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3653
1+
3651
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7914
1+
7910
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7656
1+
7654
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18842
1+
18838
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6202
1+
6198
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8017
1+
8012
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
21597
1+
21588
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2697
1+
2694
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6911
1+
6899
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2359
1+
2357
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4835
1+
4831
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2298
1+
2296
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4757
1+
4753
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2298
1+
2296
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4757
1+
4753
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2281
1+
2279
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4724
1+
4720
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6023
1+
6028
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
13300
1+
13317
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1682
1+
1681
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3637
1+
3633
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2298
1+
2296
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4757
1+
4753
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1876
1+
1873
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4000
1+
3996
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1914
1+
1912
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4048
1+
4044
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2328
1+
2327
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4892
1+
4888
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2478
1+
2476
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5177
1+
5172
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2180
1+
2177
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4585
1+
4581
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2143
1+
2140
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4517
1+
4513
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1900
1+
1898
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4047
1+
4043
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1914
1+
1912
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4048
1+
4044
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1914
1+
1912
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4048
1+
4044
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1439
1+
1441
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3064
1+
3058
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1531
1+
1534
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3713
1+
3702
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1380
1+
1381
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2812
1+
2806
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1346
1+
1348
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2762
1+
2756
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1346
1+
1348
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2762
1+
2756
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2747
1+
2741
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1346
1+
1348
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2762
1+
2756
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1496
1+
1509
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3138
1+
3157
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4184
1+
4190
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8711
1+
8728
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1346
1+
1348
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2762
1+
2756
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3772
1+
3766
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
53866
1+
53888
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
29065
1+
29087
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
52649
1+
52671

test/test_unicode_js_library.out

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Unicode postjs: àČšñéáúÍųåêâăščếệüçλληνικάбългарскиPусскийСрпскиУкраїнська한국어中文普通话(中国大陆)普通话(香港)中文(台灣)粵語(香港)日本語हिन्दीภาษาไทย
21
Unicode snowman ☃ says hello! àČšñéáúÍųåêâăščếệüçλληνικάбългарскиPусскийСрпскиУкраїнська한국어中文普通话(中国大陆)普通话(香港)中文(台灣)粵語(香港)日本語हिन्दीภาษาไทย
2+
Unicode postjs: àČšñéáúÍųåêâăščếệüçλληνικάбългарскиPусскийСрпскиУкраїнська한국어中文普通话(中国大陆)普通话(香港)中文(台灣)粵語(香港)日本語हिन्दीภาษาไทย

tools/emscripten.py

+16-2
Original file line numberDiff line numberDiff line change
@@ -893,6 +893,16 @@ def create_sending(metadata, library_symbols):
893893
return '{\n ' + ',\n '.join(elems) + '\n}'
894894

895895

896+
def can_use_await():
897+
# In MODULARIZE mode we can use `await` since the factory function itself
898+
# is marked as `async` and the generated code all lives inside that factory
899+
# function.
900+
# However, because closure does see this (it runs only on the inner code),
901+
# it sees this as a top-level-await, which it does not yet support.
902+
# FIXME(https://github.com/emscripten-core/emscripten/issues/23158)
903+
return settings.MODULARIZE and not settings.USE_CLOSURE_COMPILER
904+
905+
896906
def make_export_wrappers(function_exports):
897907
assert not settings.MINIMAL_RUNTIME
898908

@@ -932,7 +942,7 @@ def install_wrapper(sym):
932942
# With assertions enabled we create a wrapper that are calls get routed through, for
933943
# the lifetime of the program.
934944
wrapper += f"createExportWrapper('{name}', {nargs});"
935-
elif settings.WASM_ASYNC_COMPILATION or settings.PTHREADS:
945+
elif (settings.WASM_ASYNC_COMPILATION and not can_use_await()) or settings.PTHREADS:
936946
# With WASM_ASYNC_COMPILATION wrapper will replace the global var and Module var on
937947
# first use.
938948
args = [f'a{i}' for i in range(nargs)]
@@ -998,7 +1008,11 @@ def create_module(receiving, metadata, global_exports, library_symbols):
9981008

9991009
if not settings.MINIMAL_RUNTIME:
10001010
if settings.WASM_ASYNC_COMPILATION:
1001-
module.append("var wasmExports;\ncreateWasm();\n")
1011+
if can_use_await():
1012+
# In modullize mode the generated code is within a factory function.
1013+
module.append("var wasmExports = await createWasm();\n")
1014+
else:
1015+
module.append("var wasmExports;\ncreateWasm();\n")
10021016
else:
10031017
module.append("var wasmExports = createWasm();\n")
10041018

0 commit comments

Comments
 (0)