]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
re PR c++/68726 (ice: tree check: expected tree_vec, have error_mark in comp_template...
authorPaolo Carlini <paolo@gcc.gnu.org>
Thu, 11 Feb 2016 11:45:10 +0000 (11:45 +0000)
committerPaolo Carlini <paolo@gcc.gnu.org>
Thu, 11 Feb 2016 11:45:10 +0000 (11:45 +0000)
/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.

From-SVN: r233340

gcc/cp/pt.c

index a215aa78b4c1ade430fe634880106d34f4ca9ada..678017223e078092cb3e80ea704e364888bbcb03 100644 (file)
@@ -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. */