Skip to content

Commit 8f48741

Browse files
committed
Disallow -sWASM_WORKERS with sanitizers
Back in emscripten-core#21701 I broke move the creation of wasmOffsetConvert and wasmOffset into runtime_pthread.js but I didn't update libwasm_worker.js which still uses the old name `wasmOffsetData` in its initial post message. When trying to update this just now I noticed that the offset converter (and santiizers in general) don't seem to work on WASM_WORKERS so this change simply disables them.
1 parent cadac51 commit 8f48741

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/lib/libwasm_worker.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,6 @@ if (ENVIRONMENT_IS_WASM_WORKER
204204
#endif
205205
'sb': stackLowestAddress, // sb = stack bottom (lowest stack address, SP points at this when stack is full)
206206
'sz': stackSize, // sz = stack size
207-
#if USE_OFFSET_CONVERTER
208-
'wasmOffsetData': wasmOffsetConverter,
209-
#endif
210-
#if LOAD_SOURCE_MAP
211-
'wasmSourceMapData': wasmSourceMap,
212-
#endif
213207
});
214208
worker.onmessage = _wasmWorkerRunPostMessage;
215209
#if ENVIRONMENT_MAY_BE_NODE

tools/link.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1556,6 +1556,8 @@ def limit_incoming_module_api():
15561556
diagnostics.warning('emcc', 'output suffix .js requested, but wasm side modules are just wasm files; emitting only a .wasm, no .js')
15571557

15581558
if options.sanitize:
1559+
if settings.WASM_WORKERS:
1560+
exit_with_error('WASM_WORKERS is not currently compatible with `-fsanitize` tools')
15591561
settings.USE_OFFSET_CONVERTER = 1
15601562
# These symbols are needed by `withBuiltinMalloc` which used to implement
15611563
# the `__noleakcheck` attribute. However this dependency is not yet represented in the JS

0 commit comments

Comments
 (0)