Skip to content

Commit 7620f53

Browse files
committed
Add gnuv2_demangle to x86
1 parent 06053ff commit 7620f53

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

objdiff-core/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ x86 = [
105105
"dep:cpp_demangle",
106106
"dep:iced-x86",
107107
"dep:msvc-demangler",
108+
"dep:gnuv2_demangle",
108109
]
109110
arm = [
110111
"any-arch",

objdiff-core/src/arch/x86.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,13 @@ impl Arch for ArchX86 {
307307
cpp_demangle::Symbol::new(name)
308308
.ok()
309309
.and_then(|s| s.demangle(&cpp_demangle::DemangleOptions::default()).ok())
310+
.or_else(|| {
311+
gnuv2_demangle::demangle(
312+
name,
313+
&gnuv2_demangle::DemangleConfig::new_no_cfilt_mimics(),
314+
)
315+
.ok()
316+
})
310317
}
311318
}
312319

0 commit comments

Comments
 (0)