diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/tree.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ext/flexary2.C | 11 |
4 files changed, 27 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a57f978..d841686 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-01-14 Jason Merrill <jason@redhat.com> + + PR c++/46688 + * tree.c (build_vec_init_expr): Handle flexible array + properly. + 2011-01-13 Kai Tietz <kai.tietz@onevision.com> PR c++/47213 diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 213279a..813b88d 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -474,7 +474,12 @@ build_vec_init_expr (tree type, tree init) what functions are needed. Here we assume that init is either NULL_TREE, void_type_node (indicating value-initialization), or another array to copy. */ - if (init == void_type_node) + if (integer_zerop (array_type_nelts_total (type))) + { + /* No actual initialization to do. */; + init = NULL_TREE; + } + else if (init == void_type_node) { elt_init = build_value_init (inner_type, tf_warning_or_error); value_init = true; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c67c37c..9851be4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-01-14 Jason Merrill <jason@redhat.com> + + * g++.dg/ext/flexary2.C: New. + 2011-01-14 Richard Guenther <rguenther@suse.de> PR middle-end/47281 diff --git a/gcc/testsuite/g++.dg/ext/flexary2.C b/gcc/testsuite/g++.dg/ext/flexary2.C new file mode 100644 index 0000000..4855b3f --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/flexary2.C @@ -0,0 +1,11 @@ +// PR c++/46688 +// { dg-options "" } + +struct A { + A(int); +}; + +struct B { + B() {} + A a[]; +}; |