Address review

Author: AngheloAlf

objdiff-core/Cargo.toml

@@ -150,19 +150,15 @@ gimli = { git = "https://github.com/gimli-rs/gimli", rev = "7335f00e7c39fd501511
 typed-arena = { version = "2.0", default-features = false, optional = true }
 
 # ppc
-cwdemangle = { version = "1.0", optional = true }
 cwextab = { version = "1.1", optional = true }
 powerpc = { version = "0.4", optional = true }
 rlwinmdec = { version = "1.1", optional = true }
 
 # mips
 rabbitizer = { version = "2.0.0-alpha.4", default-features = false, features = ["all_extensions"], optional = true }
-gnuv2_demangle ={ version = "0.1.0", optional = true }
 
 # x86
-cpp_demangle = { version = "0.4", default-features = false, features = ["alloc"], optional = true }
 iced-x86 = { version = "1.21", default-features = false, features = ["decoder", "intel", "gas", "masm", "nasm", "exhaustive_enums", "no_std"], optional = true }
-msvc-demangler = { version = "0.11", optional = true }
 
 # arm
 unarm = { version = "1.9", optional = true }
@@ -180,6 +176,12 @@ tempfile = { version = "3.20", optional = true }
 time = { version = "0.3", optional = true }
 encoding_rs = { version = "0.8.35", optional = true }
 
+# demangler
+cpp_demangle = { version = "0.4", optional = true, default-features = false, features = ["alloc"] }
+cwdemangle = { version = "1.0", optional = true }
+gnuv2_demangle = { version = "0.1.0", optional = true }
+msvc-demangler = { version = "0.11", optional = true }
+
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", optional = true, features = ["winbase"] }
 

objdiff-core/config-schema.json

@@ -50,8 +50,8 @@
           "name": "Itanium"
         },
         {
-          "value": "gnu_v2",
-          "name": "GNU g++ (V2)",
+          "value": "gnu_legacy",
+          "name": "GNU g++ (Legacy)",
           "description": "Use the old GNU mangling ABI. Used up to g++ 2.9.x"
         }
       ]

objdiff-core/src/diff/demangler.rs

@@ -9,14 +9,14 @@ impl Demangler {
             Demangler::Codewarrior => Self::demangle_codewarrior(name),
             Demangler::Msvc => Self::demangle_msvc(name),
             Demangler::Itanium => Self::demangle_itanium(name),
-            Demangler::GnuV2 => Self::demangle_gnu_v2(name),
+            Demangler::GnuLegacy => Self::demangle_gnu_legacy(name),
             Demangler::Auto => {
                 // Try to guess
                 if name.starts_with('?') {
                     Self::demangle_msvc(name)
                 } else {
                     Self::demangle_codewarrior(name)
-                        .or_else(|| Self::demangle_gnu_v2(name))
+                        .or_else(|| Self::demangle_gnu_legacy(name))
                         .or_else(|| Self::demangle_itanium(name))
                 }
             }
@@ -32,12 +32,14 @@ impl Demangler {
     }
 
     fn demangle_itanium(name: &str) -> Option<String> {
+        let name = name.trim_start_matches('.');
         cpp_demangle::Symbol::new(name)
             .ok()
             .and_then(|s| s.demangle(&cpp_demangle::DemangleOptions::default()).ok())
     }
 
-    fn demangle_gnu_v2(name: &str) -> Option<String> {
+    fn demangle_gnu_legacy(name: &str) -> Option<String> {
+        let name = name.trim_start_matches('.');
         gnuv2_demangle::demangle(name, &gnuv2_demangle::DemangleConfig::new_no_cfilt_mimics()).ok()
     }
 }