To copy type attributes from struct A, the copy attribute (new
in GCC 9) accepts a pointer argument such as (struct A*)0, but
it isn't prepared for anything much more complicated than that.
So for example when it's passed something like (struct A*)(0, 1)
as the test case in PR 89685 does (a P1 regression), it fails
with an ICE.
The attached patch makes this handling more robust by letting
it accept all forms of type and member references.
Tested on x86_64-linux.
Martin
PR c/89685 - ICE on attribute copy with a compound expression
gcc/c-family/ChangeLog:
PR c/89685
* c-attribs.c (handle_copy_attribute): Handle references and
non-constant expressions.
gcc/testsuite/ChangeLog:
PR c/89685
* gcc.dg/attr-copy-8.c: New test.
* g++.dg/ext/attr-copy-2.C: New test.
Index: gcc/c-family/c-attribs.c
===
--- gcc/c-family/c-attribs.c (revision 269657)
+++ gcc/c-family/c-attribs.c (working copy)
@@ -2413,15 +2413,30 @@ handle_copy_attribute (tree *node, tree name, tree
}
/* Consider address-of expressions in the attribute argument
- as requests to copy from the referenced entity. For constant
- expressions, consider those to be requests to copy from their
- type, such as in:
+ as requests to copy from the referenced entity. */
+ if (TREE_CODE (ref) == ADDR_EXPR)
+ref = TREE_OPERAND (ref, 0);
+
+ do
+{
+ /* Drill down into references to find the referenced decl. */
+ tree_code refcode = TREE_CODE (ref);
+ if (refcode == ARRAY_REF
+ || refcode == INDIRECT_REF)
+ ref = TREE_OPERAND (ref, 0);
+ else if (refcode == COMPONENT_REF)
+ ref = TREE_OPERAND (ref, 1);
+ else
+ break;
+} while (!DECL_P (ref));
+
+ /* For pointer expressions, consider those to be requests to copy
+ from their type, such as in:
struct __attribute__ (copy ((struct T *)0)) U { ... };
which copies type attributes from struct T to the declaration
of struct U. */
- if (TREE_CODE (ref) == ADDR_EXPR)
-ref = TREE_OPERAND (ref, 0);
- else if (CONSTANT_CLASS_P (ref))
+ if ((CONSTANT_CLASS_P (ref) || EXPR_P (ref))
+ && POINTER_TYPE_P (TREE_TYPE (ref)))
ref = TREE_TYPE (ref);
if (DECL_P (decl))
Index: gcc/testsuite/gcc.dg/attr-copy-8.c
===
--- gcc/testsuite/gcc.dg/attr-copy-8.c (nonexistent)
+++ gcc/testsuite/gcc.dg/attr-copy-8.c (working copy)
@@ -0,0 +1,97 @@
+/* PR c/89685 - ICE on attribute copy with a compound expression
+ { dg-do compile }
+ { dg-options "-Wall -Wno-unused-value -Wno-int-to-pointer-cast" } */
+
+#define ATTR(...) __attribute__ ((__VA_ARGS__))
+
+typedef struct ATTR (packed) A { ATTR (packed) unsigned bf: 1; } A;
+
+typedef struct B
+{
+ struct A a;
+ struct A *pa;
+} B;
+
+extern struct A a;
+extern struct A *pa;
+extern B b;
+extern B ab[1];
+extern B *pb;
+
+typedef struct C
+{
+ ATTR (copy ((struct A *)0)) short m_pa_0;
+ ATTR (copy ((struct A *)(1, 0))) int m_pa_1_0;
+ ATTR (copy ((struct A *)(0, 1))) long m_pa_0_1;
+
+ ATTR (copy (*(struct A *)0)) short m_xpa_0;
+ ATTR (copy (*(struct A *)(1, 0))) int m_xpa_1_0;
+ ATTR (copy (*(struct A *)(0, 1))) long m_xpa_0_1;
+
+ ATTR (copy (((struct A *)0)[0])) short m_arpa_0;
+ ATTR (copy (((struct A *)(1, 0))[0])) int m_arpa_1_0;
+ ATTR (copy (((struct A *)(0, 1))[0])) long m_arpa_0_1;
+
+ ATTR (copy (a)) short m_ra;
+ ATTR (copy (b.a)) int m_rb_a;
+ ATTR (copy (b.pa)) long m_rb_pa;
+
+ ATTR (copy ()) short m_ara;
+ ATTR (copy ()) int m_arb_a;
+ ATTR (copy (*b.pa)) long m_xb_pa;
+ ATTR (copy (b.pa[0])) long m_arb_pa;
+
+ ATTR (copy (*pa)) short m_xpa;
+ ATTR (copy (pa[0])) short m_arpa;
+
+ ATTR (copy (ab[0].a)) int m_arab_a;
+ ATTR (copy (ab[1].pa)) long m_arab_pa;
+ ATTR (copy (*ab[2].pa)) int m_xarab_pa;
+ ATTR (copy (ab[3].pa->bf)) unsigned int m_arab_pa_bf: 1;
+
+ ATTR (copy (pb->a)) int m_pb_a;
+ ATTR (copy (pb->pa)) long m_pb_pa;
+ ATTR (copy (*pb->pa)) int m_xpb_pa;
+ ATTR (copy (pb->pa->bf)) unsigned int m_pb_pa_bf: 1;
+
+ ATTR (aligned (4), copy ((struct A *)(0))) short m_a4_pa_0;
+} C;
+
+
+_Static_assert (__builtin_has_attribute (((C*)0)->m_pa_0, packed));
+_Static_assert (__builtin_has_attribute (((C*)0)->m_pa_1_0, packed));
+_Static_assert (__builtin_has_attribute (((C*)0)->m_pa_0_1, packed));
+
+_Static_assert (__builtin_has_attribute (((C*)0)->m_xpa_0, packed));
+_Static_assert (__builtin_has_attribute (((C*)0)->m_xpa_1_0, packed));
+_Static_assert (__builtin_has_attribute (((C*)0)->m_xpa_0_1, packed));
+
+_Static_assert (__builtin_has_attribute (((C*)0)->m_arpa_0, packed));
+_Static_assert (__builtin_has_attribute (((C*)0)->m_arpa_1_0, packed));
+_Static_assert (__builtin_has_attribute (((C*)0)->m_arpa_0_1, packed));
+
+_Static_assert (__builtin_has_attribute (((C*)0)->m_ra, packed));
+_Static_assert (__builtin_has_attribute (((C*)0)->m_rb_a, packed));
+_Static_assert
