[pushed] c++: dependent and non-dependent attributes [PR104245]
Commit Message
A flaw in my patch for PR51344 was that cplus_decl_attributes calls
decl_attributes after save_template_attributes, which messes up the ordering
that save_template_attributes set up. Fixed by splitting
save_template_attributes around the call to decl_attributes.
Tested x86_64-pc-linux-gnu, applying to trunk.
PR c++/104245
PR c++/51344
gcc/cp/ChangeLog:
* decl2.cc (save_template_attributes): Take late attrs as parm.
(cplus_decl_attributes): Call it after decl_attributes,
splice_template_attributes before.
gcc/testsuite/ChangeLog:
* g++.dg/lto/alignas1_0.C: New test.
---
gcc/cp/decl2.cc | 17 ++++++++---------
gcc/testsuite/g++.dg/lto/alignas1_0.C | 7 +++++++
2 files changed, 15 insertions(+), 9 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/lto/alignas1_0.C
base-commit: ae1b50e2e03aad06408b64c876f5d0511121de0d
@@ -1352,18 +1352,14 @@ splice_template_attributes (tree *attr_p, tree decl)
return late_attrs;
}
-/* Remove any late attributes from the list in ATTR_P and attach them to
- DECL_P. */
+/* Attach any LATE_ATTRS to DECL_P, after the non-dependent attributes have
+ been applied by a previous call to decl_attributes. */
static void
-save_template_attributes (tree *attr_p, tree *decl_p, int flags)
+save_template_attributes (tree late_attrs, tree *decl_p, int flags)
{
tree *q;
- if (attr_p && *attr_p == error_mark_node)
- return;
-
- tree late_attrs = splice_template_attributes (attr_p, *decl_p);
if (!late_attrs)
return;
@@ -1666,12 +1662,12 @@ cplus_decl_attributes (tree *decl, tree attributes, int flags)
}
}
+ tree late_attrs = NULL_TREE;
if (processing_template_decl)
{
if (check_for_bare_parameter_packs (attributes))
return;
-
- save_template_attributes (&attributes, decl, flags);
+ late_attrs = splice_template_attributes (&attributes, *decl);
}
cp_check_const_attributes (attributes);
@@ -1717,6 +1713,9 @@ cplus_decl_attributes (tree *decl, tree attributes, int flags)
decl_attributes (decl, attributes, flags, last_decl);
}
+ if (late_attrs)
+ save_template_attributes (late_attrs, decl, flags);
+
/* Propagate deprecation out to the template. */
if (TREE_DEPRECATED (*decl))
if (tree ti = get_template_info (*decl))
new file mode 100644
@@ -0,0 +1,7 @@
+// PR c++/104245
+// { dg-lto-do assemble }
+// { dg-require-effective-target c++11 }
+
+template <typename T> struct A { alignas(T) alignas(int) int a; };
+struct B { B(const char *, const char *, int, int); A<int> b; };
+B c {"", "", 0, 0};