We were already rejecting initialization of a flexible array member in a
constructor; we similarly shouldn't try to clean it up.
Tested x86_64-pc-linux-gnu, applying to trunk.
PR c++/93618
* tree.c (array_of_unknown_bound_p): New.
* init.c (perform_member_init): Do nothing for flexible arrays.
---
gcc/cp/cp-tree.h | 1 +
gcc/cp/init.c | 7 +++++--
gcc/cp/tree.c | 9 +++++++++
gcc/testsuite/g++.dg/ext/flexary35.C | 18 ++++++++++++++++++
4 files changed, 33 insertions(+), 2 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/ext/flexary35.C
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 037d3b64538..043bc404140 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -7424,6 +7424,7 @@ extern tree build_exception_variant (tree,
tree);
extern tree bind_template_template_parm (tree, tree);
extern tree array_type_nelts_total (tree);
extern tree array_type_nelts_top (tree);
+extern bool array_of_unknown_bound_p (const_tree);
extern tree break_out_target_exprs (tree, bool = false);
extern tree build_ctor_subob_ref (tree, tree, tree);
extern tree replace_placeholders (tree, tree, bool * = NULL);
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 625062b60ad..d480660445e 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -801,8 +801,11 @@ perform_member_init (tree member, tree init)
member);
}
- if (maybe_reject_flexarray_init (member, init))
- return;
+ if (array_of_unknown_bound_p (type))
+ {
+ maybe_reject_flexarray_init (member, init);
+ return;
+ }
if (init && TREE_CODE (init) == TREE_LIST
&& (DIRECT_LIST_INIT_P (TREE_VALUE (init))
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index fda630790a2..eb540f851ee 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -1135,6 +1135,15 @@ build_array_of_n_type (tree elt, int n)
return build_cplus_array_type (elt, build_index_type (size_int (n - 1)));
}
+/* True iff T is an array of unknown bound. */
+
+bool
+array_of_unknown_bound_p (const_tree t)
+{
+ return (TREE_CODE (t) == ARRAY_TYPE
+ && !TYPE_DOMAIN (t));
+}
+
/* True iff T is an N3639 array of runtime bound (VLA). These were approved
for C++14 but then removed. This should only be used for N3639
specifically; code wondering more generally if something is a VLA should use
diff --git a/gcc/testsuite/g++.dg/ext/flexary35.C
b/gcc/testsuite/g++.dg/ext/flexary35.C
new file mode 100644
index 00000000000..b62c718fb0b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/flexary35.C
@@ -0,0 +1,18 @@
+// PR c++/93618
+// { dg-do compile { target c++11 } }
+// { dg-options "" }
+
+template <typename T>
+struct C {
+ ~C () = default;
+ T *p = nullptr;
+};
+
+class A {
+ struct B {
+ int c;
+ C<B*> d[];
+ };
+ void foo (int f) { B s; s.c = f; }
+ B e;
+};
base-commit: fd789c816b06235b04698636db69e302b24c83ba
--
2.18.1
