diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 84431385e5ca9468cc13a9bfc073456d3b23db06..0d6295327c359212b5da81c5df23f813eb403c1b 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 cf0e7cd4f9a01ebfd0806c7959862e54d16904c4..7bbc2cc972fd9d5758afa2146553c71939dc8573 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 1dbb9239be740260a93e747a30e42256ad49ece1..dd39f3512cdca1639c6d8c00f02ee60dbf40a8da 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 0000000000000000000000000000000000000000..0b197cf555e92326239f68e2a10b3b57904aed13 --- /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" }