diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2013-10-04 23:13:59 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2013-10-04 23:13:59 +0000 |
| commit | e36fae42ad580a61208c8c9bb82cc0b5964577b4 (patch) | |
| tree | 252ed1bd5ec3edc54add7267dcb314e1006b99e2 /gcc | |
| parent | 45d992343314089c4c66b9013dbe62b24a3e5285 (diff) | |
| download | gcc-e36fae42ad580a61208c8c9bb82cc0b5964577b4.zip gcc-e36fae42ad580a61208c8c9bb82cc0b5964577b4.tar.gz gcc-e36fae42ad580a61208c8c9bb82cc0b5964577b4.tar.bz2 | |
re PR c++/58448 (ICE on invalid: tree_class_check_failed)
/cp
2013-10-04 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58448
* pt.c (tsubst): Use error_operand_p on parameter t.
/testsuite
2013-10-04 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58448
* g++.dg/template/crash117.C: New.
From-SVN: r203218
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/crash117.C | 6 |
4 files changed, 20 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6327c0b..571d4ed 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2013-10-04 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/58448 + * pt.c (tsubst): Use error_operand_p on parameter t. + 2013-10-04 Marc Glisse <marc.glisse@inria.fr> PR c++/19476 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index b330b78..59be037 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -11272,7 +11272,7 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl) enum tree_code code; tree type, r = NULL_TREE; - if (t == NULL_TREE || t == error_mark_node + if (t == NULL_TREE || t == integer_type_node || t == void_type_node || t == char_type_node @@ -11281,6 +11281,9 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl) || TREE_CODE (t) == TRANSLATION_UNIT_DECL) return t; + if (error_operand_p (t)) + return error_mark_node; + if (DECL_P (t)) return tsubst_decl (t, args, complain); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 566c569..dd34bc6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-10-04 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/58448 + * g++.dg/template/crash117.C: New. + 2013-10-04 Marc Glisse <marc.glisse@inria.fr> PR c++/19476 diff --git a/gcc/testsuite/g++.dg/template/crash117.C b/gcc/testsuite/g++.dg/template/crash117.C new file mode 100644 index 0000000..813140e --- /dev/null +++ b/gcc/testsuite/g++.dg/template/crash117.C @@ -0,0 +1,6 @@ +// PR c++/58448 + +class SmallVector; struct Types4; +template <typename, typename, typename, typename> struct Types { + typedef Types4<>::Constructable // { dg-error "template|typedef|expected" } +} Types<SmallVector, SmallVector, SmallVector, SmallVector>:: > // { dg-error "expected" } |