Backmerged from trunk PR c++/51344

        Backmerged from trunk
        PR c++/51344
        * decl2.c (save_template_attributes): Use merge_attributes
        instead of chaining up via TREE_CHAIN.

        * g++.dg/torture/pr51344.C: New test.

From-SVN: r183319

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7276a3f2d63ff81e3cb1e023b665ee22d98c06c8..74c04922edd1b0bfa61cfff0c7319f47a9296a34 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-19  Kai Tietz  <ktietz@redhat.com>
+
+       PR c++/51344
+       * decl2.c (save_template_attributes): Use merge_attributes
+       instead of chaining up via TREE_CHAIN.
+
 2011-10-19  Jason Merrill  <jason@redhat.com>
 
        PR c++/50793

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 7bfe773701125b678098cb085cc4a203d1cbb4e5..744209e87ecc49d03c3e2369e84ccfb13ba842e4 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -1152,9 +1152,9 @@ save_template_attributes (tree *attr_p, tree *decl_p)
 
   old_attrs = *q;
 
-  /* Place the late attributes at the beginning of the attribute
+  /* Merge the late attributes at the beginning with the attribute
      list.  */
-  TREE_CHAIN (tree_last (late_attrs)) = *q;
+  late_attrs = merge_attributes (late_attrs, *q);
   *q = late_attrs;
 
   if (!DECL_P (*decl_p) && *decl_p == TYPE_MAIN_VARIANT (*decl_p))

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 088b119e308c90b70fb44b37b397442a597b60d6..16e3d730a314345b0a916b5831bf2947d5f27431 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Kai Tietz  <ktietz@redhat.com>
+
+       * g++.dg/torture/pr51344.C: New test.
+
 2012-01-15  Uros Bizjak  <ubizjak@gmail.com>
 
        PR rtl-optimization/51821

diff --git a/gcc/testsuite/g++.dg/torture/pr51344.C b/gcc/testsuite/g++.dg/torture/pr51344.C
new file mode 100644 (file)
index 0000000..482c0fa
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr51344.C
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+template <class T>
+class B
+{
+  friend __attribute__((cdecl)) A& operator >>(A& a, B& b)
+  {
+    return a;
+  }
+};