diff options
| author | DJ Delorie <dj@delorie.com> | 2001-03-23 23:57:50 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2001-03-23 23:57:50 +0000 |
| commit | 70a40477a3e8b537b6659cd3b1d06c34a8125945 (patch) | |
| tree | 757d7246a88fc531dde7bccb2012322fb6f34249 /libiberty | |
| parent | d8421d29236cd01b17e07b5837b6e798bf01720e (diff) | |
| download | gdb-70a40477a3e8b537b6659cd3b1d06c34a8125945.tar.gz | |
merge from gcc
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index f6e537faff3..5780bcdc383 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2001-03-23 Jakub Jelinek <jakub@redhat.com> + + * cp-demangle.c (demangle_discriminator): `_0' is discriminator #1, + `_' not followed by a digit is invalid. + 2001-03-22 Jim Blandy <jimb@redhat.com> * cp-demangle.c (string_list_delete): Use dyn_string_delete diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index b8255b3a26c..8419eef3425 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -3446,15 +3446,11 @@ demangle_discriminator (dm, suppress_first) /* Write the discriminator. The mangled number is two less than the discriminator ordinal, counting from zero. */ - RETURN_IF_ERROR (int_to_dyn_string (discriminator + 2, + RETURN_IF_ERROR (int_to_dyn_string (discriminator + 1, (dyn_string_t) dm->result)); } else - { - if (flag_verbose) - /* A missing digit correspond to one. */ - RETURN_IF_ERROR (result_add_char (dm, '1')); - } + return STATUS_ERROR; if (flag_verbose) RETURN_IF_ERROR (result_add_char (dm, ']')); } |