diff options
| author | DJ Delorie <dj@delorie.com> | 2011-11-04 14:32:13 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2011-11-04 14:32:13 +0000 |
| commit | ff63bdd04de071c30ea7e9520fe4e6410455dcc7 (patch) | |
| tree | 54fe489f5eb4bf6a2044da76cf7b618295b82427 /libiberty | |
| parent | f39522e15a10ba8092a2e9b4f287cfe1338445a1 (diff) | |
| download | gdb-ff63bdd04de071c30ea7e9520fe4e6410455dcc7.tar.gz | |
merge from gcc
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 6 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 8ff403b41c6..559f0c97341 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2011-11-04 Jason Merrill <jason@redhat.com> + + PR c++/48370 + * cp-demangle.c (d_special_name, d_print_comp): Handle a + discriminator number on DEMANGLE_COMPONENT_REFTEMP. + 2011-11-02 Doug Evans <dje@google.com> * Makefile.in (CFILES): Add timeval-utils.c. diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index c7afef01f6d..d0f57b7fcce 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -1846,8 +1846,11 @@ d_special_name (struct d_info *di) return d_make_comp (di, DEMANGLE_COMPONENT_GUARD, d_name (di), NULL); case 'R': - return d_make_comp (di, DEMANGLE_COMPONENT_REFTEMP, d_name (di), - NULL); + { + struct demangle_component *name = d_name (di); + return d_make_comp (di, DEMANGLE_COMPONENT_REFTEMP, name, + d_number_component (di)); + } case 'A': return d_make_comp (di, DEMANGLE_COMPONENT_HIDDEN_ALIAS, @@ -3921,7 +3924,9 @@ d_print_comp (struct d_print_info *dpi, int options, return; case DEMANGLE_COMPONENT_REFTEMP: - d_append_string (dpi, "reference temporary for "); + d_append_string (dpi, "reference temporary #"); + d_print_comp (dpi, options, d_right (dc)); + d_append_string (dpi, " for "); d_print_comp (dpi, options, d_left (dc)); return; |