diff options
| author | Volker Reichelt <reichelt@igpm.rwth-aachen.de> | 2005-08-06 22:22:47 +0000 |
|---|---|---|
| committer | Volker Reichelt <reichelt@gcc.gnu.org> | 2005-08-06 22:22:47 +0000 |
| commit | bf2f7328ffb6e4eb20b5f20fc4eeaf8fd662439d (patch) | |
| tree | 5a89edb89427f9b947454cad4860c2c4548d35cd | |
| parent | 8402b3e18ae02468e0af883e5059997cdbf7715d (diff) | |
| download | gcc-bf2f7328ffb6e4eb20b5f20fc4eeaf8fd662439d.zip gcc-bf2f7328ffb6e4eb20b5f20fc4eeaf8fd662439d.tar.gz gcc-bf2f7328ffb6e4eb20b5f20fc4eeaf8fd662439d.tar.bz2 | |
re PR c++/19498 (ICE on invalid reference in template parameter)
PR c++/19498
* pt.c (tsubst_decl) <case TEMPLATE_DECL>: Return ERROR_MARK_NODE
if substitution of template args did not succeed.
* g++.dg/template/instantiate7.C: New test.
From-SVN: r102818
| -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/instantiate7.C | 10 |
4 files changed, 23 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f935d4e..5593ef6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +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. + 2005-08-06 Michael Matz <matz@suse.de> * method.c (use_thunk): Call init_insn_lengths. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index cc3c03e..bd95372 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6224,6 +6224,8 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain) : DECL_TI_ARGS (DECL_TEMPLATE_RESULT (t)); full_args = tsubst_template_args (tmpl_args, args, complain, in_decl); + if (full_args == error_mark_node) + return error_mark_node; /* tsubst_template_args doesn't copy the vector if nothing changed. But, *something* should have diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6e27aec..690dbf4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-08-06 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + + PR c++/19498 + * g++.dg/template/instantiate7.C: New test. + 2005-08-06 Joseph S. Myers <joseph@codesourcery.com> PR c/23113 diff --git a/gcc/testsuite/g++.dg/template/instantiate7.C b/gcc/testsuite/g++.dg/template/instantiate7.C new file mode 100644 index 0000000..14a1a33 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/instantiate7.C @@ -0,0 +1,10 @@ +// PR c++/19498 +// Origin: Volker Reichelt <reichelt@igpm.rwth-aachen.de> +// { dg-do compile } + +template<typename T> struct A +{ + template<T&> struct B; // { dg-error "reference to void" } +}; + +A<void> a; // { dg-error "instantiated" } |