From faddc0d7c2d9647a4e2fa897743442dd71180d88 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Wed, 5 Sep 2012 00:17:12 -0400
Subject: [PATCH] re PR c++/54441 (Infinite loop with brace initializer on
zero-length array)
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.
From-SVN: r190962
---
gcc/cp/ChangeLog | 6 ++++++
gcc/cp/decl.c | 10 ++++++++++
gcc/cp/error.c | 4 +++-
gcc/testsuite/ChangeLog | 3 +++
gcc/testsuite/g++.dg/ext/flexary3.C | 10 ++++++++++
5 files changed, 32 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/g++.dg/ext/flexary3.C
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4501217f056e..629ab57b0e2e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,11 @@
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.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 8024373f09b9..b665fe8ca195 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5094,6 +5094,7 @@ reshape_init_class (tree type, reshape_iter *d, bool first_initializer_p,
while (d->cur != d->end)
{
tree field_init;
+ constructor_elt *old_cur = d->cur;
/* Handle designated initializers, as an extension. */
if (d->cur->index)
@@ -5130,6 +5131,15 @@ reshape_init_class (tree type, reshape_iter *d, bool first_initializer_p,
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]
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 80a145d974c5..1872d01a2494 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -846,7 +846,9 @@ dump_type_suffix (tree t, int flags)
{
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),
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 31d219a4d229..62dfe13afc3d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
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.
diff --git a/gcc/testsuite/g++.dg/ext/flexary3.C b/gcc/testsuite/g++.dg/ext/flexary3.C
new file mode 100644
index 000000000000..906877b11b78
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/flexary3.C
@@ -0,0 +1,10 @@
+// PR c++/54441
+// { dg-options "" }
+
+struct s { char c[]; };
+
+int main()
+{
+ struct s s = { .c = 0 }; // { dg-error "initializer" }
+ return 0;
+}
--
GitLab