diff options
| -rw-r--r-- | gcc/cp/decl2.c | 2 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/tree.c | 2 | ||||
| -rw-r--r-- | gcc/vec.h | 10 |
5 files changed, 14 insertions, 8 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 @@ -2185,7 +2185,7 @@ build_constructor_from_vec (tree type, const vec<tree, va_gc> *vals) { vec<constructor_elt, va_gc> *v = NULL; - for (tree t : *vals) + for (tree t : vals) CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, t); return build_constructor (type, v); @@ -419,6 +419,16 @@ struct GTY((user)) vec { }; +/* Allow C++11 range-based 'for' to work directly on vec<T>*. */ +template<typename T, typename A, typename L> +T* begin (vec<T,A,L> *v) { return v ? v->begin () : nullptr; } +template<typename T, typename A, typename L> +T* end (vec<T,A,L> *v) { return v ? v->end () : nullptr; } +template<typename T, typename A, typename L> +const T* begin (const vec<T,A,L> *v) { return v ? v->begin () : nullptr; } +template<typename T, typename A, typename L> +const T* end (const vec<T,A,L> *v) { return v ? v->end () : nullptr; } + /* Generic vec<> debug helpers. These need to be instantiated for each vec<TYPE> used throughout |