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

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
This commit is contained in:
Paolo Carlini 2016-06-08 18:29:42 +00:00 committed by Paolo Carlini
parent 2ef16b6eb2
commit f07063cc7a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
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> 2016-06-08 Jakub Jelinek <jakub@redhat.com>
PR c++/71442 PR c++/71442

6
gcc/cp/pt.c
View File

@ -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, tree ctx = tsubst_aggr_type (TYPE_CONTEXT (t), args, complain,
in_decl, /*entering_scope=*/1); in_decl, /*entering_scope=*/1);
if (ctx == error_mark_node)
return error_mark_node;
tree f = tsubst_copy (TYPENAME_TYPE_FULLNAME (t), args, tree f = tsubst_copy (TYPENAME_TYPE_FULLNAME (t), args,
complain, in_decl); complain, in_decl);
if (f == error_mark_node)
if (ctx == error_mark_node || f == error_mark_node)
return error_mark_node; return error_mark_node;
if (!MAYBE_CLASS_TYPE_P (ctx)) if (!MAYBE_CLASS_TYPE_P (ctx))