aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/init.c5
-rw-r--r--gcc/cp/tree.c5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/nsdmi-array1.C6
3 files changed, 8 insertions, 8 deletions
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 6226812..ccc4f5e 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -4369,10 +4369,7 @@ build_vec_init (tree base, tree maxindex, tree init,
init = TARGET_EXPR_INITIAL (init);
if (init && TREE_CODE (init) == VEC_INIT_EXPR)
- {
- gcc_checking_assert (false);
- init = VEC_INIT_EXPR_INIT (init);
- }
+ init = VEC_INIT_EXPR_INIT (init);
bool direct_init = false;
if (from_array && init && BRACE_ENCLOSED_INITIALIZER_P (init)
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 4c1135b..d0c6490 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -787,10 +787,7 @@ tree
build_vec_init_expr (tree type, tree init, tsubst_flags_t complain)
{
if (init && TREE_CODE (init) == VEC_INIT_EXPR)
- {
- gcc_checking_assert (false);
- return init;
- }
+ return init;
tree elt_init;
if (init && TREE_CODE (init) == CONSTRUCTOR
diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-array1.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-array1.C
new file mode 100644
index 0000000..1ab1435
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-array1.C
@@ -0,0 +1,6 @@
+// PR c++/103946
+// { dg-do compile { target c++11 } }
+
+struct s1 { s1(); };
+class s2 { s1 f1[2]{}; };
+s2 a;