This patch replaces a call to cplus_demangle with a call to

gdb_demangle.  This change was included in an RFC from last
March [1] but omitted from the eventual commit.

[1] https://sourceware.org/ml/gdb-patches/2013-03/msg00235.html

2014-06-03  Gary Benson  <gbenson@redhat.com>

	* gnu-v2-abi.c (gnuv2_value_rtti_type): Use gdb_demangle.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2cf2ed09ce5649e85d9e19692a7efbd276c20a31..bda46b5e34c80f8bfe91666533b0c783c92a99b7 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-03  Gary Benson  <gbenson@redhat.com>
+
+       * gnu-v2-abi.c (gnuv2_value_rtti_type): Use gdb_demangle.
+
 2014-06-02  Doug Evans  <xdje42@gmail.com>
 
        Add parameter support for Guile.

diff --git a/gdb/gnu-v2-abi.c b/gdb/gnu-v2-abi.c
index 4a488be20876bfd00fe6dc09fac3ec7ca11de8a2..3ca01c367cf461113822a44b284b14d75cebdd88 100644 (file)
--- a/gdb/gnu-v2-abi.c
+++ b/gdb/gnu-v2-abi.c
@@ -251,7 +251,7 @@ gnuv2_value_rtti_type (struct value *v, int *full, int *top, int *using_enc)
     return NULL;
 
   /* If we just skip the prefix, we get screwed by namespaces.  */
-  demangled_name=cplus_demangle(linkage_name,DMGL_PARAMS|DMGL_ANSI);
+  demangled_name=gdb_demangle(linkage_name,DMGL_PARAMS|DMGL_ANSI);
   p = strchr (demangled_name, ' ');
   if (p)
     *p = '\0';