From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 11 Feb 2016 11:45:10 +0000 (+0000)
Subject: /cp
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87a6c823d0b1ecafd820c099d778d539f977d7ef;p=thirdparty%2Fgcc.git

/cp
2016-02-11  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/68726
	* pt.c (lookup_template_class_1): Check tsubst return value for
	error_mark_node.

/testsuite
2016-02-11  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/68726
	* g++.dg/cpp0x/pr68726.C: New.


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

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index a215aa78b4c1..678017223e07 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -8547,6 +8547,8 @@ lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context,
 		    arglist, complain, NULL_TREE);
 	  --processing_template_decl;
 	  TREE_VEC_LENGTH (arglist)++;
+	  if (partial_inst_args == error_mark_node)
+	    return error_mark_node;
 	  use_partial_inst_tmpl =
 	    /*...and we must not be looking at the partial instantiation
 	     itself. */