2012-09-04 Jason Merrill <jason@redhat.com>
+ PR c++/54441
+ * decl.c (reshape_init_class): Handle invalid initializer for
+ 0-length array member.
+
+ * error.c (dump_type_suffix): Correct handling of 0-length arrays.
+
PR c++/54420
* cp-tree.h (LAMBDANAME_P): Remove.
(LAMBDA_TYPE_P): Check CLASSTYPE_LAMBDA_EXPR instead.
while (d->cur != d->end)
{
tree field_init;
+ constructor_elt *old_cur = d->cur;
/* Handle designated initializers, as an extension. */
if (d->cur->index)
if (field_init == error_mark_node)
return error_mark_node;
+ if (d->cur->index && d->cur == old_cur)
+ {
+ /* This can happen with an invalid initializer for a flexible
+ array member (c++/54441). */
+ if (complain & tf_error)
+ error ("invalid initializer for %q#D", field);
+ return error_mark_node;
+ }
+
CONSTRUCTOR_APPEND_ELT (CONSTRUCTOR_ELTS (new_init), field, field_init);
/* [dcl.init.aggr]
{
tree dtype = TYPE_DOMAIN (t);
tree max = TYPE_MAX_VALUE (dtype);
- if (host_integerp (max, 0))
+ if (integer_all_onesp (max))
+ pp_character (cxx_pp, '0');
+ else if (host_integerp (max, 0))
pp_wide_integer (cxx_pp, tree_low_cst (max, 0) + 1);
else if (TREE_CODE (max) == MINUS_EXPR)
dump_expr (TREE_OPERAND (max, 0),
2012-09-04 Jason Merrill <jason@redhat.com>
+ PR c++/54441
+ * g++.dg/ext/flexary3.C: New.
+
PR c++/54420
* g++.dg/cpp0x/lambda/lambda-intname.C: New.
--- /dev/null
+// PR c++/54441
+// { dg-options "" }
+
+struct s { char c[]; };
+
+int main()
+{
+ struct s s = { .c = 0 }; // { dg-error "initializer" }
+ return 0;
+}