diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-10-08 21:54:06 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-10-08 21:54:06 +0000 |
| commit | 99f84f0787379dc086f51bdebc51fac425fb7171 (patch) | |
| tree | bed1ab9d3bf48a15d4f78b87db22c3a814b3bd12 /gcc/cp/pt.c | |
| parent | 3b06dfd934bb67097b0fd88d98355b568dbf869f (diff) | |
| download | gcc-99f84f0787379dc086f51bdebc51fac425fb7171.tar.gz | |
/cp
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.
/testsuite
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@203288 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2828cc983b3..a35000728aa 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); |