FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR c++/11990:

Browse source 
* c-lang.c (cplus_language_defn): Use gdb_demangle.
	* c-typeprint.c (c_type_print_base): Use gdb_demangle.
	* cp-support.c (mangled_name_to_comp): Use gdb_demangle.
	(gdb_demangle): New function.
	* cp-support.h (gdb_demangle): Declare.
	* dwarf2read.c (dwarf2_physname, fixup_partial_die)
	(dwarf2_name): Use gdb_demangle.
	* gdbtypes.c (check_stub_method): Use gdb_demangle.
	* gnu-v3-abi.c (gnuv3_rtti_type): Strip @plt and version
	suffixes from name.
	(gnuv3_print_method_ptr): Use gdb_demangle.
	* jv-lang.c (java_demangle): Use gdb_demangle.
	* jv-typeprint.c (java_type_print_base): Use gdb_demangle.
	* language.c (unk_lang_demangle): Use gdb_demangle.
	* symtab.c (symbol_find_demangled_name)
	(demangle_for_lookup): Use gdb_demangle.
This commit is contained in:
Tom Tromey 2013-04-15 17:30:36 +00:00
parent 591f19e89b
commit 8de20a37d6
12 changed files with 74 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gdb/ChangeLog
View file

@ -1,3 +1,23 @@
2013-04-15 Tom Tromey <tromey@redhat.com>
PR c++/11990:
* c-lang.c (cplus_language_defn): Use gdb_demangle.
* c-typeprint.c (c_type_print_base): Use gdb_demangle.
* cp-support.c (mangled_name_to_comp): Use gdb_demangle.
(gdb_demangle): New function.
* cp-support.h (gdb_demangle): Declare.
* dwarf2read.c (dwarf2_physname, fixup_partial_die)
(dwarf2_name): Use gdb_demangle.
* gdbtypes.c (check_stub_method): Use gdb_demangle.
* gnu-v3-abi.c (gnuv3_rtti_type): Strip @plt and version
suffixes from name.
(gnuv3_print_method_ptr): Use gdb_demangle.
* jv-lang.c (java_demangle): Use gdb_demangle.
* jv-typeprint.c (java_type_print_base): Use gdb_demangle.
* language.c (unk_lang_demangle): Use gdb_demangle.
* symtab.c (symbol_find_demangled_name)
(demangle_for_lookup): Use gdb_demangle.
2013-04-15 Tom Tromey <tromey@redhat.com> 2013-04-15 Tom Tromey <tromey@redhat.com>
PR c++/12824: PR c++/12824:

2
gdb/c-lang.c
View file

@ -959,7 +959,7 @@ const struct language_defn cplus_language_defn =
"this", /* name_of_this */ "this", /* name_of_this */
cp_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ cp_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */
cp_lookup_transparent_type, /* lookup_transparent_type */ cp_lookup_transparent_type, /* lookup_transparent_type */
cplus_demangle, /* Language specific symbol demangler */ gdb_demangle, /* Language specific symbol demangler */
cp_class_name_from_physname, /* Language specific cp_class_name_from_physname, /* Language specific
class_name_from_physname */ class_name_from_physname */
c_op_print_tab, /* expression operators for printing */ c_op_print_tab, /* expression operators for printing */

4
gdb/c-typeprint.c
View file

@ -1227,8 +1227,8 @@ c_type_print_base (struct type *type, struct ui_file *stream,
mangled_name = TYPE_FN_FIELD_PHYSNAME (f, j); mangled_name = TYPE_FN_FIELD_PHYSNAME (f, j);
demangled_name = demangled_name =
cplus_demangle (mangled_name, gdb_demangle (mangled_name,
DMGL_ANSI | DMGL_PARAMS); DMGL_ANSI | DMGL_PARAMS);
if (demangled_name == NULL) if (demangled_name == NULL)
{ {
/* In some cases (for instance with the HP /* In some cases (for instance with the HP

10
gdb/cp-support.c
View file

@ -635,7 +635,7 @@ mangled_name_to_comp (const char *mangled_name, int options,
/* If it doesn't, or if that failed, then try to demangle the /* If it doesn't, or if that failed, then try to demangle the
name. */ name. */
demangled_name = cplus_demangle (mangled_name, options); demangled_name = gdb_demangle (mangled_name, options);
if (demangled_name == NULL) if (demangled_name == NULL)
return NULL; return NULL;
@ -1476,6 +1476,14 @@ cp_lookup_rtti_type (const char *name, struct block *block)
return rtti_type; return rtti_type;
} }
/* A wrapper for bfd_demangle. */
char *
gdb_demangle (const char *name, int options)
{
return bfd_demangle (NULL, name, options);
}
/* Don't allow just "maintenance cplus". */ /* Don't allow just "maintenance cplus". */
static void static void

4
gdb/cp-support.h
View file

@ -241,4 +241,8 @@ extern struct demangle_parse_info *cp_new_demangle_parse_info (void);
extern struct cmd_list_element *maint_cplus_cmd_list; extern struct cmd_list_element *maint_cplus_cmd_list;
/* A wrapper for bfd_demangle. */
char *gdb_demangle (const char *name, int options);
#endif /* CP_SUPPORT_H */ #endif /* CP_SUPPORT_H */

14
gdb/dwarf2read.c
View file

@ -7763,11 +7763,11 @@ dwarf2_physname (const char *name, struct die_info *die, struct dwarf2_cu *cu)
} }
else else
{ {
demangled = cplus_demangle (mangled, demangled = gdb_demangle (mangled,
(DMGL_PARAMS | DMGL_ANSI (DMGL_PARAMS | DMGL_ANSI
| (cu->language == language_java | (cu->language == language_java
? DMGL_JAVA | DMGL_RET_POSTFIX ? DMGL_JAVA | DMGL_RET_POSTFIX
: DMGL_RET_DROP))); : DMGL_RET_DROP)));
} }
if (demangled) if (demangled)
{ {
@ -14154,7 +14154,7 @@ fixup_partial_die (struct partial_die_info *part_die,
{ {
char *demangled; char *demangled;
demangled = cplus_demangle (part_die->linkage_name, DMGL_TYPES); demangled = gdb_demangle (part_die->linkage_name, DMGL_TYPES);
if (demangled) if (demangled)
{ {
const char *base; const char *base;
@ -17214,7 +17214,7 @@ dwarf2_name (struct die_info *die, struct dwarf2_cu *cu)
/* Avoid demangling DW_STRING (attr) the second time on a second /* Avoid demangling DW_STRING (attr) the second time on a second
call for the same DIE. */ call for the same DIE. */
if (!DW_STRING_IS_CANONICAL (attr)) if (!DW_STRING_IS_CANONICAL (attr))
demangled = cplus_demangle (DW_STRING (attr), DMGL_TYPES); demangled = gdb_demangle (DW_STRING (attr), DMGL_TYPES);
if (demangled) if (demangled)
{ {

5
gdb/gdbtypes.c
View file

@ -37,6 +37,7 @@
#include "gdb_assert.h" #include "gdb_assert.h"
#include "hashtab.h" #include "hashtab.h"
#include "exceptions.h" #include "exceptions.h"
#include "cp-support.h"
/* Initialize BADNESS constants. */ /* Initialize BADNESS constants. */
@ -1764,8 +1765,8 @@ check_stub_method (struct type *type, int method_id, int signature_id)
struct gdbarch *gdbarch = get_type_arch (type); struct gdbarch *gdbarch = get_type_arch (type);
struct fn_field *f; struct fn_field *f;
char *mangled_name = gdb_mangle_name (type, method_id, signature_id); char *mangled_name = gdb_mangle_name (type, method_id, signature_id);
char *demangled_name = cplus_demangle (mangled_name, char *demangled_name = gdb_demangle (mangled_name,
DMGL_PARAMS | DMGL_ANSI); DMGL_PARAMS | DMGL_ANSI);
char *argtypetext, *p; char *argtypetext, *p;
int depth = 0, argcount = 1; int depth = 0, argcount = 1;
struct field *argtypes; struct field *argtypes;

17
gdb/gnu-v3-abi.c
View file

@ -283,6 +283,7 @@ gnuv3_rtti_type (struct value *value,
const char *class_name; const char *class_name;
struct type *run_time_type; struct type *run_time_type;
LONGEST offset_to_top; LONGEST offset_to_top;
char *atsign;
/* We only have RTTI for class objects. */ /* We only have RTTI for class objects. */
if (TYPE_CODE (values_type) != TYPE_CODE_CLASS) if (TYPE_CODE (values_type) != TYPE_CODE_CLASS)
@ -327,6 +328,18 @@ gnuv3_rtti_type (struct value *value,
} }
class_name = vtable_symbol_name + 11; class_name = vtable_symbol_name + 11;
/* Strip off @plt and version suffixes. */
atsign = strchr (class_name, '@');
if (atsign != NULL)
{
char *copy;
copy = alloca (atsign - class_name + 1);
memcpy (copy, class_name, atsign - class_name);
copy[atsign - class_name] = '\0';
class_name = copy;
}
/* Try to look up the class name as a type name. */ /* Try to look up the class name as a type name. */
/* FIXME: chastain/2003-11-26: block=NULL is bogus. See pr gdb/1465. */ /* FIXME: chastain/2003-11-26: block=NULL is bogus. See pr gdb/1465. */
run_time_type = cp_lookup_rtti_type (class_name, NULL); run_time_type = cp_lookup_rtti_type (class_name, NULL);
@ -593,8 +606,8 @@ gnuv3_print_method_ptr (const gdb_byte *contents,
possible paths to the method based on the adjustment. */ possible paths to the method based on the adjustment. */
if (physname) if (physname)
{ {
char *demangled_name = cplus_demangle (physname, char *demangled_name = gdb_demangle (physname,
DMGL_ANSI | DMGL_PARAMS); DMGL_ANSI | DMGL_PARAMS);
fprintf_filtered (stream, "&virtual "); fprintf_filtered (stream, "&virtual ");
if (demangled_name == NULL) if (demangled_name == NULL)

3
gdb/jv-lang.c
View file

@ -39,6 +39,7 @@
#include "gdb_assert.h" #include "gdb_assert.h"
#include "charset.h" #include "charset.h"
#include "valprint.h" #include "valprint.h"
#include "cp-support.h"
/* Local functions */ /* Local functions */
@ -1010,7 +1011,7 @@ nosideret:
static char *java_demangle (const char *mangled, int options) static char *java_demangle (const char *mangled, int options)
{ {
return cplus_demangle (mangled, options | DMGL_JAVA); return gdb_demangle (mangled, options | DMGL_JAVA);
} }
/* Find the member function name of the demangled name NAME. NAME /* Find the member function name of the demangled name NAME. NAME

5
gdb/jv-typeprint.c
View file

@ -28,6 +28,7 @@
#include "typeprint.h" #include "typeprint.h"
#include "c-lang.h" #include "c-lang.h"
#include "cp-abi.h" #include "cp-abi.h"
#include "cp-support.h"
#include "gdb_assert.h" #include "gdb_assert.h"
/* Local functions */ /* Local functions */
@ -286,8 +287,8 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
mangled_name = physname; mangled_name = physname;
demangled_name = demangled_name =
cplus_demangle (mangled_name, gdb_demangle (mangled_name,
DMGL_ANSI | DMGL_PARAMS | DMGL_JAVA); DMGL_ANSI | DMGL_PARAMS | DMGL_JAVA);
if (demangled_name == NULL) if (demangled_name == NULL)
demangled_name = xstrdup (mangled_name); demangled_name = xstrdup (mangled_name);

3
gdb/language.c
View file

@ -43,6 +43,7 @@
#include "jv-lang.h" #include "jv-lang.h"
#include "demangle.h" #include "demangle.h"
#include "symfile.h" #include "symfile.h"
#include "cp-support.h"
extern void _initialize_language (void); extern void _initialize_language (void);
@ -764,7 +765,7 @@ static CORE_ADDR unk_lang_trampoline (struct frame_info *frame, CORE_ADDR pc)
/* Unknown languages just use the cplus demangler. */ /* Unknown languages just use the cplus demangler. */
static char *unk_lang_demangle (const char *mangled, int options) static char *unk_lang_demangle (const char *mangled, int options)
{ {
return cplus_demangle (mangled, options); return gdb_demangle (mangled, options);
} }
static char *unk_lang_class_name (const char *mangled) static char *unk_lang_class_name (const char *mangled)

12
gdb/symtab.c
View file

@ -596,7 +596,7 @@ symbol_find_demangled_name (struct general_symbol_info *gsymbol,
|| gsymbol->language == language_auto) || gsymbol->language == language_auto)
{ {
demangled = demangled =
cplus_demangle (mangled, DMGL_PARAMS | DMGL_ANSI); gdb_demangle (mangled, DMGL_PARAMS | DMGL_ANSI);
if (demangled != NULL) if (demangled != NULL)
{ {
gsymbol->language = language_cplus; gsymbol->language = language_cplus;
@ -606,8 +606,8 @@ symbol_find_demangled_name (struct general_symbol_info *gsymbol,
if (gsymbol->language == language_java) if (gsymbol->language == language_java)
{ {
demangled = demangled =
cplus_demangle (mangled, gdb_demangle (mangled,
DMGL_PARAMS | DMGL_ANSI | DMGL_JAVA); DMGL_PARAMS | DMGL_ANSI | DMGL_JAVA);
if (demangled != NULL) if (demangled != NULL)
{ {
gsymbol->language = language_java; gsymbol->language = language_java;
@ -1160,7 +1160,7 @@ demangle_for_lookup (const char *name, enum language lang,
lookup, so we can always binary search. */ lookup, so we can always binary search. */
if (lang == language_cplus) if (lang == language_cplus)
{ {
demangled_name = cplus_demangle (name, DMGL_ANSI | DMGL_PARAMS); demangled_name = gdb_demangle (name, DMGL_ANSI | DMGL_PARAMS);
if (demangled_name) if (demangled_name)
{ {
modified_name = demangled_name; modified_name = demangled_name;
@ -1180,8 +1180,8 @@ demangle_for_lookup (const char *name, enum language lang,
} }
else if (lang == language_java) else if (lang == language_java)
{ {
demangled_name = cplus_demangle (name, demangled_name = gdb_demangle (name,
DMGL_ANSI | DMGL_PARAMS | DMGL_JAVA); DMGL_ANSI | DMGL_PARAMS | DMGL_JAVA);
if (demangled_name) if (demangled_name)
{ {
modified_name = demangled_name; modified_name = demangled_name;