public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-4733] c++: rename parameter
@ 2022-12-15 21:48 Jason Merrill
0 siblings, 0 replies; only message in thread
From: Jason Merrill @ 2022-12-15 21:48 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:57ab3714b6c436032ca440f9432c5837928de969
commit r13-4733-g57ab3714b6c436032ca440f9432c5837928de969
Author: Jason Merrill <jason@redhat.com>
Date: Mon Dec 12 17:25:58 2022 -0500
c++: rename parameter
gcc/cp/ChangeLog:
* init.cc (build_vec_init): Rename "flags" to "cleanup_flags"
to distinguish from LOOKUP_*.
Diff:
---
gcc/cp/init.cc | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/gcc/cp/init.cc b/gcc/cp/init.cc
index 428fac5621c..73e6547c076 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-12-15 21:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-15 21:48 [gcc r13-4733] c++: rename parameter Jason Merrill
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).