merge from gcc

This commit is contained in:
DJ Delorie 2001-08-09 00:05:37 +00:00
parent f45d83bbaa
commit e7e9b06936
2 changed files with 25 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2001-08-07 Jason Merrill <jason_merrill@redhat.com>
* cp-demangle.c (demangle_special_name): "GR" -> "reference temporary
for".
2001-08-03 Richard Henderson <rth@redhat.com>
* Makefile.in (concat.o): Depend on config.h.

View File

@ -1842,11 +1842,27 @@ demangle_special_name (dm)
if (peek == 'G')
{
/* A guard variable name. Consume the G. */
/* Consume the G. */
advance_char (dm);
RETURN_IF_ERROR (demangle_char (dm, 'V'));
RETURN_IF_ERROR (result_add (dm, "guard variable for "));
RETURN_IF_ERROR (demangle_name (dm, &unused));
switch (peek_char (dm))
{
case 'V':
/* A guard variable name. */
advance_char (dm);
RETURN_IF_ERROR (result_add (dm, "guard variable for "));
RETURN_IF_ERROR (demangle_name (dm, &unused));
break;
case 'R':
/* A reference temporary. */
advance_char (dm);
RETURN_IF_ERROR (result_add (dm, "reference temporary for "));
RETURN_IF_ERROR (demangle_name (dm, &unused));
break;
default:
return "Unrecognized <special-name>.";
}
}
else if (peek == 'T')
{