diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/crash117.C | 6 |
4 files changed, 19 insertions, 10 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fc2ec31..3e68712 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2013-10-08 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/58665 + Revert: + 2013-10-04 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/58448 + * pt.c (tsubst): Use error_operand_p on parameter t. + 2013-10-06 Paolo Carlini <paolo.carlini@oracle.com> PR c++/58126 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2828cc9..a350007 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 + if (t == NULL_TREE || t == error_mark_node || t == integer_type_node || t == void_type_node || t == char_type_node @@ -11281,9 +11281,6 @@ 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 68aac9c..a45b913 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2013-10-08 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/58665 + Revert: + 2013-10-04 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/58448 + * g++.dg/template/crash117.C: New. + 2013-10-08 Andreas Krebbel <Andreas.Krebbel@de.ibm.com> * gcc.target/s390/htm-nofloat-2.c: Add -mzarch to asm options. diff --git a/gcc/testsuite/g++.dg/template/crash117.C b/gcc/testsuite/g++.dg/template/crash117.C deleted file mode 100644 index 813140e..0000000 --- a/gcc/testsuite/g++.dg/template/crash117.C +++ /dev/null @@ -1,6 +0,0 @@ -// 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" } |