diff options
| author | Jason Merrill <jason@redhat.com> | 2014-02-21 16:43:29 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-02-21 16:43:29 -0500 |
| commit | 71b735a54005a9b4bd41df990673a6310c332d58 (patch) | |
| tree | ed86b4cc1ed95fd673db40fa49e928964cd5124e /gcc | |
| parent | 2671a8ef23b605b623897d1f3e73a5493ed847e2 (diff) | |
| download | gcc-71b735a54005a9b4bd41df990673a6310c332d58.zip gcc-71b735a54005a9b4bd41df990673a6310c332d58.tar.gz gcc-71b735a54005a9b4bd41df990673a6310c332d58.tar.bz2 | |
re PR c++/59347 (ICE on invalid: tree check: expected class 'type', have 'exceptional' (error_mark) in tsubst_decl, at cp/pt.c:10798)
PR c++/59347
* pt.c (tsubst_decl) [TYPE_DECL]: Don't try to instantiate an
erroneous typedef.
From-SVN: r208025
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/typedef41.C | 8 |
3 files changed, 15 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 01a2569..1fcf54d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2014-02-21 Jason Merrill <jason@redhat.com> + PR c++/59347 + * pt.c (tsubst_decl) [TYPE_DECL]: Don't try to instantiate an + erroneous typedef. + PR c++/60241 * pt.c (lookup_template_class_1): Update DECL_TEMPLATE_INSTANTIATIONS of the partial instantiation, not the most general template. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 91a8840..2dc5f32 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -10824,6 +10824,9 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain) tree type = NULL_TREE; bool local_p; + if (TREE_TYPE (t) == error_mark_node) + RETURN (error_mark_node); + if (TREE_CODE (t) == TYPE_DECL && t == TYPE_MAIN_DECL (TREE_TYPE (t))) { diff --git a/gcc/testsuite/g++.dg/template/typedef41.C b/gcc/testsuite/g++.dg/template/typedef41.C new file mode 100644 index 0000000..dc25518 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/typedef41.C @@ -0,0 +1,8 @@ +// PR c++/59347 + +template<int> struct A +{ + typedef int ::X; // { dg-error "" } +}; + +A<0> a; |