re PR c++/53209 (tree check ICE: expected tree_vec, have error_mark in…

re PR c++/53209 (tree check ICE: expected tree_vec, have error_mark in comp_template_args_with_info, at cp/pt.c:7038)

PR c++/53209
* pt.c (tsubst_decl): Bail out if argvec is error_mark_node.

From-SVN: r187404

gcc/cp/ChangeLog

+2012-05-11  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR c++/53209
+	* pt.c (tsubst_decl): Bail out if argvec is error_mark_node.
+
 2012-05-11  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/53305

gcc/cp/pt.c

@@ -10631,6 +10631,8 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain)
 		tmpl = DECL_TI_TEMPLATE (t);
 		gen_tmpl = most_general_template (tmpl);
 		argvec = tsubst (DECL_TI_ARGS (t), args, complain, in_decl);
+		if (argvec == error_mark_node)
+		  RETURN (error_mark_node);
 		hash = hash_tmpl_and_args (gen_tmpl, argvec);
 		spec = retrieve_specialization (gen_tmpl, argvec, hash);
 	      }