public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-419] c++: Fix up VEC_INIT_EXPR gimplification after r12-7069
@ 2023-05-03 8:39 Jakub Jelinek
0 siblings, 0 replies; only message in thread
From: Jakub Jelinek @ 2023-05-03 8:39 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:8d193b12d6f07ae0196db8296a49c881c1638c01
commit r14-419-g8d193b12d6f07ae0196db8296a49c881c1638c01
Author: Jakub Jelinek <jakub@redhat.com>
Date: Wed May 3 10:38:04 2023 +0200
c++: Fix up VEC_INIT_EXPR gimplification after r12-7069
During patch backporting, I've noticed that while most cp_walk_tree calls
with cp_fold_r callback callers were changed from &pset to cp_fold_data
&data, the VEC_INIT_EXPR gimplifications has not, so it still passes just
address of a hash_set<tree> and so if during the folding we ever touch
data->flags, we use uninitialized data there.
The following patch changes it to do the same thing as cp_fold_function
because the VEC_INIT_EXPR gimplifications will happen on function bodies
only.
2023-05-03 Jakub Jelinek <jakub@redhat.com>
* cp-gimplify.cc (cp_fold_data): Move definition earlier.
(cp_gimplify_expr): Pass address of ff_genericize | ff_mce_false
constructed data rather than &pset to cp_walk_tree with cp_fold_r.
Diff:
---
gcc/cp/cp-gimplify.cc | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/gcc/cp/cp-gimplify.cc b/gcc/cp/cp-gimplify.cc
index 4fecd5616bd..1216ef17b08 100644
--- a/gcc/cp/cp-gimplify.cc
+++ b/gcc/cp/cp-gimplify.cc
@@ -57,6 +57,13 @@ enum fold_flags {
using fold_flags_t = int;
+struct cp_fold_data
+{
+ hash_set<tree> pset;
+ fold_flags_t flags;
+ cp_fold_data (fold_flags_t flags): flags (flags) {}
+};
+
/* Forward declarations. */
static tree cp_genericize_r (tree *, int *, void *);
@@ -505,8 +512,8 @@ cp_gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p)
*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_fold_data data (ff_genericize | ff_mce_false);
+ cp_walk_tree (expr_p, cp_fold_r, &data, NULL);
cp_genericize_tree (expr_p, false);
copy_if_shared (expr_p);
ret = GS_OK;
@@ -1029,13 +1036,6 @@ struct cp_genericize_data
in fold-const, we need to perform this before transformation to
GIMPLE-form. */
-struct cp_fold_data
-{
- hash_set<tree> pset;
- fold_flags_t flags;
- cp_fold_data (fold_flags_t flags): flags (flags) {}
-};
-
static tree
cp_fold_r (tree *stmt_p, int *walk_subtrees, void *data_)
{
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-05-03 8:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-03 8:39 [gcc r14-419] c++: Fix up VEC_INIT_EXPR gimplification after r12-7069 Jakub Jelinek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).