diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/eh2.C | 10 |
4 files changed, 23 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5593ef6..6220be6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2005-08-06 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + PR c++/23191 + * pt.c (tsubst) <case METHOD_TYPE>: Check for error_mark_node + before calling build_exception_variant. + +2005-08-06 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + PR c++/19498 * pt.c (tsubst_decl) <case TEMPLATE_DECL>: Return ERROR_MARK_NODE if substitution of template args did not succeed. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index bd95372..cabda6c 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -7336,6 +7336,8 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl) /* Substitute the exception specification. */ specs = tsubst_exception_specification (t, args, complain, in_decl); + if (specs == error_mark_node) + return error_mark_node; if (specs) fntype = build_exception_variant (fntype, specs); return fntype; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 690dbf4..5ed686f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2005-08-06 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + PR c++/23191 + * g++.dg/template/eh2.C: New test. + +2005-08-06 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + PR c++/19498 * g++.dg/template/instantiate7.C: New test. diff --git a/gcc/testsuite/g++.dg/template/eh2.C b/gcc/testsuite/g++.dg/template/eh2.C new file mode 100644 index 0000000..8ec767d --- /dev/null +++ b/gcc/testsuite/g++.dg/template/eh2.C @@ -0,0 +1,10 @@ +// PR c++/23191 +// Origin: Volker Reichelt <reichelt@igpm.rwth-aachen.de> +// { dg-do compile } + +template<typename T> struct A +{ + void foo() throw(typename T::X); // { dg-error "not a class" } +}; + +A<void> a; // { dg-error "instantiated" } |