From 3bf06b74c0cebe6879fe8b902efb72080910ef5b Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Thu, 9 Apr 2026 22:00:40 +0000 Subject: [PATCH 1/3] Emsymbolizer: Remove VMA adjustment from llvm-symblizer call After https://github.com/llvm/llvm-project/pull/191068 it is no longer necessary (or correct). --- tools/emsymbolizer.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/emsymbolizer.py b/tools/emsymbolizer.py index 5ba7d641f7025..4dce6f90c79e1 100755 --- a/tools/emsymbolizer.py +++ b/tools/emsymbolizer.py @@ -68,12 +68,7 @@ def has_linking_section(module): def symbolize_address_symbolizer(module, address, is_dwarf): - if is_dwarf: - vma_adjust = get_codesec_offset(module) - else: - vma_adjust = 0 - cmd = [LLVM_SYMBOLIZER, '-e', module.filename, f'--adjust-vma={vma_adjust}', - str(address)] + cmd = [LLVM_SYMBOLIZER, '-e', module.filename, str(address)] if shared.DEBUG: print(f'Running {" ".join(cmd)}') out = utils.run_process(cmd, stdout=subprocess.PIPE).stdout.strip() From 5403131ae49804eb796778a9f2dfffe7bbf0ebae Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Fri, 10 Apr 2026 18:41:25 +0000 Subject: [PATCH 2/3] skip test --- test/test_other.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_other.py b/test/test_other.py index e948678f1b4fe..f2242abeb1a89 100644 --- a/test/test_other.py +++ b/test/test_other.py @@ -9684,6 +9684,7 @@ def get_instr_addr(self, text, filename): def test_emsymbolizer_srcloc(self): 'Test emsymbolizer use cases that provide src location granularity info' + self.skipTest('TODO: Re-enable when https://github.com/llvm/llvm-project/pull/191329 rolls') def check_dwarf_loc_info(address, funcs, locs): out = self.run_process( [emsymbolizer, '-s', 'dwarf', 'test_dwarf.wasm', address], From 3a8ab83677b2ef5404d6ec79e2263faf45e94e50 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Fri, 10 Apr 2026 18:48:49 +0000 Subject: [PATCH 3/3] fix ruff --- test/test_other.py | 1 + tools/emsymbolizer.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/test_other.py b/test/test_other.py index f2242abeb1a89..7803a7091c1f9 100644 --- a/test/test_other.py +++ b/test/test_other.py @@ -9685,6 +9685,7 @@ def get_instr_addr(self, text, filename): def test_emsymbolizer_srcloc(self): 'Test emsymbolizer use cases that provide src location granularity info' self.skipTest('TODO: Re-enable when https://github.com/llvm/llvm-project/pull/191329 rolls') + def check_dwarf_loc_info(address, funcs, locs): out = self.run_process( [emsymbolizer, '-s', 'dwarf', 'test_dwarf.wasm', address], diff --git a/tools/emsymbolizer.py b/tools/emsymbolizer.py index 4dce6f90c79e1..1d505614b4d8f 100755 --- a/tools/emsymbolizer.py +++ b/tools/emsymbolizer.py @@ -67,7 +67,7 @@ def has_linking_section(module): return module.get_custom_section('linking') is not None -def symbolize_address_symbolizer(module, address, is_dwarf): +def symbolize_address_symbolizer(module, address): cmd = [LLVM_SYMBOLIZER, '-e', module.filename, str(address)] if shared.DEBUG: print(f'Running {" ".join(cmd)}') @@ -275,16 +275,16 @@ def print_loc(loc): if ((has_debug_line_section(module) and not args.source) or 'dwarf' in args.source): - print_loc(symbolize_address_symbolizer(module, address, is_dwarf=True)) + print_loc(symbolize_address_symbolizer(module, address)) elif ((get_sourceMappingURL_section(module) and not args.source) or 'sourcemap' in args.source): print_loc(symbolize_address_sourcemap(module, address, args.file)) elif ((has_name_section(module) and not args.source) or 'names' in args.source): - print_loc(symbolize_address_symbolizer(module, address, is_dwarf=False)) + print_loc(symbolize_address_symbolizer(module, address)) elif ((has_linking_section(module) and not args.source) or 'symtab' in args.source): - print_loc(symbolize_address_symbolizer(module, address, is_dwarf=False)) + print_loc(symbolize_address_symbolizer(module, address)) elif (args.source == 'symbolmap'): print_loc(symbolize_address_symbolmap(module, address, args.file)) else: