From fad86f7a9ee8cc7eb9f6d9ea817649de703d7f16 Mon Sep 17 00:00:00 2001 From: Geoffrey Keating Date: Fri, 17 Jun 2005 22:13:33 +0000 Subject: [PATCH] re PR c++/17413 (local classes as template argument) 2005-06-17 Geoffrey Keating PR c++/17413 * pt.c (type_unification_real): Apply template type deduction even to procedure parameters that are not dependent on a template parameter. Index: testsuite/ChangeLog 2005-06-17 Geoffrey Keating PR c++/17413 * g++.dg/template/local5.C: New. From-SVN: r101141 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/pt.c | 15 +++++---------- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/template/local5.C | 12 ++++++++++++ 4 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 gcc/testsuite/g++.dg/template/local5.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index af04741fc44..3f795aa41f3 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2005-06-17 Geoffrey Keating + + PR c++/17413 + * pt.c (type_unification_real): Apply template type deduction even + to procedure parameters that are not dependent on a template + parameter. + 2005-06-16 Nathan Sidwell * rtti.c (get_tinfo_decl): Avoid caching tinfo_descs when it might diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index f130859d3c5..e8112018723 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -9366,17 +9366,12 @@ type_unification_real (tree tparms, else type = arg; - if (strict == DEDUCE_EXACT) - { - if (same_type_p (parm, type)) - continue; - } - else - /* It might work; we shouldn't check now, because we might - get into infinite recursion. Overload resolution will - handle it. */ + if (same_type_p (parm, type)) continue; - + if (strict != DEDUCE_EXACT + && can_convert_arg (parm, type, TYPE_P (arg) ? NULL_TREE : arg)) + continue; + return 1; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 68b98ff9e34..321c87a7348 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-06-17 Geoffrey Keating + + PR c++/17413 + * g++.dg/template/local5.C: New. + 2005-06-17 Richard Henderson * gcc.dg/sync-2.c (do_qi): Cast negative results to char. diff --git a/gcc/testsuite/g++.dg/template/local5.C b/gcc/testsuite/g++.dg/template/local5.C new file mode 100644 index 00000000000..705dca39eb0 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/local5.C @@ -0,0 +1,12 @@ +struct Attribute { }; + +template bool operator == (const Attribute &attr, const T &value); + +enum { + anon = 123 +}; + +void test(int foo) +{ + if (foo == anon) ; /* { dg-bogus "anonymous type" } */ +} -- 2.30.2