diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/dependent-args1.C | 11 |
4 files changed, 20 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8443138..0d62953 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2006-05-15 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + PR c++/27582 + * pt.c (any_dependent_template_arguments_p): Return early on invalid + argument list. + PR c++/27581 * search.c (adjust_result_of_qualified_name_lookup): Skip on invalid context_class. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index cf0e7cd..7bbc2cc 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -12760,6 +12760,8 @@ any_dependent_template_arguments_p (tree args) if (!args) return false; + if (args == error_mark_node) + return true; for (i = 0; i < TMPL_ARGS_DEPTH (args); ++i) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1dbb923..dd39f35 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2006-05-15 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + PR c++/27582 + * g++.dg/template/dependent-args1.C: New test. + PR c++/27581 * g++.dg/lookup/this1.C: New test. diff --git a/gcc/testsuite/g++.dg/template/dependent-args1.C b/gcc/testsuite/g++.dg/template/dependent-args1.C new file mode 100644 index 0000000..0b197cf --- /dev/null +++ b/gcc/testsuite/g++.dg/template/dependent-args1.C @@ -0,0 +1,11 @@ +// PR c++/27582 +// { dg-do compile } + +struct A +{ + template<int> void foo(); +}; + +template<int N, void (A::*)() = &A::foo<N> > struct B {}; + +B<int> b; // { dg-error "type/value mismatch|expected a constant|invalid type" } |