merge from gcc

This commit is contained in:
DJ Delorie 2012-01-10 18:15:34 +00:00
parent 06b9f45fe4
commit fbfd63c0a6
3 changed files with 16 additions and 5 deletions

View file

@ -1,3 +1,8 @@
2012-01-10 Jason Merrill <jason@redhat.com>
* cp-demangle.c (d_print_comp) [DEMANGLE_COMPONENT_OPERATOR]:
Omit a trailing space in the operator name.
2012-01-06 Jason Merrill <jason@redhat.com>
PR c++/6057

View file

@ -4357,14 +4357,17 @@ d_print_comp (struct d_print_info *dpi, int options,
case DEMANGLE_COMPONENT_OPERATOR:
{
char c;
const struct demangle_operator_info *op = dc->u.s_operator.op;
int len = op->len;
d_append_string (dpi, "operator");
c = dc->u.s_operator.op->name[0];
if (IS_LOWER (c))
/* Add a space before new/delete. */
if (IS_LOWER (op->name[0]))
d_append_char (dpi, ' ');
d_append_buffer (dpi, dc->u.s_operator.op->name,
dc->u.s_operator.op->len);
/* Omit a trailing space. */
if (op->name[len-1] == ' ')
--len;
d_append_buffer (dpi, op->name, len);
return;
}

View file

@ -4058,6 +4058,9 @@ decltype ((::delete {parm#1}),(+{parm#1})) f<int>(int*)
_Z1fIiEDTcmdafp_psfp_EPT_
decltype ((delete[] {parm#1}),(+{parm#1})) f<int>(int*)
--format=gnu-v3
_ZN1AdlEPv
A::operator delete(void*)
--format=gnu-v3
_Z2f1IiEDTppfp_ET_
decltype ({parm#1}++) f1<int>(int)
--format=gnu-v3