merge from gcc

This commit is contained in:
DJ Delorie 2001-03-23 23:57:50 +00:00
parent c0e61796d0
commit 079c672a7a
2 changed files with 7 additions and 6 deletions

View file

@ -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

View file

@ -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, ']'));
}