enum tree_code code = TREE_CODE (type);
tree field = NULL;
tree ref;
+ bool datum_lvalue = lvalue_p (datum);
if (!objc_is_public (datum, component))
return error_mark_node;
tree subdatum = TREE_VALUE (field);
int quals;
tree subtype;
+ bool use_datum_quals;
if (TREE_TYPE (subdatum) == error_mark_node)
return error_mark_node;
+ /* If this is an rvalue, it does not have qualifiers in C
+ standard terms and we must avoid propagating such
+ qualifiers down to a non-lvalue array that is then
+ converted to a pointer. */
+ use_datum_quals = (datum_lvalue
+ || TREE_CODE (TREE_TYPE (subdatum)) != ARRAY_TYPE);
+
quals = TYPE_QUALS (strip_array_types (TREE_TYPE (subdatum)));
- quals |= TYPE_QUALS (TREE_TYPE (datum));
+ if (use_datum_quals)
+ quals |= TYPE_QUALS (TREE_TYPE (datum));
subtype = c_build_qualified_type (TREE_TYPE (subdatum), quals);
ref = build3 (COMPONENT_REF, subtype, datum, subdatum,
NULL_TREE);
- if (TREE_READONLY (datum) || TREE_READONLY (subdatum))
+ if (TREE_READONLY (subdatum)
+ || (use_datum_quals && TREE_READONLY (datum)))
TREE_READONLY (ref) = 1;
- if (TREE_THIS_VOLATILE (datum) || TREE_THIS_VOLATILE (subdatum))
+ if (TREE_THIS_VOLATILE (subdatum)
+ || (use_datum_quals && TREE_THIS_VOLATILE (datum)))
TREE_THIS_VOLATILE (ref) = 1;
if (TREE_DEPRECATED (subdatum))
--- /dev/null
+/* Test for non-lvalue arrays: test that qualifiers on non-lvalues
+ containing arrays do not remain when those arrays decay to
+ pointers. PR 35235. */
+/* { dg-do compile } */
+/* { dg-options "-std=iso9899:1999 -pedantic-errors" } */
+
+int a;
+
+void
+f (void)
+{
+ const struct {
+ int a[1];
+ } s;
+ int *p1 = s.a; /* { dg-error "qualifiers" } */
+ int *p2 = (a ? s : s).a;
+ /* In this case, the qualifier is properly on the array element type
+ not on the rvalue structure and so is not discarded. */
+ struct {
+ const int a[1];
+ } t;
+ int *p3 = t.a; /* { dg-error "qualifiers" } */
+ int *p4 = (a ? t : t).a; /* { dg-error "qualifiers" } */
+ /* The issue could also lead to code being wrongly accepted. */
+ const struct {
+ int a[1][1];
+ } u;
+ const int (*p5)[1] = u.a;
+ const int (*p6)[1] = (a ? u : u).a; /* { dg-error "pointer" } */
+}