pt.c (tsubst, [...]): Don't delay checking the return value of tsubst_aggr_type…

pt.c (tsubst, [...]): Don't delay checking the return value of	tsubst_aggr_type for error_mark_node.

2016-06-08  Paolo Carlini  <paolo.carlini@oracle.com>

	* pt.c (tsubst, case TYPENAME_TYPE): Don't delay checking the
	return value of	tsubst_aggr_type for error_mark_node.

From-SVN: r237236

gcc/cp/ChangeLog

+2016-06-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* pt.c (tsubst, case TYPENAME_TYPE): Don't delay checking the
+	return value of	tsubst_aggr_type for error_mark_node.
+
 2016-06-08  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/71442

gcc/cp/pt.c

@@ -13430,10 +13430,12 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl)
       {
 	tree ctx = tsubst_aggr_type (TYPE_CONTEXT (t), args, complain,
 				     in_decl, /*entering_scope=*/1);
+	if (ctx == error_mark_node)
+	  return error_mark_node;
+
 	tree f = tsubst_copy (TYPENAME_TYPE_FULLNAME (t), args,
 			      complain, in_decl);
-
-	if (ctx == error_mark_node || f == error_mark_node)
+	if (f == error_mark_node)
 	  return error_mark_node;
 
 	if (!MAYBE_CLASS_TYPE_P (ctx))