Addr2line enhance 2#4974
Open
TianlongLiang wants to merge 2 commits into
Open
Conversation
…able overlay
Refactor the wasm symbolicator to make its DWARF workaround explicit
and unconditional. addr2line.py runs one llvm-symbolizer -f -i call
per address, then overlays the outermost frame's function name from a
startup-built DWARF interval table.
The overlay exists because llvm-symbolizer returns the wrong outermost
function name on wasm targets for two independent, source-verified
reasons:
- Symbol-table override on the outermost frame (LLVM design, not a
bug). symbolizeInlinedCode in llvm/lib/DebugInfo/Symbolize/
SymbolizableObjectFile.cpp unconditionally rewrites the outermost
frame's FunctionName from getNameFromSymbolTable when
FunctionNameKind::LinkageName and UseSymbolTable are both set, which
is the default. Inline frames come from getInliningInfoForAddress
(a different code path) and are provably immune.
- AddrDieMap invariant violation from wasm-opt -Oz -g DCE ghosts.
LocationUpdater::getNewFuncStart in binaryen's src/wasm/wasm-debug.cpp
returns 0 as a tombstone when an old address doesn't map to a
surviving IR node, and updateDIE writes it into DW_AT_low_pc without
removing the DW_TAG_subprogram. LLVM's updateAddressDieMap in
DWARFUnit.cpp requires child ranges ⊆ parent ranges; these ghosts
break that invariant so the map's upper_bound − 1 lookup returns
an insertion-order-dependent DIE.
Both mechanisms produce the same "wrong outermost frame name" symptom
and both apply on any supported wasi-sdk, so the overlay runs on every
resolution. build_subprogram_intervals filters three DIE classes at
parse time: DW_AT_declaration=true (forward decls), low_pc == 0
(DWARF Code-section-relative zero is the function-count LEB, not a
real body — this is the DCE-ghost pattern), and high_pc <= low_pc
(degenerate ranges). The innermost covering DW_TAG_subprogram wins.
Also includes accumulated tool improvements:
- --mode flag {interp,aot,fast-interp} for different runtime offset
conventions (interp post-advance, aot at-instruction-start,
fast-interp's transformed in-memory bytecode)
- Inline frame annotation "(inlined into <next>)" for clarity
- llvm-symbolizer preferred over llvm-addr2line for column info
- Fallback for offset=0 (trap at function entry; frame_ip not captured)
- Last-resort function-index name fallback when DWARF lacks PC ranges
Full design rationale, source citations, and empirical truth table in
test-tools/addr2line/README.md.
- README: document the --mode flag and inline expansion behavior, and point to the tool README for the interval-table overlay rationale. - symbolicate.sh: pass --mode aot for the AOT call-stack invocation. - verify.sh (new): assertion-based smoke test that runs the existing symbolicate.sh and grep-checks for inline expansion (trap_helper) in both the wasm and AOT outputs. Replaces the inline assertions the CI step previously carried. - wasm-apps/trap.c: add a trap_helper marked __attribute__((always_inline)) that the trap site falls inside, so addr2line.py can demonstrate inline-frame annotation against this sample. Depends on the addr2line.py refactor (--mode flag).
c589ba3 to
c2ecb3e
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.