diff options
| author | Jason Merrill <jason@redhat.com> | 2020-12-02 17:11:33 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2020-12-04 14:45:25 -0500 |
| commit | df933e307b1950ce12472660dcac1765b8eb431d (patch) | |
| tree | 6eeefb7f2051c8c3525431d0e35f8b5668922172 /gcc/cp | |
| parent | b96802994acb47d5a86d9112d7b1eeda9418827f (diff) | |
| download | gcc-df933e307b1950ce12472660dcac1765b8eb431d.zip gcc-df933e307b1950ce12472660dcac1765b8eb431d.tar.gz gcc-df933e307b1950ce12472660dcac1765b8eb431d.tar.bz2 | |
vec: Simplify use with C++11 range-based 'for'.
It looks cleaner if we can use a vec* directly as a range for the C++11
range-based 'for' loop, without needing to indirect from it, and also works
with null pointers.
The change in cp_parser_late_parsing_default_args is an example of how this
can be used to simplify a simple loop over a vector. Reverse or subset
iteration will require adding range adaptors.
I deliberately didn't format the new overloads for etags since they are
trivial.
gcc/ChangeLog:
* vec.h (begin, end): Add overloads for vec*.
* tree.c (build_constructor_from_vec): Remove *.
gcc/cp/ChangeLog:
* decl2.c (clear_consteval_vfns): Remove *.
* pt.c (do_auto_deduction): Remove *.
* parser.c (cp_parser_late_parsing_default_args): Change loop
to use range 'for'.
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/decl2.c | 2 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 1bc7b7e..46069cb 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -1928,7 +1928,7 @@ static void clear_consteval_vfns (vec<tree> &consteval_vtables) { for (tree vtable : consteval_vtables) - for (constructor_elt &elt : *CONSTRUCTOR_ELTS (DECL_INITIAL (vtable))) + for (constructor_elt &elt : CONSTRUCTOR_ELTS (DECL_INITIAL (vtable))) { tree fn = cp_get_fndecl_from_callee (elt.value, /*fold*/false); if (fn && DECL_IMMEDIATE_FUNCTION_P (fn)) diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 103567c..cc3da15 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -30611,9 +30611,6 @@ cp_parser_late_parsing_default_args (cp_parser *parser, tree fn) { tree default_arg = TREE_PURPOSE (parm); tree parsed_arg; - vec<tree, va_gc> *insts; - tree copy; - unsigned ix; tree parmdecl = parms[i]; pushdecl (parmdecl); @@ -30633,8 +30630,7 @@ cp_parser_late_parsing_default_args (cp_parser *parser, tree fn) TREE_PURPOSE (parm) = parsed_arg; /* Update any instantiations we've already created. */ - for (insts = DEFPARSE_INSTANTIATIONS (default_arg), ix = 0; - vec_safe_iterate (insts, ix, ©); ix++) + for (tree copy : DEFPARSE_INSTANTIATIONS (default_arg)) TREE_PURPOSE (copy) = parsed_arg; } diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 9e8113d..e991a32 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -29280,7 +29280,7 @@ do_auto_deduction (tree type, tree init, tree auto_node, /* We don't recurse here because we can't deduce from a nested initializer_list. */ if (CONSTRUCTOR_ELTS (init)) - for (constructor_elt &elt : *CONSTRUCTOR_ELTS (init)) + for (constructor_elt &elt : CONSTRUCTOR_ELTS (init)) elt.value = resolve_nondeduced_context (elt.value, complain); } else |