aboutsummaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2009-01-07 12:08:20 -0500
committerJason Merrill <jason@gcc.gnu.org>2009-01-07 12:08:20 -0500
commit30471e01ada243667a39c66be639915e62535e87 (patch)
treeb1ad47139da9a0f89f1abfa9ca8aa2fdaee798cb /libiberty
parent6a11476684547180634a11896c3b91a9970ea133 (diff)
* cp-demangle.c (d_expression): Remove mangling for zero-op casts.
From-SVN: r143161
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog4
-rw-r--r--libiberty/cp-demangle.c14
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 <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
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: