From 30471e01ada243667a39c66be639915e62535e87 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 7 Jan 2009 12:08:20 -0500 Subject: [PATCH] * cp-demangle.c (d_expression): Remove mangling for zero-op casts. From-SVN: r143161 --- libiberty/ChangeLog | 4 ++++ libiberty/cp-demangle.c | 14 ++------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index ef174108ce1..b9cb1999177 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2009-01-07 Jason Merrill + + * cp-demangle.c (d_expression): Remove mangling for zero-op casts. + 2009-01-06 Ben Elliston * cp-demangle.c (cplus_demangle_type): Return NULL if the diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index aa36db6bc62..0b4e05c6e5c 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -2612,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; } @@ -3810,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: