c++: Fix crash in gimplifier with paren init of aggregates [PR94155]

Here we crash in the gimplifier because gimplify_init_ctor_eval doesn't
expect null indexes for a constructor:

      /* ??? Here's to hoping the front end fills in all of the indices,
         so we don't have to figure out what's missing ourselves.  */
      gcc_assert (purpose);

The indexes weren't filled because we never called reshape_init: for
a constructor that represents parenthesized initialization of an
aggregate we don't allow brace elision or designated initializers.

	PR c++/94155 - crash in gimplifier with paren init of aggregates.
	* init.c (build_vec_init): Fill in indexes.

	* g++.dg/cpp2a/paren-init22.C: New test.

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a382235d7cceedf64fddb9d7d5a6b7b752ae3c80..fc75879d14fdbf5d929bbd5a328b8e0924330fd5 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2020-04-04  Marek Polacek  <polacek@redhat.com>
+           Jason Merrill  <jason@redhat.com>
+
+       PR c++/94155 - crash in gimplifier with paren init of aggregates.
+       * init.c (build_vec_init): Fill in indexes.
+
 2020-04-04  Jason Merrill  <jason@redhat.com>
 
        PR c++/91377

diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 27623cf4db19503f08d064ccd929fe021f3677fe..ea95a3bc91035e4f297a32020ec7f64bd86d52d3 100644 (file)
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -4438,6 +4438,8 @@ build_vec_init (tree base, tree maxindex, tree init,
            errors = true;
          if (try_const)
            {
+             if (!field)
+               field = size_int (idx);
              tree e = maybe_constant_init (one_init);
              if (reduced_constant_expression_p (e))
                {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 88bab5d3d19cffd1ab840f9aae98cb2487bb9803..29830633d793c9f84fc0ba33affef3c72b2fd2eb 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-04  Marek Polacek  <polacek@redhat.com>
+
+       PR c++/94155 - crash in gimplifier with paren init of aggregates.
+       * g++.dg/cpp2a/paren-init22.C: New test.
+
 2020-04-05  Iain Sandoe  <iain@sandoe.co.uk>
 
        * g++.dg/coroutines/torture/co-await-14-template-traits.C: Rename...

diff --git a/gcc/testsuite/g++.dg/cpp2a/paren-init22.C b/gcc/testsuite/g++.dg/cpp2a/paren-init22.C
new file mode 100644 (file)
index 0000000..1b2959e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/paren-init22.C
@@ -0,0 +1,15 @@
+// PR c++/94155 - crash in gimplifier with paren init of aggregates.
+// { dg-do compile { target c++2a } }
+
+struct S { int i, j; };
+
+struct A {
+  S s;
+  constexpr A(S e) : s(e) {}
+};
+
+void
+f()
+{
+  A g[1]({{1, 1}});
+}