aboutsummaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2024-03-30 13:48:30 -0600
committerTom Tromey <tom@tromey.com>2024-04-02 13:53:13 -0600
commitb1741ab0dafd899889faab6e862094a325a6b83c (patch)
tree3fcf74e9cc61a31f021e3d8bb6fa406800bd68bf /libiberty
parent251cedaeb57fe1e0fd28798f476fbee75373bbf4 (diff)
downloadgdb-b1741ab0dafd899889faab6e862094a325a6b83c.zip
gdb-b1741ab0dafd899889faab6e862094a325a6b83c.tar.gz
gdb-b1741ab0dafd899889faab6e862094a325a6b83c.tar.bz2
libiberty: Invoke D demangler when --format=auto
Investigating GDB PR d/31580 showed that the libiberty demangler doesn't automatically demangle D mangled names. However, I think it should -- like C++ and Rust (new-style), D mangled names are readily distinguished by the leading "_D", and so the likelihood of confusion is low. The other non-"auto" cases in this code are Ada (where the encoded form could more easily be confused by ordinary programs) and Java (which is long gone, but which also shared the C++ mangling and thus was just an output style preference). This patch also fixed another GDB bug, though of course that part won't apply to the GCC repository. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31580 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30276 libiberty * cplus-dem.c (cplus_demangle): Try the D demangler with "auto" format. * testsuite/d-demangle-expected: Add --format=auto test.
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/cplus-dem.c2
-rw-r--r--libiberty/testsuite/d-demangle-expected5
2 files changed, 6 insertions, 1 deletions
diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 8b92946..ee9e84f 100644
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -186,7 +186,7 @@ cplus_demangle (const char *mangled, int options)
if (GNAT_DEMANGLING)
return ada_demangle (mangled, options);
- if (DLANG_DEMANGLING)
+ if (DLANG_DEMANGLING || AUTO_DEMANGLING)
{
ret = dlang_demangle (mangled, options);
if (ret)
diff --git a/libiberty/testsuite/d-demangle-expected b/libiberty/testsuite/d-demangle-expected
index 47b059c..cfbdf2a 100644
--- a/libiberty/testsuite/d-demangle-expected
+++ b/libiberty/testsuite/d-demangle-expected
@@ -1470,3 +1470,8 @@ demangle.anonymous
--format=dlang
_D8demangle9anonymous03fooZ
demangle.anonymous.foo
+#
+# Test that 'auto' works.
+--format=auto
+_D8demangle9anonymous03fooZ
+demangle.anonymous.foo