aboutsummaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2012-01-10 18:15:34 +0000
committerDJ Delorie <dj@redhat.com>2012-01-10 18:15:34 +0000
commitfbfd63c0a6ed1f8192020ab09b1edc4496aff91a (patch)
tree5c8544b9068b0a9577ad38ca488163e5e2e9882f /libiberty
parent06b9f45fe491c53d07c631916903640f101a3904 (diff)
downloadgdb-fbfd63c0a6ed1f8192020ab09b1edc4496aff91a.zip
gdb-fbfd63c0a6ed1f8192020ab09b1edc4496aff91a.tar.gz
gdb-fbfd63c0a6ed1f8192020ab09b1edc4496aff91a.tar.bz2
merge from gcc
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/cp-demangle.c13
-rw-r--r--libiberty/testsuite/demangle-expected3
3 files changed, 16 insertions, 5 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 8587ee2..e6060a7 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -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
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 2dfd67c..18b84a1 100644
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -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;
}
diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected
index 3f3960a..408c4f4 100644
--- a/libiberty/testsuite/demangle-expected
+++ b/libiberty/testsuite/demangle-expected
@@ -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