From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id DD8F33857C48; Fri, 7 Jan 2022 05:23:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DD8F33857C48 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6339] c++: temporarily restore VEC_INIT_EXPR gimplify [PR103936] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/master X-Git-Oldrev: 041cfa0ce44d4c207903d41e6eabccdab2dfa90b X-Git-Newrev: 765693be1c8dc91fe612e7a499c5e41ba398ab96 Message-Id: <20220107052301.DD8F33857C48@sourceware.org> Date: Fri, 7 Jan 2022 05:23:01 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Jan 2022 05:23:02 -0000 https://gcc.gnu.org/g:765693be1c8dc91fe612e7a499c5e41ba398ab96 commit r12-6339-g765693be1c8dc91fe612e7a499c5e41ba398ab96 Author: Jason Merrill Date: Thu Jan 6 21:58:01 2022 -0500 c++: temporarily restore VEC_INIT_EXPR gimplify [PR103936] PR103936 demonstrates that some VEC_INIT_EXPR can still survive into GENERIC; until that's fixed let's put back the handling in cp_gimplify_expr. PR c++/103936 PR c++/65591 gcc/cp/ChangeLog: * cp-gimplify.c (cp_gimplify_expr): Restore VEC_INIT_EXPR handling. gcc/testsuite/ChangeLog: * g++.dg/init/aggr15.C: New test. Diff: --- gcc/cp/cp-gimplify.c | 13 +++++++++++++ gcc/testsuite/g++.dg/init/aggr15.C | 11 +++++++++++ 2 files changed, 24 insertions(+) diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index 114fa78b353..8b097c46158 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -469,6 +469,19 @@ cp_gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p) ret = GS_OK; break; + case VEC_INIT_EXPR: + { + *expr_p = expand_vec_init_expr (NULL_TREE, *expr_p, + tf_warning_or_error); + + hash_set pset; + cp_walk_tree (expr_p, cp_fold_r, &pset, NULL); + cp_genericize_tree (expr_p, false); + copy_if_shared (expr_p); + ret = GS_OK; + } + break; + case THROW_EXPR: /* FIXME communicate throw type to back end, probably by moving THROW_EXPR into ../tree.def. */ diff --git a/gcc/testsuite/g++.dg/init/aggr15.C b/gcc/testsuite/g++.dg/init/aggr15.C new file mode 100644 index 00000000000..a19a0f8e47b --- /dev/null +++ b/gcc/testsuite/g++.dg/init/aggr15.C @@ -0,0 +1,11 @@ +// PR c++/65591 + +struct ss { + ss() {}; +}; +struct C { + ss s[1000]; +}; +int main() { + C cs[5] = {}; +}