diff options
| author | Mikhail Maltsev <maltsevm@gmail.com> | 2015-03-26 19:51:58 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2015-03-26 15:51:58 -0400 |
| commit | 082276588e742c74af0216ae824b112b8ec7bb97 (patch) | |
| tree | 4621d4112107ceb1f4cb50bd5eaee486ea48ada4 /gcc | |
| parent | 4280698d09e99c6881773d0850f98e4d1662103e (diff) | |
| download | gcc-082276588e742c74af0216ae824b112b8ec7bb97.zip gcc-082276588e742c74af0216ae824b112b8ec7bb97.tar.gz gcc-082276588e742c74af0216ae824b112b8ec7bb97.tar.bz2 | |
re PR c++/65154 (ICE with {} initialized array with string)
PR c++/65154
* init.c (build_vec_init): Fix initializing aggregates
with empty init list.
From-SVN: r221704
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/init.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/init/array39.C | 46 |
3 files changed, 53 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e3699f6..684129b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-26 Mikhail Maltsev <maltsevm@gmail.com> + + PR c++/65154 + * init.c (build_vec_init): Fix initializing aggregates + with empty init list. + 2015-03-26 Jason Merrill <jason@redhat.com> PR c++/65525 diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 0274663..957a7a4 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -3716,11 +3716,7 @@ build_vec_init (tree base, tree maxindex, tree init, { if (cxx_dialect >= cxx11 && AGGREGATE_TYPE_P (type)) { - if (BRACE_ENCLOSED_INITIALIZER_P (init) - && CONSTRUCTOR_NELTS (init) == 0) - /* Reuse it. */; - else - init = build_constructor (init_list_type_node, NULL); + init = build_constructor (init_list_type_node, NULL); CONSTRUCTOR_IS_DIRECT_INIT (init) = true; } else diff --git a/gcc/testsuite/g++.dg/init/array39.C b/gcc/testsuite/g++.dg/init/array39.C new file mode 100644 index 0000000..2fd8937 --- /dev/null +++ b/gcc/testsuite/g++.dg/init/array39.C @@ -0,0 +1,46 @@ +// PR c++/65154 +// { dg-do run { target c++11 } } + +int cnt1 = 0, + cnt2 = 0; + +struct S_empty +{ + S_empty () { + cnt1++; + }; +}; + +struct C1 +{ + S_empty s; +}; + +struct S_init +{ + S_init () : i(42) + { + cnt2++; + }; + int i; +}; + +struct C2 +{ + S_init a, b; +}; + +int +main () +{ + C1 c1[5]{}; + C2 c2[1]{}; + + if (c2[0].a.i != 42 || c2[0].b.i != 42) + return 1; + + if (cnt1 != 5 || cnt2 != 2) + return 1; + + return 0; +} |