https://gcc.gnu.org/g:139f129bf4f0d40f1e6fb619c044bc0ef699a014
commit r11-11506-g139f129bf4f0d40f1e6fb619c044bc0ef699a014
Author: Jakub Jelinek <ja...@redhat.com>
Date: Mon Apr 15 10:25:22 2024 +0200
attribs: Don't crash on NULL TREE_TYPE in diag_attr_exclusions [PR114634]
The enumerator still doesn't have TREE_TYPE set but diag_attr_exclusions
assumes that all decls must have types.
I think it is better in something as unimportant as diag_attr_exclusions
to be more robust, if there is no type, it can just diagnose exclusions
on the DECL_ATTRIBUTES, like for types it only diagnoses it on
TYPE_ATTRIBUTES.
2024-04-15 Jakub Jelinek <ja...@redhat.com>
PR c++/114634
* attribs.c (diag_attr_exclusions): Set attrs[1] to NULL_TREE for
decls with NULL TREE_TYPE.
* g++.dg/ext/attrib68.C: New test.
(cherry picked from commit 7ec54f5fdfec298812a749699874db4d6a7246bb)
Diff:
---
gcc/attribs.c | 7 ++++++-
gcc/testsuite/g++.dg/ext/attrib68.C | 8 ++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/gcc/attribs.c b/gcc/attribs.c
index 1dd0212448e4..5663dc28e620 100644
--- a/gcc/attribs.c
+++ b/gcc/attribs.c
@@ -377,7 +377,12 @@ diag_attr_exclusions (tree last_decl, tree node, tree
attrname,
if (DECL_P (node))
{
attrs[0] = DECL_ATTRIBUTES (node);
- attrs[1] = TYPE_ATTRIBUTES (TREE_TYPE (node));
+ if (TREE_TYPE (node))
+ attrs[1] = TYPE_ATTRIBUTES (TREE_TYPE (node));
+ else
+ /* TREE_TYPE can be NULL e.g. while processing attributes on
+ enumerators. */
+ attrs[1] = NULL_TREE;
}
else
{
diff --git a/gcc/testsuite/g++.dg/ext/attrib68.C
b/gcc/testsuite/g++.dg/ext/attrib68.C
new file mode 100644
index 000000000000..be3b11084913
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/attrib68.C
@@ -0,0 +1,8 @@
+// PR c++/114634
+// { dg-do compile }
+
+template <int N>
+struct A
+{
+ enum { e __attribute__ ((aligned (16))) }; // { dg-error "alignment may
not be specified for 'e'" }
+};
