diff options
| author | Marek Polacek <polacek@redhat.com> | 2020-03-30 15:49:17 -0400 |
|---|---|---|
| committer | Marek Polacek <polacek@redhat.com> | 2020-04-06 11:23:56 -0400 |
| commit | f84aded848f6fdd2704c9376263c6d1aee6bb0ca (patch) | |
| tree | 48038a008f3bf8051fa0b16da3f45b297e56c527 /gcc | |
| parent | c72a1b6f8b26de37d1a922a8af143af009747498 (diff) | |
| download | gcc-f84aded848f6fdd2704c9376263c6d1aee6bb0ca.zip gcc-f84aded848f6fdd2704c9376263c6d1aee6bb0ca.tar.gz gcc-f84aded848f6fdd2704c9376263c6d1aee6bb0ca.tar.bz2 | |
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/init.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/paren-init22.C | 15 |
4 files changed, 28 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a382235..fc75879 100644 --- 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 27623cf..ea95a3b 100644 --- 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 88bab5d..2983063 100644 --- 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 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}}); +} |