diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2003-08-21 05:50:53 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2003-08-21 05:50:53 +0000 |
| commit | 35c18a2035bc75f7b5dc68f5385986426b5308eb (patch) | |
| tree | 26ff80d4db49e40d7a6cd3b4aecb0273a39a8fe5 | |
| parent | c4c83fff17000706cad3d2620f1e197fc4840bc3 (diff) | |
| download | gcc-35c18a2035bc75f7b5dc68f5385986426b5308eb.zip gcc-35c18a2035bc75f7b5dc68f5385986426b5308eb.tar.gz gcc-35c18a2035bc75f7b5dc68f5385986426b5308eb.tar.bz2 | |
re PR c++/11834 (template specialization not matched)
PR c++/11834
* pt.c (more_specialized): Bump processing_template_decl.
PR c++/11834
* g++.dg/template/deduce2.C: New test.
From-SVN: r70639
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/deduce2.C | 30 |
4 files changed, 45 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fc6ae49..8ef1aeb 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2003-08-20 Mark Mitchell <mark@codesourcery.com> + + PR c++/11834 + * pt.c (more_specialized): Bump processing_template_decl. + 2003-08-21 Jason Merrill <jason@redhat.com> PR c++/11614 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 20642c3..c66b5bc 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -9880,6 +9880,10 @@ more_specialized (tree pat1, tree pat2, int deduce, int len) tree targs; int winner = 0; + /* If template argument deduction succeeds, we substitute the + resulting arguments into non-deduced contexts. While doing that, + we must be aware that we may encounter dependent types. */ + ++processing_template_decl; targs = get_bindings_real (pat1, DECL_TEMPLATE_RESULT (pat2), NULL_TREE, 0, deduce, len); if (targs) @@ -9889,6 +9893,7 @@ more_specialized (tree pat1, tree pat2, int deduce, int len) NULL_TREE, 0, deduce, len); if (targs) ++winner; + --processing_template_decl; return winner; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7e11352..5670652 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2003-08-20 Mark Mitchell <mark@codesourcery.com> + + PR c++/11834 + * g++.dg/template/deduce2.C: New test. + 2003-08-21 Josef Zlomek <zlomekj@suse.cz> * gcc.c-torture/execute/20030821-1.c: New test. diff --git a/gcc/testsuite/g++.dg/template/deduce2.C b/gcc/testsuite/g++.dg/template/deduce2.C new file mode 100644 index 0000000..bcf77b3 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/deduce2.C @@ -0,0 +1,30 @@ +template <typename T0> struct tuple { + typedef tuple<int> tail; +}; + +template <> struct tuple<int> { +}; + +template <typename L> +struct length { + static const int i = length<typename tuple<L>::tail>::i; +}; + +template<> +struct length<tuple<int> > { + static const int i = 1; +}; + +template <int> struct M {}; + +template <typename A> +M<length<tuple<A> >::i > foo (A*); + +template <typename A> +M<length<tuple<A> >::i> foo (const A*); + +const int i1 = 3; + +void bar() { + foo (&i1); +} |