git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pt.c (convert_template_argument, tsubst): Simplify fourth argument to make_typename_type (complain & tf_error -> complain). 

2012-07-24  Paolo Carlini  <paolo.carlini@oracle.com>

	* pt.c (convert_template_argument, tsubst): Simplify fourth argument
	to make_typename_type (complain & tf_error -> complain).

From-SVN: r189825
This commit is contained in:
Paolo Carlini 2012-07-24 21:53:31 +00:00
parent cd1440b199
commit d8dd6fae2b
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gcc/cp/ChangeLog
View File

@ -1,15 +1,20 @@
2012-07-24 Paolo Carlini <paolo.carlini@oracle.com>
* pt.c (convert_template_argument, tsubst): Simplify fourth argument
to make_typename_type (complain & tf_error -> complain).
2012-07-24 Steven Bosscher <steven@gcc.gnu.org> 2012-07-24 Steven Bosscher <steven@gcc.gnu.org>
* cp/class.c (n_vtables, n_vtable_entries, n_vtable_searches, * class.c (n_vtables, n_vtable_entries, n_vtable_searches,
n_vtable_elems, n_convert_harshness, n_compute_conversion_costs, n_vtable_elems, n_convert_harshness, n_compute_conversion_costs,
n_inner_fields_searched): Always define. n_inner_fields_searched): Always define.
(build_primary_vtable): Convert #ifdef GATHER_STATISTICS to if-code. (build_primary_vtable): Convert #ifdef GATHER_STATISTICS to if-code.
(print_class_statistics): Convert #ifdef GATHER_STATISTICS to if-code. (print_class_statistics): Convert #ifdef GATHER_STATISTICS to if-code.
* cp/tree.c (depth_reached): Always define global. * tree.c (depth_reached): Always define global.
(cxx_print_statistics): Convert #ifdef GATHER_STATISTICS to if-code. (cxx_print_statistics): Convert #ifdef GATHER_STATISTICS to if-code.
* cp/pt.c (depth_reached): Always define. * pt.c (depth_reached): Always define.
(push_tinst_level): Convert #ifdef GATHER_STATISTICS to if-code. (push_tinst_level): Convert #ifdef GATHER_STATISTICS to if-code.
* cp/search.c (n_fields_searched, n_calls_lookup_field, * search.c (n_fields_searched, n_calls_lookup_field,
n_calls_lookup_field_1, n_calls_lookup_fnfields, n_calls_lookup_field_1, n_calls_lookup_fnfields,
n_calls_lookup_fnfields_1, n_calls_get_base_type, n_calls_lookup_fnfields_1, n_calls_get_base_type,
n_outer_fields_searched, n_contexts_saved): Always define. n_outer_fields_searched, n_contexts_saved): Always define.
@ -18,7 +23,7 @@
(lookup_fnfields_idx_nolazy): Likewise. (lookup_fnfields_idx_nolazy): Likewise.
(print_search_statistics): Likewise. (print_search_statistics): Likewise.
(reinit_search_statistics): Unconditionally re-set counters. (reinit_search_statistics): Unconditionally re-set counters.
* cp/lex.c (retrofit_lang_decl): Convert #ifdef GATHER_STATISTICS * lex.c (retrofit_lang_decl): Convert #ifdef GATHER_STATISTICS
to if-code. to if-code.
(cxx_dup_lang_specific_decl): Likewise. (cxx_dup_lang_specific_decl): Likewise.
(copy_lang_type): Likewise. (copy_lang_type): Likewise.

4
gcc/cp/pt.c
View File

@ -6139,7 +6139,7 @@ convert_template_argument (tree parm,
orig_arg = make_typename_type (TREE_OPERAND (arg, 0), orig_arg = make_typename_type (TREE_OPERAND (arg, 0),
TREE_OPERAND (arg, 1), TREE_OPERAND (arg, 1),
typename_type, typename_type,
complain & tf_error); complain);
arg = orig_arg; arg = orig_arg;
is_type = 1; is_type = 1;
} }
@ -11402,7 +11402,7 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl)
} }
f = make_typename_type (ctx, f, typename_type, f = make_typename_type (ctx, f, typename_type,
(complain & tf_error) | tf_keep_type_decl); complain | tf_keep_type_decl);
if (f == error_mark_node) if (f == error_mark_node)
return f; return f;
if (TREE_CODE (f) == TYPE_DECL) if (TREE_CODE (f) == TYPE_DECL)