From b00d58958c5b2ff554db84b7cc0a80a1b158c83c Mon Sep 17 00:00:00 2001 From: Brendan Dahl Date: Thu, 24 Oct 2024 17:02:25 +0000 Subject: [PATCH] [tsgen] Ignore source map when generating TS definitions. Fixes #22768 --- test/test_other.py | 5 +++++ tools/link.py | 2 ++ 2 files changed, 7 insertions(+) diff --git a/test/test_other.py b/test/test_other.py index 61e13c20c037..b683d1cd86ea 100644 --- a/test/test_other.py +++ b/test/test_other.py @@ -3372,6 +3372,11 @@ def test_embind_tsgen_ignore(self): self.emcc(test_file('other/embind_tsgen.cpp'), extra_args) self.assertFileContents(test_file('other/embind_tsgen_ignore_3.d.ts'), read_file('embind_tsgen.d.ts')) + extra_args = ['-fsanitize=undefined', + '-gsource-map'] + self.emcc(test_file('other/embind_tsgen.cpp'), extra_args) + self.assertFileContents(test_file('other/embind_tsgen_ignore_3.d.ts'), read_file('embind_tsgen.d.ts')) + def test_embind_tsgen_worker_env(self): self.emcc_args += ['-lembind', '--emit-tsd', 'embind_tsgen.d.ts'] # Passing -sWASM_WORKERS or -sPROXY_TO_WORKER requires the 'worker' environment diff --git a/tools/link.py b/tools/link.py index 898188fce10e..7f8d25926e2d 100644 --- a/tools/link.py +++ b/tools/link.py @@ -1985,6 +1985,8 @@ def run_embind_gen(wasm_target, js_syms, extra_settings, linker_inputs): settings.JS_LIBRARIES[embind_index] = 'embind/embind_gen.js' if settings.MEMORY64: settings.MIN_NODE_VERSION = 160000 + # Source maps haven't been generated yet and aren't needed to run embind_gen. + settings.LOAD_SOURCE_MAP = 0 outfile_js = in_temp('tsgen.js') # The Wasm outfile may be modified by emscripten.emscript, so use a temporary file. outfile_wasm = in_temp('tsgen.wasm')