c++: QT overload regression with attribute [PR94946]

Jason's fix for 90570 & 79585 was a bit overzealous.  Dependent attribs should still
attach to a parameter decl.

            * decl.c (grokdeclarator): Don't splice template attributes in
            parm context -- they can apply to the parm.

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 218ed03c019372dbbb7cc88e4e1bc6703f85c59b..7e41433707e90e35ebc858fb5e8108d3e5125806 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-06  Nathan Sidwell  <nathan@acm.org>
+
+       PR c++/94946
+       * decl.c (grokdeclarator): Don't splice template attributes in
+       parm context -- they can apply to the parm.
+
 2020-05-05  Iain Sandoe  <iain@sandoe.co.uk>
 
        * coroutines.cc: Remove references to n4849 throughout.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 3e7ed98fed3375cea2907eb41898fbfc921a6d21..232d7ed4a1459c24459a879b02aafecbb11693cf 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -11940,9 +11940,12 @@ grokdeclarator (const cp_declarator *declarator,
            attr_flags |= (int) ATTR_FLAG_FUNCTION_NEXT;
          if (declarator->kind == cdk_array)
            attr_flags |= (int) ATTR_FLAG_ARRAY_NEXT;
-         /* Assume that any attributes that get applied late to templates will
-            DTRT when applied to the declaration as a whole.  */
-         tree late_attrs = splice_template_attributes (&attrs, type);
+         tree late_attrs = NULL_TREE;
+         if (decl_context != PARM)
+           /* Assume that any attributes that get applied late to
+              templates will DTRT when applied to the declaration
+              as a whole.  */
+           late_attrs = splice_template_attributes (&attrs, type);
          returned_attrs = decl_attributes (&type,
                                            chainon (returned_attrs, attrs),
                                            attr_flags);

diff --git a/gcc/testsuite/g++.dg/ext/attr-parm-1.C b/gcc/testsuite/g++.dg/ext/attr-parm-1.C
new file mode 100644 (file)
index 0000000..cc53a2c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/attr-parm-1.C
@@ -0,0 +1,6 @@
+// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ia32 } } }
+// PR 94946
+class a {
+  template <typename b> a(b (*)());
+  template <typename b> a(b(__attribute__((fastcall)) *c)());
+};