/cp

2008-02-14  Paolo Carlini  <pcarlini@suse.de>

        PR c++/28743
        * pt.c (determine_specialization): In case of function templates,
	when the type of DECL does not match FN there is no match.

/testsuite
2008-02-14  Paolo Carlini  <pcarlini@suse.de>

        PR c++/28743
	* g++.dg/template/nontype17.C: New.
        * g++.dg/template/nontype16.C: Add error.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@132316 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c237abd..275ca4b 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-14  Paolo Carlini  <pcarlini@suse.de>
+
+        PR c++/28743
+        * pt.c (determine_specialization): In case of function templates,
+       when the type of DECL does not match FN there is no match.
+
 2008-02-13  Jakub Jelinek  <jakub@redhat.com>
            Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
 

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 577b621..2e2a636 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -1561,12 +1561,9 @@ determine_specialization (tree template_id,
             no partial specializations of functions.  Therefore, if
             the type of DECL does not match FN, there is no
             match.  */
-         if (tsk == tsk_template)
-           {
-             if (compparms (fn_arg_types, decl_arg_types))
-               candidates = tree_cons (NULL_TREE, fn, candidates);
-             continue;
-           }
+         if (tsk == tsk_template
+             && !compparms (fn_arg_types, decl_arg_types))
+           continue;
 
          /* See whether this function might be a specialization of this
             template.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0eac359..7a4d5bb 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-14  Paolo Carlini  <pcarlini@suse.de>
+
+        PR c++/28743
+       * g++.dg/template/nontype17.C: New.
+        * g++.dg/template/nontype16.C: Add error.
+
 2008-02-13  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/35138

diff --git a/gcc/testsuite/g++.dg/template/nontype16.C b/gcc/testsuite/g++.dg/template/nontype16.C
index 36d1e95..4b9f760 100644 (file)
--- a/gcc/testsuite/g++.dg/template/nontype16.C
+++ b/gcc/testsuite/g++.dg/template/nontype16.C
@@ -5,5 +5,5 @@ template<int> struct A
     template<typename> void foo();
 };
 
-template<> template<struct T> void A<0>::foo() {} // { dg-error "not a valid type" }
+template<> template<struct T> void A<0>::foo() {} // { dg-error "not a valid type|match" }
  

diff --git a/gcc/testsuite/g++.dg/template/nontype17.C b/gcc/testsuite/g++.dg/template/nontype17.C
new file mode 100644 (file)
index 0000000..c8f3404
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/nontype17.C
@@ -0,0 +1,8 @@
+// PR c++/28743
+
+template<int> struct A
+{
+    template<typename> void foo();
+};
+
+template<int> template<typename> void A<0>::foo() {} // { dg-error "match" }