From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 24 Jul 2012 21:53:31 +0000 (+0000)
Subject: 2012-07-24  Paolo Carlini  <paolo.carlini@oracle.com>
X-Git-Tag: upstream/4.9.2~11469
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac990d9ac3ee3c291d3db797fd2cf42943d24744;p=platform%2Fupstream%2Flinaro-gcc.git

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).


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@189825 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 90064b2..5dd4031 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -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>
 
-	* 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_inner_fields_searched): Always define.
 	(build_primary_vtable): 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.
-	* cp/pt.c (depth_reached): Always define.
+	* pt.c (depth_reached): Always define.
 	(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_fnfields_1, n_calls_get_base_type,
 	n_outer_fields_searched, n_contexts_saved): Always define.
@@ -18,7 +23,7 @@
 	(lookup_fnfields_idx_nolazy): Likewise.
 	(print_search_statistics): Likewise.
 	(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.
 	(cxx_dup_lang_specific_decl): Likewise.
 	(copy_lang_type): Likewise.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 1e70213..532189d 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6139,7 +6139,7 @@ convert_template_argument (tree parm,
       orig_arg = make_typename_type (TREE_OPERAND (arg, 0),
 				     TREE_OPERAND (arg, 1),
 				     typename_type,
-				     complain & tf_error);
+				     complain);
       arg = orig_arg;
       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,
-				(complain & tf_error) | tf_keep_type_decl);
+				complain | tf_keep_type_decl);
 	if (f == error_mark_node)
 	  return f;
 	if (TREE_CODE (f) == TYPE_DECL)