From 082276588e742c74af0216ae824b112b8ec7bb97 Mon Sep 17 00:00:00 2001 From: Mikhail Maltsev Date: Thu, 26 Mar 2015 19:51:58 +0000 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 6 ++++ gcc/cp/init.c | 6 +--- gcc/testsuite/g++.dg/init/array39.C | 46 +++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/g++.dg/init/array39.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e3699f63c04..684129b2200 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-26 Mikhail Maltsev + + PR c++/65154 + * init.c (build_vec_init): Fix initializing aggregates + with empty init list. + 2015-03-26 Jason Merrill PR c++/65525 diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 0274663c8f4..957a7a4e6e8 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 00000000000..2fd89377162 --- /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; +} -- 2.30.2