From fe217ba0ee93975a42c5a068156e5a295a5cf844 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 13 Mar 2018 00:40:20 +0100 Subject: [PATCH] re PR c++/84808 (ICE with constexpr and array) PR c++/84808 * constexpr.c (find_array_ctor_elt): Don't use elt reference after first potential CONSTRUCTOR_ELTS reallocation. Convert dindex to sizetype. Formatting fixes. * g++.dg/cpp1y/constexpr-84808.C: New test. From-SVN: r258471 --- gcc/cp/ChangeLog | 7 +++++ gcc/cp/constexpr.c | 12 +++++---- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/cpp1y/constexpr-84808.C | 27 ++++++++++++++++++++ 4 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1y/constexpr-84808.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e2373b20064..9b5f0c36663 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2018-03-13 Jakub Jelinek + + PR c++/84808 + * constexpr.c (find_array_ctor_elt): Don't use elt reference after + first potential CONSTRUCTOR_ELTS reallocation. Convert dindex to + sizetype. Formatting fixes. + 2018-03-12 Jason Merrill PR c++/84355 - ICE with deduction for member class template. diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 2c5a71f3ee5..05a1cb64d61 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -2194,9 +2194,9 @@ find_array_ctor_elt (tree ary, tree dindex, bool insert = false) that the same is true of the other elements and index directly. */ if (end > 0) { - tree cindex = (*elts)[end-1].index; + tree cindex = (*elts)[end - 1].index; if (TREE_CODE (cindex) == INTEGER_CST - && compare_tree_int (cindex, end-1) == 0) + && compare_tree_int (cindex, end - 1) == 0) { if (i < end) return i; @@ -2225,6 +2225,8 @@ find_array_ctor_elt (tree ary, tree dindex, bool insert = false) constructor_elt e; tree lo = TREE_OPERAND (idx, 0); tree hi = TREE_OPERAND (idx, 1); + tree value = elt.value; + dindex = fold_convert (sizetype, dindex); if (tree_int_cst_lt (lo, dindex)) { /* There are still some lower elts; shorten the range. */ @@ -2238,7 +2240,7 @@ find_array_ctor_elt (tree ary, tree dindex, bool insert = false) /* Append the element we want to insert. */ ++middle; e.index = dindex; - e.value = unshare_constructor (elt.value); + e.value = unshare_constructor (value); vec_safe_insert (CONSTRUCTOR_ELTS (ary), middle, e); } else @@ -2254,8 +2256,8 @@ find_array_ctor_elt (tree ary, tree dindex, bool insert = false) e.index = hi; else e.index = build2 (RANGE_EXPR, sizetype, new_lo, hi); - e.value = unshare_constructor (elt.value); - vec_safe_insert (CONSTRUCTOR_ELTS (ary), middle+1, e); + e.value = unshare_constructor (value); + vec_safe_insert (CONSTRUCTOR_ELTS (ary), middle + 1, e); } } return middle; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index da617c7e01b..367a269d437 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2018-03-13 Jakub Jelinek + PR c++/84808 + * g++.dg/cpp1y/constexpr-84808.C: New test. + PR c++/84704 * g++.dg/debug/pr84704.C: New test. diff --git a/gcc/testsuite/g++.dg/cpp1y/constexpr-84808.C b/gcc/testsuite/g++.dg/cpp1y/constexpr-84808.C new file mode 100644 index 00000000000..2f0eeac07c7 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/constexpr-84808.C @@ -0,0 +1,27 @@ +// PR c++/84808 +// { dg-do compile { target c++14 } } + +struct A { int i; constexpr A () : i() {} }; +struct B { A a[24]; }; + +constexpr int +foo (int n) +{ + B b; + ++b.a[n + 20].i; + ++b.a[n + 18].i; + ++b.a[n + 16].i; + ++b.a[n + 14].i; + ++b.a[n + 12].i; + ++b.a[n + 10].i; + ++b.a[n + 8].i; + ++b.a[n + 6].i; + ++b.a[n + 4].i; + ++b.a[n + 2].i; + ++b.a[n].i; + return b.a[2].i + b.a[4].i + b.a[6].i + b.a[8].i + b.a[10].i + + b.a[12].i + b.a[14].i + b.a[16].i + b.a[18].i + b.a[20].i + b.a[22].i; +} + +constexpr int i = foo (2); +static_assert (i == 11, ""); -- 2.30.2