merge from gcc
This commit is contained in:
parent
19fc37235f
commit
60cf58f5cf
2 changed files with 14 additions and 12 deletions
|
@ -1,3 +1,12 @@
|
|||
2009-01-07 Jason Merrill <jason@redhat.com>
|
||||
|
||||
* cp-demangle.c (d_expression): Remove mangling for zero-op casts.
|
||||
|
||||
2009-01-06 Ben Elliston <bje@au.ibm.com>
|
||||
|
||||
* cp-demangle.c (cplus_demangle_type): Return NULL if the
|
||||
character following a 'D' cannot be recognised.
|
||||
|
||||
2008-12-18 Jason Merrill <jason@redhat.com>
|
||||
|
||||
PR c++/38561
|
||||
|
|
|
@ -2131,6 +2131,9 @@ cplus_demangle_type (struct d_info *di)
|
|||
peek = d_next_char (di);
|
||||
ret->u.s_fixed.sat = (peek == 's');
|
||||
break;
|
||||
|
||||
default:
|
||||
return NULL;
|
||||
}
|
||||
break;
|
||||
|
||||
|
@ -2609,12 +2612,7 @@ d_expression (struct d_info *di)
|
|||
args = op->u.s_extended_operator.args;
|
||||
break;
|
||||
case DEMANGLE_COMPONENT_CAST:
|
||||
if (d_peek_char (di) == 'v')
|
||||
/* T() encoded as an operand of void. */
|
||||
return d_make_comp (di, DEMANGLE_COMPONENT_UNARY, op,
|
||||
cplus_demangle_type (di));
|
||||
else
|
||||
args = 1;
|
||||
args = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -3807,12 +3805,7 @@ d_print_comp (struct d_print_info *dpi,
|
|||
d_print_cast (dpi, d_left (dc));
|
||||
d_append_char (dpi, ')');
|
||||
}
|
||||
if (d_left (dc)->type == DEMANGLE_COMPONENT_CAST
|
||||
&& d_right (dc)->type == DEMANGLE_COMPONENT_BUILTIN_TYPE)
|
||||
/* type() -- FIXME what about type(multiple,args) */
|
||||
d_append_string (dpi, "()");
|
||||
else
|
||||
d_print_subexpr (dpi, d_right (dc));
|
||||
d_print_subexpr (dpi, d_right (dc));
|
||||
return;
|
||||
|
||||
case DEMANGLE_COMPONENT_BINARY:
|
||||
|
|
Loading…
Reference in a new issue