merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 8587ee2eabdb1528d722ec2e8e67aecfb3226c14..e6060a76309a53bc88bca34e6643f63e8a89a287 100644 (file)
--- 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 2dfd67ceb771c20c15b19d54167f2ab03c8b3380..18b84a126e8ed2aa57659954d0d4f56fe465fb6c 100644 (file)
--- 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 3f3960a409328beadcc00952e6ac3e13e43471c1..408c4f47794f98757398809f88fe3b547c93f945 100644 (file)
--- 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