From: Jason Merrill <jason@redhat.com>
Date: Fri, 21 Apr 2017 19:26:54 +0000 (-0400)
Subject: PR c++/80179 - ICE with initialized flexible array member.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=176e79b51e9e778a768e9e33bd4daa47600300fd;p=gcc.git

PR c++/80179 - ICE with initialized flexible array member.

	* constexpr.c (verify_ctor_sanity): Handle flexible array members.

From-SVN: r247067
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index dad7a0a2520..6799e2edad9 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-21  Jason Merrill  <jason@redhat.com>
+
+	PR c++/80179 - ICE with initialized flexible array member.
+	* constexpr.c (verify_ctor_sanity): Handle flexible array members.
+
 2017-04-21  Richard Biener  <rguenther@suse.de>
 
 	* cp-tree.h (copy_decl): Annotate with CXX_MEM_STAT_INFO.
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 9dde4a4122a..366d562a8a6 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -2643,8 +2643,16 @@ verify_ctor_sanity (const constexpr_ctx *ctx, tree type)
   /* We used to check that ctx->ctor was empty, but that isn't the case when
      the object is zero-initialized before calling the constructor.  */
   if (ctx->object)
-    gcc_assert (same_type_ignoring_top_level_qualifiers_p
-		(type, TREE_TYPE (ctx->object)));
+    {
+      tree otype = TREE_TYPE (ctx->object);
+      gcc_assert (same_type_ignoring_top_level_qualifiers_p (type, otype)
+		  /* Handle flexible array members.  */
+		  || (TREE_CODE (otype) == ARRAY_TYPE
+		      && TYPE_DOMAIN (otype) == NULL_TREE
+		      && TREE_CODE (type) == ARRAY_TYPE
+		      && (same_type_ignoring_top_level_qualifiers_p
+			  (TREE_TYPE (type), TREE_TYPE (otype)))));
+    }
   gcc_assert (!ctx->object || !DECL_P (ctx->object)
 	      || *(ctx->values->get (ctx->object)) == ctx->ctor);
 }
diff --git a/gcc/testsuite/g++.dg/ext/flexary24.C b/gcc/testsuite/g++.dg/ext/flexary24.C
new file mode 100644
index 00000000000..c25e540243a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/flexary24.C
@@ -0,0 +1,12 @@
+// PR c++/80179
+// { dg-options "" }
+
+struct S {
+  int n;
+  const char *a[];
+};
+
+void bar (const char *a)
+{
+  static const S t = { 1, { a, "b" } };
+}