@@ -5364,7 +5364,8 @@ start_decl (struct c_declarator *declarator, struct c_declspecs *declspecs,
if (lastdecl != error_mark_node)
*lastloc = DECL_SOURCE_LOCATION (lastdecl);
- if (expr)
+ /* Make sure the size expression is evaluated at this point. */
+ if (expr && !current_scope->parm_flag)
add_stmt (fold_convert (void_type_node, expr));
if (TREE_CODE (decl) != FUNCTION_DECL && MAIN_NAME_P (DECL_NAME (decl))
@@ -7498,7 +7499,8 @@ grokdeclarator (const struct c_declarator *declarator,
&& c_type_variably_modified_p (type))
{
tree bind = NULL_TREE;
- if (decl_context == TYPENAME || decl_context == PARM)
+ if (decl_context == TYPENAME || decl_context == PARM
+ || decl_context == FIELD)
{
bind = build3 (BIND_EXPR, void_type_node, NULL_TREE,
NULL_TREE, NULL_TREE);
@@ -7507,10 +7509,11 @@ grokdeclarator (const struct c_declarator *declarator,
push_scope ();
}
tree decl = build_decl (loc, TYPE_DECL, NULL_TREE, type);
- DECL_ARTIFICIAL (decl) = 1;
pushdecl (decl);
- finish_decl (decl, loc, NULL_TREE, NULL_TREE, NULL_TREE);
+ DECL_ARTIFICIAL (decl) = 1;
+ add_stmt (build_stmt (DECL_SOURCE_LOCATION (decl), DECL_EXPR, decl));
TYPE_NAME (type) = decl;
+
if (bind)
{
pop_scope ();
@@ -8709,7 +8712,7 @@ start_struct (location_t loc, enum tree_code code, tree name,
tree
grokfield (location_t loc,
struct c_declarator *declarator, struct c_declspecs *declspecs,
- tree width, tree *decl_attrs)
+ tree width, tree *decl_attrs, tree *expr)
{
tree value;
@@ -8766,7 +8769,7 @@ grokfield (location_t loc,
}
value = grokdeclarator (declarator, declspecs, FIELD, false,
- width ? &width : NULL, decl_attrs, NULL, NULL,
+ width ? &width : NULL, decl_attrs, expr, NULL,
DEPRECATED_NORMAL);
finish_decl (value, loc, NULL_TREE, NULL_TREE, NULL_TREE);
@@ -9424,13 +9427,6 @@ finish_struct (location_t loc, tree t, tree fieldlist, tree attributes,
finish_incomplete_vars (incomplete_vars, toplevel);
- /* If we're inside a function proper, i.e. not file-scope and not still
- parsing parameters, then arrange for the size of a variable sized type
- to be bound now. */
- if (building_stmt_list_p () && c_type_variably_modified_p(t))
- add_stmt (build_stmt (loc,
- DECL_EXPR, build_decl (loc, TYPE_DECL, NULL, t)));
-
if (warn_cxx_compat)
warn_cxx_compat_finish_struct (fieldlist, TREE_CODE (t), loc);
@@ -10056,6 +10052,7 @@ start_function (struct c_declspecs *declspecs, struct c_declarator *declarator,
tree restype, resdecl;
location_t loc;
location_t result_loc;
+ tree expr = NULL;
current_function_returns_value = 0; /* Assume, until we see it does. */
current_function_returns_null = 0;
@@ -10067,7 +10064,7 @@ start_function (struct c_declspecs *declspecs, struct c_declarator *declarator,
in_statement = 0;
decl1 = grokdeclarator (declarator, declspecs, FUNCDEF, true, NULL,
- &attributes, NULL, NULL, DEPRECATED_NORMAL);
+ &attributes, &expr, NULL, DEPRECATED_NORMAL);
invoke_plugin_callbacks (PLUGIN_START_PARSE_FUNCTION, decl1);
/* If the declarator is not suitable for a function definition,
@@ -10076,6 +10073,11 @@ start_function (struct c_declspecs *declspecs, struct c_declarator *declarator,
|| TREE_CODE (decl1) != FUNCTION_DECL)
return false;
+ /* Nested functions may have variably modified (return) type.
+ Make sure the size expression is evaluated at this point. */
+ if (expr && !current_scope->parm_flag)
+ add_stmt (fold_convert (void_type_node, expr));
+
loc = DECL_SOURCE_LOCATION (decl1);
/* A nested function is not global. */
@@ -12284,10 +12286,13 @@ declspecs_add_type (location_t loc, struct c_declspecs *specs,
}
else
{
- if (TREE_CODE (type) != ERROR_MARK && spec.kind == ctsk_typeof)
+ if (TREE_CODE (type) != ERROR_MARK)
{
- specs->typedef_p = true;
- specs->locations[cdw_typedef] = loc;
+ if (spec.kind == ctsk_typeof)
+ {
+ specs->typedef_p = true;
+ specs->locations[cdw_typedef] = loc;
+ }
if (spec.expr)
{
if (specs->expr)
@@ -1541,7 +1541,7 @@ static void c_parser_static_assert_declaration_no_semi (c_parser *);
static void c_parser_static_assert_declaration (c_parser *);
static struct c_typespec c_parser_enum_specifier (c_parser *);
static struct c_typespec c_parser_struct_or_union_specifier (c_parser *);
-static tree c_parser_struct_declaration (c_parser *);
+static tree c_parser_struct_declaration (c_parser *, tree *);
static struct c_typespec c_parser_typeof_specifier (c_parser *);
static tree c_parser_alignas_specifier (c_parser *);
static struct c_declarator *c_parser_direct_declarator (c_parser *, bool,
@@ -2263,6 +2263,9 @@ c_parser_declaration_or_fndef (c_parser *parser, bool fndef_ok,
if (!handled_assume)
pedwarn (here, 0, "empty declaration");
}
+ /* We still have to evaluate size expressions. */
+ if (specs->expr)
+ add_stmt (fold_convert (void_type_node, specs->expr));
c_parser_consume_token (parser);
if (oacc_routine_data)
c_finish_oacc_routine (oacc_routine_data, NULL_TREE, false);
@@ -3782,6 +3785,7 @@ c_parser_struct_or_union_specifier (c_parser *parser)
so we'll be minimizing the number of node traversals required
by chainon. */
tree contents;
+ tree expr = NULL;
timevar_push (TV_PARSE_STRUCT);
contents = NULL_TREE;
c_parser_consume_token (parser);
@@ -3843,7 +3847,7 @@ c_parser_struct_or_union_specifier (c_parser *parser)
}
/* Parse some comma-separated declarations, but not the
trailing semicolon if any. */
- decls = c_parser_struct_declaration (parser);
+ decls = c_parser_struct_declaration (parser, &expr);
contents = chainon (decls, contents);
/* If no semicolon follows, either we have a parse error or
are at the end of the struct or union and should
@@ -3874,7 +3878,7 @@ c_parser_struct_or_union_specifier (c_parser *parser)
chainon (attrs, postfix_attrs)),
struct_info);
ret.kind = ctsk_tagdef;
- ret.expr = NULL_TREE;
+ ret.expr = expr;
ret.expr_const_operands = true;
ret.has_enum_type_specifier = false;
timevar_pop (TV_PARSE_STRUCT);
@@ -3936,7 +3940,7 @@ c_parser_struct_or_union_specifier (c_parser *parser)
expressions will be diagnosed as non-constant. */
static tree
-c_parser_struct_declaration (c_parser *parser)
+c_parser_struct_declaration (c_parser *parser, tree *expr)
{
struct c_declspecs *specs;
tree prefix_attrs;
@@ -3949,7 +3953,7 @@ c_parser_struct_declaration (c_parser *parser)
tree decl;
ext = disable_extension_diagnostics ();
c_parser_consume_token (parser);
- decl = c_parser_struct_declaration (parser);
+ decl = c_parser_struct_declaration (parser, expr);
restore_extension_diagnostics (ext);
return decl;
}
@@ -3995,7 +3999,7 @@ c_parser_struct_declaration (c_parser *parser)
ret = grokfield (c_parser_peek_token (parser)->location,
build_id_declarator (NULL_TREE), specs,
- NULL_TREE, &attrs);
+ NULL_TREE, &attrs, expr);
if (ret)
decl_attributes (&ret, attrs, 0);
}
@@ -4056,7 +4060,7 @@ c_parser_struct_declaration (c_parser *parser)
if (c_parser_next_token_is_keyword (parser, RID_ATTRIBUTE))
postfix_attrs = c_parser_gnu_attributes (parser);
d = grokfield (c_parser_peek_token (parser)->location,
- declarator, specs, width, &all_prefix_attrs);
+ declarator, specs, width, &all_prefix_attrs, expr);
decl_attributes (&d, chainon (postfix_attrs,
all_prefix_attrs), 0);
DECL_CHAIN (d) = decls;
@@ -11732,7 +11736,7 @@ c_parser_objc_class_instance_variables (c_parser *parser)
}
/* Parse some comma-separated declarations. */
- decls = c_parser_struct_declaration (parser);
+ decls = c_parser_struct_declaration (parser, NULL);
if (decls == NULL)
{
/* There is a syntax error. We want to skip the offending
@@ -12871,7 +12875,7 @@ c_parser_objc_at_property_declaration (c_parser *parser)
/* 'properties' is the list of properties that we read. Usually a
single one, but maybe more (eg, in "@property int a, b, c;" there
are three). */
- tree properties = c_parser_struct_declaration (parser);
+ tree properties = c_parser_struct_declaration (parser, NULL);
if (properties == error_mark_node)
c_parser_skip_until_found (parser, CPP_SEMICOLON, NULL);
@@ -656,7 +656,7 @@ extern tree c_simulate_record_decl (location_t, const char *,
extern struct c_arg_info *build_arg_info (void);
extern struct c_arg_info *get_parm_info (bool, tree);
extern tree grokfield (location_t, struct c_declarator *,
- struct c_declspecs *, tree, tree *);
+ struct c_declspecs *, tree, tree *, tree *);
extern tree groktypename (struct c_type_name *, tree *, bool *);
extern tree grokparm (const struct c_parm *, tree *);
extern tree implicitly_declare (location_t, tree);
new file mode 100644
@@ -0,0 +1,63 @@
+/* { dg-do run } */
+/* { dg-options "-std=gnu99" } */
+
+
+int main()
+{
+ int n = 1;
+
+ struct foo { char x[++n]; } bar(void) { struct foo r; return r; }
+
+ if (2 != n)
+ __builtin_abort();
+
+ if (2 != sizeof(bar()))
+ __builtin_abort();
+
+ n = 1;
+
+ struct bar { char x[++n]; } (*bar2p)(void);
+ struct bar bar2(void) { struct bar r; return r; }
+ bar2p = &bar2;
+
+ if (2 != n)
+ __builtin_abort();
+
+ if (2 != sizeof((*bar2p)()))
+ __builtin_abort();
+
+ n = 1;
+
+ struct str { char x[++n]; } *bar3(void)
+ {
+ struct str* s = __builtin_malloc(sizeof(struct str));
+ if (!s)
+ __builtin_abort();
+ struct str t;
+ *s = t;
+ return s;
+ }
+
+ if (2 != n)
+ __builtin_abort();
+
+ struct str* p;
+
+ if (2 != sizeof(*(p = bar3())))
+ __builtin_abort();
+
+ __builtin_free(p);
+
+ n = 1;
+
+ struct { char x[++n]; } *bar4(void) { }
+
+ if (2 != n)
+ __builtin_abort();
+#if 0
+ // UB
+ if (2 != sizeof(*bar4()))
+ __builtin_abort();
+#endif
+}
+
new file mode 100644
@@ -0,0 +1,34 @@
+/* { dg-do run } */
+/* { dg-options "-std=gnu99" } */
+
+
+int main()
+{
+ int n = 1;
+
+ char tmp[2] = { 0 };
+ typeof(char (*)[++n]) bar(void) { return &tmp; }
+
+ if (2 != n)
+ __builtin_abort();
+
+ if (2 != sizeof(*bar()))
+ __builtin_abort();
+
+ if (2 != n)
+ __builtin_abort();
+
+ n = 1;
+
+ typeof(char (*)[++n]) (*bar2)(void) = bar;
+
+ if (2 != n)
+ __builtin_abort();
+
+ if (2 != sizeof(*(*bar2)()))
+ __builtin_abort();
+
+ if (2 != n)
+ __builtin_abort();
+}
+
new file mode 100644
@@ -0,0 +1,29 @@
+/* { dg-do run } */
+/* { dg-options "-std=gnu99" } */
+
+
+int main()
+{
+ int n = 1;
+
+ char tmp[2] = { 0 };
+ char (*bar(void))[++n] { return &tmp; }
+
+ if (2 != n)
+ __builtin_abort();
+
+ if (2 != sizeof(*bar()))
+ __builtin_abort();
+
+ n = 1;
+
+ char (*(*bar2)(void))[++n] = bar;
+
+ if (2 != n)
+ __builtin_abort();
+
+ if (2 != sizeof(*(*bar2)()))
+ __builtin_abort();
+
+}
+
new file mode 100644
@@ -0,0 +1,109 @@
+/* PR c/106465
+ * { dg-do run }
+ * { dg-options "-std=gnu99" }
+ * */
+
+int main()
+{
+ int n = 3;
+
+ void* p = __builtin_malloc(sizeof(struct { char p[16]; }));
+
+ if (!p)
+ return 0;
+
+ void g1(int m, struct foo { char p[++m]; }* b) /* { dg-warning "struct" } */
+ {
+ if (3 != m)
+ __builtin_abort();
+
+ struct foo t;
+ *b = t;
+
+ if (3 != sizeof(b->p))
+ __builtin_abort();
+ }
+
+ void g2(struct { char p[++n]; }* b) /* { dg-warning "anonymous struct" } */
+ {
+ if (4 != n)
+ __builtin_abort();
+
+ typeof(*b) t;
+ *b = t;
+
+ if (4 != sizeof(b->p))
+ __builtin_abort();
+ }
+
+ void g2b(struct { char (*p)[++n]; }* b) /* { dg-warning "anonymous struct" } */
+ {
+ if (5 != n)
+ __builtin_abort();
+
+ char tmp[5];
+ typeof(*b) t = { &tmp };
+ *b = t;
+
+ if (5 != sizeof(*b->p))
+ __builtin_abort();
+ }
+
+ if (3 != n)
+ __builtin_abort();
+
+ g1(2, p);
+ g2(p);
+ g2b(p);
+ n--;
+
+ __builtin_free(p);
+
+ if (4 != n)
+ __builtin_abort();
+
+ struct foo { char (*p)[++n]; } x;
+
+ if (5 != n)
+ __builtin_abort();
+
+ char tmp1[5];
+ x.p = &tmp1;
+
+ struct bar { char (*p)[++n]; };
+
+ if (6 != n)
+ __builtin_abort();
+
+ auto struct z { char (*p)[++n]; } g3(void);
+
+ if (7 != n)
+ __builtin_abort();
+
+ struct z g3(void) { };
+
+ if (7 != n)
+ __builtin_abort();
+
+ struct { char (*p)[++n]; } g4(void) { };
+
+ if (8 != n)
+ __builtin_abort();
+
+ __auto_type u = g3();
+
+ if (8 != n)
+ __builtin_abort();
+
+ char tmp2[7];
+ u.p = &tmp2;
+
+ if (5 != sizeof *x.p)
+ __builtin_abort();
+
+ if (7 != sizeof *u.p)
+ __builtin_abort();
+
+ return 0;
+}
+
new file mode 100644
@@ -0,0 +1,24 @@
+/* PR107557
+ * { dg-do compile }
+ * { dg-options "-flto -fsanitize=undefined -fexceptions -Wno-incompatible-pointer-types" }
+ */
+
+
+int c[1][3*2];
+int f(int * const m, int (**v)[*m * 2])
+{
+ return &(c[0][*m]) == &((*v)[0][*m]);
+}
+int test(int n, int (*(*fn)(void))[n])
+{
+ return (*fn())[0];
+}
+int main()
+{
+ int m = 3;
+ int (*d)[3*2] = c;
+ int (*fn[m])(void);
+ return f(&m, &d) + test(m, &fn);
+}
+
+
new file mode 100644
@@ -0,0 +1,23 @@
+/* PR107557
+ * { dg-do compile }
+ * { dg-options "-flto -fsanitize=undefined -fexceptions -Wno-incompatible-pointer-types" }
+ */
+
+
+int c[1][3*2];
+int f(int * const m, int (**(*v))[*m * 2])
+{
+ return &(c[0][*m]) == &((*v)[0][*m]); /* { dg-warning "lacks a cast" } */
+}
+int test(int n, int (*(*(*fn))(void))[n])
+{
+ return (*(*fn)())[0];
+}
+int main()
+{
+ int m = 3;
+ int (*d)[3*2] = c;
+ int (*fn[m])(void);
+ return f(&m, &d) + test(m, &fn);
+}
+
new file mode 100644
@@ -0,0 +1,16 @@
+/* PR108423
+ * { dg-do compile }
+ * { dg-options "-O2 -Wno-int-conversion -Wno-incompatible-pointer-types" }
+ */
+int f (int n, int (**(*a)(void))[n])
+{
+ return (*a())[0];
+}
+int g ()
+{
+ int m = 3;
+ int (*a[m])(void);
+ return f(m, &a);
+}
+
+
new file mode 100644
@@ -0,0 +1,16 @@
+/* PR108423
+ * { dg-do compile }
+ * { dg-options "-O2" }
+ */
+
+void f(int n, int (*a(void))[n])
+{
+ (a())[0];
+}
+
+void g(void)
+{
+ int (*a(void))[1];
+ f(1, a);
+}
+
new file mode 100644
@@ -0,0 +1,17 @@
+/* PR108423
+ * { dg-do compile }
+ * { dg-options "-O2" }
+ */
+
+void f(int n, int (*(*b)(void))[n])
+{
+ sizeof (*(*b)());
+}
+
+int (*a(void))[1];
+
+void g(void)
+{
+ f(1, &a);
+}
+
new file mode 100644
@@ -0,0 +1,17 @@
+/* PR108423
+ * { dg-do compile }
+ * { dg-options "-O2" }
+ */
+
+void f(int n, int (*a(void))[n])
+{
+ sizeof (*a());
+}
+
+int (*a(void))[1];
+
+void g(void)
+{
+ f(1, a);
+}
+
new file mode 100644
@@ -0,0 +1,17 @@
+/* PR108423
+ * { dg-do compile }
+ * { dg-options "-O2" }
+ */
+
+void f(int n, int (*(*a)(void))[n])
+{
+ sizeof ((*a)());
+}
+
+int (*a(void))[1];
+
+void g(void)
+{
+ f(1, a);
+}
+
new file mode 100644
@@ -0,0 +1,16 @@
+/* PR108423
+ * { dg-do compile }
+ * { dg-options "-O2" }
+ */
+
+void f(int n, int (*a())[n])
+{
+ (a())[0];
+}
+
+void g(void)
+{
+ int (*a())[1];
+ f(1, a);
+}
+
new file mode 100644
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+/* { dg-options "-std=gnu99" } */
+
+
+int main()
+{
+ void func(int a, struct {int _[a];} v) {} /* { dg-warning "struct" } */
+}
+
new file mode 100644
@@ -0,0 +1,19 @@
+/* { dg-do run }
+ * { dg-options "-std=c99" }
+ * */
+
+
+static char tmp[2];
+
+static int f(int n, char (*x)[sizeof (*(++n, (char (*)[n])&tmp))])
+{
+ return sizeof *x;
+}
+
+int main (void)
+{
+ if (2 != f(1, &tmp))
+ __builtin_abort ();
+ return 0;
+}
+
new file mode 100644
@@ -0,0 +1,18 @@
+/* { dg-do run }
+ * { dg-options "-std=c99" }
+ * */
+
+static char tmp[2];
+
+static int f(int n, char (*x)[sizeof *(++n, (struct { char (*x)[n]; }){ &tmp }).x]) /* { dg-warning "anonymous struct" } */
+{
+ return sizeof *x;
+}
+
+int main (void)
+{
+ if (2 != f(1, &tmp))
+ __builtin_abort ();
+ return 0;
+}
+
new file mode 100644
@@ -0,0 +1,23 @@
+/* { dg-do run }
+ * { dg-options "-std=gnu99" }
+ * */
+
+int main()
+{
+ int n = 1;
+ sizeof(int[n++]);
+ typeof(int[n++]); /* { dg-warning "empty declaration" } */
+ struct { int x[n++]; }; /* { dg-warning "no instance" } */
+ struct foo { int x[n++]; };
+ struct { int x[n++]; } x;
+ struct bar { int x[n++]; } y;
+ (int(*)[n++])0;
+ (typeof(int(*)[n++]))0;
+ (struct { int x[n++]; }*)0;
+ (struct q { int x[n++]; }*)0;
+ typeof(struct { int x[n++]; }); /* { dg-warning "empty declaration" } */
+ typeof(struct r { int x[n++]; }); /* { dg-warning "empty declaration" } */
+
+ if (13 != n)
+ __builtin_abort();
+}
new file mode 100644
@@ -0,0 +1,14 @@
+/* { dg-do run }
+ * { dg-options "-std=gnu99" }
+ * */
+
+int
+main (void)
+{
+ int a = 1;
+ char tmp[2];
+ if (sizeof (*(++a, (struct { char (*x)[a]; }){ &tmp }).x) != 2)
+ __builtin_abort ();
+}
+
+
new file mode 100644
@@ -0,0 +1,16 @@
+/* { dg-do run }
+ * { dg-options "-std=gnu99" }
+ * */
+
+
+
+int
+main (void)
+{
+ int a = 1;
+ char tmp[2];
+ if ((++a, sizeof(*((struct { char (*x)[a]; }){ &tmp }).x)) != 2)
+ __builtin_abort ();
+}
+
+
@@ -4,7 +4,7 @@
int main (void)
{
const int t = 2; /* count(1) */
- struct s1 { /* count(1) */
+ struct s1 { /* count(-) */
int x;
int g[t];
};
Hi Joseph, I had to create another revision of the patch because of some case I had overlooked (vm-types pointed-to by parameters declared as I arrays). I splitted the patch up in two parts for easier reviewing. The first part only has the FE changes and most of the tests. The only minor change is that I replaced a bug number because there was a duplicate and that I added the specific example from this bug report (PR70418) as another test. Since this half of the patch was already reviewed, I will commit it tomorrow if there are no comments. The second part contains the middle-end changes and the new FE fix you haven't seen. Both patches bootstrapped and regression tested on x86. Martin Fix ICEs related to VM types in C 1/2 [PR70418, PR107557, PR108423] Size expressions were sometimes lost and not gimplified correctly, leading to ICEs and incorrect evaluation order. Fix this by 1) not recursing into pointers when gimplifying parameters in the middle-end (the code is merged with gimplify_type_sizes), which is incorrect because it might access variables declared later for incomplete structs, and 2) tracking size expressions for struct/union members correctly, 3) emitting code to evaluate size expressions for missing cases (nested functions, empty declarations, and structs/unions). PR c/70418 PR c/106465 PR c/107557 PR c/108423 gcc/ * c/c-decl.cc (start_decl): Make sure size expression are evaluated only in correct context. (grokdeclarator): Size expression in fields may need a bind expression, make sure DECL_EXPR is always created. (grokfield, declspecs_add_type): Pass along size expressions. (finish_struct): Remove unneeded DECL_EXPR. (start_function): Evaluate size expressions for nested functions. * c/c-parser.cc (c_parser_struct_declarations, c_parser_struct_or_union_specifier): Pass along size expressions. (c_parser_declaration_or_fndef): Evaluate size expression. (c_parser_objc_at_property_declaration, c_parser_objc_class_instance_variables): Adapt. gcc/testsuite/ * gcc.dg/nested-vla-1.c: New test. * gcc.dg/nested-vla-2.c: New test. * gcc.dg/nested-vla-3.c: New test. * gcc.dg/pr70418.c: New test. * gcc.dg/pr106465.c: New test. * gcc.dg/pr107557-1.c: New test. * gcc.dg/pr107557-2.c: New test. * gcc.dg/pr108423-1.c: New test. * gcc.dg/pr108423-2.c: New test. * gcc.dg/pr108423-3.c: New test. * gcc.dg/pr108423-4.c: New test. * gcc.dg/pr108423-5.c: New test. * gcc.dg/pr108423-6.c: New test. * gcc.dg/typename-vla-2.c: New test. * gcc.dg/typename-vla-3.c: New test. * gcc.dg/typename-vla-4.c: New test. * gcc.misc-tests/gcov-pr85350.c: Adapt.