Skip to content

Demangle variable names in the dwarf dump #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dbalatoni13 wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −3
Open

Demangle variable names in the dwarf dump #131

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2415b5d
Demangle variable names
dbalatoni13 Jan 4, 2026
14e437c
Fix small issue
dbalatoni13 Jan 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/util/dwarf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,7 +1504,7 @@ fn member_subroutine_def_string(
}
if !name_written {
if let Some(name) = t.name.as_ref() {
full_written_name.push_str(&maybe_demangle_name(info, name));
full_written_name.push_str(&maybe_demangle_function_name(info, name));
}
}
let rt = type_string(info, typedefs, &t.return_type, true)?;
Expand Down Expand Up @@ -1682,7 +1682,7 @@ pub fn subroutine_def_string(
}
if !name_written {
if let Some(name) = t.name.as_ref() {
full_written_name.push_str(&maybe_demangle_name(info, name));
full_written_name.push_str(&maybe_demangle_function_name(info, name));
}
}
let rt = type_string(info, typedefs, &t.return_type, true)?;
Expand Down Expand Up @@ -3575,7 +3575,7 @@ fn variable_string(
let mut out = if variable.local { "static ".to_string() } else { String::new() };
out.push_str(&ts.prefix);
out.push(' ');
out.push_str(variable.name.as_deref().unwrap_or("[unknown]"));
out.push_str(&maybe_demangle_name(info, variable.name.as_deref().unwrap_or("[unknown]")));
out.push_str(&ts.suffix);
out.push(';');
if include_extra {
Expand Down Expand Up @@ -3680,6 +3680,15 @@ fn process_variable_tag(info: &DwarfInfo, tag: &Tag) -> Result<VariableTag> {

// TODO expand for more compilers?
fn maybe_demangle_name(info: &DwarfInfo, name: &str) -> String {
let name_opt = match info.producer {
Producer::MWCC => cw_demangle(name, &Default::default()),
Producer::GCC => gnu_demangle(name, &DemangleConfig::new()).ok(),
Producer::OTHER => None,
};
name_opt.unwrap_or_else(|| name.to_string())
}

fn maybe_demangle_function_name(info: &DwarfInfo, name: &str) -> String {
let fake_name = format!("{}__0", name);
let name_opt = match info.producer {
// for __pl this looks like operator+
Expand Down