diff options
| author | Paolo Carlini <paolo@gcc.gnu.org> | 2016-02-11 11:45:10 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2016-02-11 11:45:10 +0000 |
| commit | 4146b7b8c4fc145f1a2e482878b1c9a371cf8282 (patch) | |
| tree | 9f00665ab044a199c722c40372743262ce47ebac /gcc | |
| parent | 0d7d945855a7d55e165009a71907edcd6a2da77c (diff) | |
| download | gcc-4146b7b8c4fc145f1a2e482878b1c9a371cf8282.zip gcc-4146b7b8c4fc145f1a2e482878b1c9a371cf8282.tar.gz gcc-4146b7b8c4fc145f1a2e482878b1c9a371cf8282.tar.bz2 | |
re PR c++/68726 (ice: tree check: expected tree_vec, have error_mark in comp_template_args_with_info, at cp/pt.c:7890)
/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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/pt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index a215aa7..6780172 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. */ |