aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2022-01-06 21:58:01 -0500
committerJason Merrill <jason@redhat.com>2022-01-07 00:22:56 -0500
commit765693be1c8dc91fe612e7a499c5e41ba398ab96 (patch)
tree8f882bd005db96da7bcc5fa454ecb5269c78dff3 /gcc
parent041cfa0ce44d4c207903d41e6eabccdab2dfa90b (diff)
downloadgcc-765693be1c8dc91fe612e7a499c5e41ba398ab96.zip
gcc-765693be1c8dc91fe612e7a499c5e41ba398ab96.tar.gz
gcc-765693be1c8dc91fe612e7a499c5e41ba398ab96.tar.bz2
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.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/cp-gimplify.c13
-rw-r--r--gcc/testsuite/g++.dg/init/aggr15.C11
2 files changed, 24 insertions, 0 deletions
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index 114fa78..8b097c4 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<tree> 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 0000000..a19a0f8
--- /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] = {};
+}