aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2022-12-12 17:25:58 -0500
committerJason Merrill <jason@redhat.com>2022-12-15 16:48:00 -0500
commit57ab3714b6c436032ca440f9432c5837928de969 (patch)
tree93305ec32ffa743eeb8b0b117d07e02e07c55c35 /gcc/cp
parent52e7ff23ff5967fef52ebe31b6750a56f7103080 (diff)
downloadgcc-57ab3714b6c436032ca440f9432c5837928de969.zip
gcc-57ab3714b6c436032ca440f9432c5837928de969.tar.gz
gcc-57ab3714b6c436032ca440f9432c5837928de969.tar.bz2
c++: rename parameter
gcc/cp/ChangeLog: * init.cc (build_vec_init): Rename "flags" to "cleanup_flags" to distinguish from LOOKUP_*.
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/init.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/gcc/cp/init.cc b/gcc/cp/init.cc
index 428fac5..73e6547 100644
--- a/gcc/cp/init.cc
+++ b/gcc/cp/init.cc
@@ -4379,7 +4379,7 @@ build_vec_init (tree base, tree maxindex, tree init,
bool explicit_value_init_p,
int from_array,
tsubst_flags_t complain,
- vec<tree, va_gc>** flags /* = nullptr */)
+ vec<tree, va_gc>** cleanup_flags /* = nullptr */)
{
tree rval;
tree base2 = NULL_TREE;
@@ -4590,8 +4590,8 @@ build_vec_init (tree base, tree maxindex, tree init,
anything for arrays. But if the array is a subobject, we need to
tell split_nonconstant_init how to turn off this cleanup in favor of
the cleanup for the complete object. */
- if (flags)
- vec_safe_push (*flags, build_tree_list (iterator, maxindex));
+ if (cleanup_flags)
+ vec_safe_push (*cleanup_flags, build_tree_list (iterator, maxindex));
}
/* Should we try to create a constant initializer? */
@@ -4650,7 +4650,8 @@ build_vec_init (tree base, tree maxindex, tree init,
if (digested)
one_init = cp_build_init_expr (baseref, elt);
else if (tree vi = get_vec_init_expr (elt))
- one_init = expand_vec_init_expr (baseref, vi, complain, flags);
+ one_init = expand_vec_init_expr (baseref, vi, complain,
+ cleanup_flags);
else if (MAYBE_CLASS_TYPE_P (type) || TREE_CODE (type) == ARRAY_TYPE)
one_init = build_aggr_init (baseref, elt, 0, complain);
else