PR c++/83808 - ICE with VLA initialization.

	* typeck2.c (process_init_constructor_array): Don't require a VLA
	initializer to have VLA type.

From-SVN: r259138

gcc/cp/ChangeLog

+2018-04-05  Jason Merrill  <jason@redhat.com>
+
+	PR c++/83808 - ICE with VLA initialization.
+	* typeck2.c (process_init_constructor_array): Don't require a VLA
+	initializer to have VLA type.
+
 2018-04-05  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/80956

gcc/cp/typeck2.c

@@ -1319,9 +1319,11 @@ process_init_constructor_array (tree type, tree init, int nested,
       ce->value
 	= massage_init_elt (TREE_TYPE (type), ce->value, nested, complain);
 
-      if (ce->value != error_mark_node)
-	gcc_assert (same_type_ignoring_top_level_qualifiers_p
-		      (TREE_TYPE (type), TREE_TYPE (ce->value)));
+      gcc_checking_assert
+	(ce->value == error_mark_node
+	 || (same_type_ignoring_top_level_qualifiers_p
+	     (strip_array_types (TREE_TYPE (type)),
+	      strip_array_types (TREE_TYPE (ce->value)))));
 
       flags |= picflag_from_initializer (ce->value);
     }

gcc/testsuite/g++.dg/ext/vla19.C

+// PR c++/83808
+// { dg-additional-options "-Wno-vla" }
+
+struct R { int r; };
+void baz (char *, char *, char *, char *);
+
+void
+foo ()
+{
+  const R a = { 12 };
+  char b[1][a.r] = { { "12345678901" } };
+  char c[a.r] = { "12345678901" };
+  char d[1][a.r] = { { '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '\0' } };
+  char e[a.r] = { '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '\0' };
+  baz (b[0], c, d[0], e);
+}