Skip to content

Commit f7028bb

Browse files
authored
Remove hardcoded wasm worker deps. NFC (#20973)
The bug that required these hardcoded exports has now been fixed.
1 parent 85c099a commit f7028bb

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

src/library_wasm_worker.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,15 @@ addToLibrary({
6969

7070
// src/postamble_minimal.js brings this symbol in to the build, and calls this
7171
// function synchronously from main JS file at the startup of each Worker.
72-
$_wasmWorkerInitializeRuntime__deps: ['$_wasmWorkerDelayedMessageQueue', '$_wasmWorkerRunPostMessage', '$_wasmWorkerAppendToQueue', 'emscripten_wasm_worker_initialize'],
72+
$_wasmWorkerInitializeRuntime__deps: [
73+
'$_wasmWorkerDelayedMessageQueue',
74+
'$_wasmWorkerRunPostMessage',
75+
'$_wasmWorkerAppendToQueue',
76+
'emscripten_wasm_worker_initialize',
77+
#if PTHREADS
78+
'__set_thread_state',
79+
#endif
80+
],
7381
$_wasmWorkerInitializeRuntime: () => {
7482
let m = Module;
7583
#if ASSERTIONS

tools/link.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,11 +1331,6 @@ def phase_linker_setup(options, state, newargs):
13311331
settings.WASM_BIGINT = 1
13321332

13331333
if settings.WASM_WORKERS:
1334-
# TODO: After #15982 is resolved, these dependencies can be declared in library_wasm_worker.js
1335-
# instead of having to record them here.
1336-
wasm_worker_imports = ['_emscripten_wasm_worker_initialize', '___set_thread_state']
1337-
settings.EXPORTED_FUNCTIONS += wasm_worker_imports
1338-
building.user_requested_exports.update(wasm_worker_imports)
13391334
settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$_wasmWorkerInitializeRuntime']
13401335
# set location of Wasm Worker bootstrap JS file
13411336
if settings.WASM_WORKERS == 1:

0 commit comments

Comments
 (0)