attribs: Don't crash on NULL TREE_TYPE in diag_attr_exclusions [PR114634]
Checks
Commit Message
Hi!
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.
Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?
2024-04-15 Jakub Jelinek <jakub@redhat.com>
PR c++/114634
* attribs.cc (diag_attr_exclusions): Set attrs[1] to NULL_TREE for
decls with NULL TREE_TYPE.
* g++.dg/ext/attrib68.C: New test.
Jakub
Comments
On Mon, 15 Apr 2024, Jakub Jelinek wrote:
> Hi!
>
> 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.
>
> Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?
OK, but can you add a comment?
Thanks,
Richard.
> 2024-04-15 Jakub Jelinek <jakub@redhat.com>
>
> PR c++/114634
> * attribs.cc (diag_attr_exclusions): Set attrs[1] to NULL_TREE for
> decls with NULL TREE_TYPE.
>
> * g++.dg/ext/attrib68.C: New test.
>
> --- gcc/attribs.cc.jj 2024-02-12 20:44:52.409074876 +0100
> +++ gcc/attribs.cc 2024-04-12 18:29:52.000381917 +0200
> @@ -468,7 +468,10 @@ diag_attr_exclusions (tree last_decl, tr
> 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
> + attrs[1] = NULL_TREE;
> }
> else
> {
> --- gcc/testsuite/g++.dg/ext/attrib68.C.jj 2024-04-12 18:31:38.100968098 +0200
> +++ gcc/testsuite/g++.dg/ext/attrib68.C 2024-04-12 18:30:57.011515625 +0200
> @@ -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'" }
> +};
>
> Jakub
>
>
@@ -468,7 +468,10 @@ diag_attr_exclusions (tree last_decl, tr
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
+ attrs[1] = NULL_TREE;
}
else
{
@@ -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'" }
+};