re PR c++/7224 (g++ 3.x does not tecognize unused ambiguous inline member functions)

	PR c++/7224
	* class.c (add_method): Simplify.

	PR c++/7224
	* g++.dg/overload/error1.C: New test.

From-SVN: r55409

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 24b9267a1960752f5da68899d53dcbb9cbfe18a5..38de1a298e586c3023f62659b8aac5e0d461b5ae 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-11  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/7224
+       * class.c (add_method): Simplify.
+
 2002-07-11  Jason Merrill  <jason@redhat.com>
 
        PR c++/7279

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index f2544bd1f521b08448fc75d5918318359442838a..5222665f7bdf1c1d027ba8e1761dc385314f0e57 100644 (file)
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -966,69 +966,57 @@ add_method (type, method, error_p)
           fns = OVL_NEXT (fns))
        {
          tree fn = OVL_CURRENT (fns);
-                
+         tree parms1;
+         tree parms2;
+         bool same = 1;
+
          if (TREE_CODE (fn) != TREE_CODE (method))
            continue;
 
-         if (TREE_CODE (method) != TEMPLATE_DECL)
+         /* [over.load] Member function declarations with the
+            same name and the same parameter types cannot be
+            overloaded if any of them is a static member
+            function declaration.
+
+            [namespace.udecl] When a using-declaration brings names
+            from a base class into a derived class scope, member
+            functions in the derived class override and/or hide member
+            functions with the same name and parameter types in a base
+            class (rather than conflicting).  */
+         parms1 = TYPE_ARG_TYPES (TREE_TYPE (fn));
+         parms2 = TYPE_ARG_TYPES (TREE_TYPE (method));
+
+         /* Compare the quals on the 'this' parm.  Don't compare
+            the whole types, as used functions are treated as
+            coming from the using class in overload resolution.  */
+         if (! DECL_STATIC_FUNCTION_P (fn)
+             && ! DECL_STATIC_FUNCTION_P (method)
+             && (TYPE_QUALS (TREE_TYPE (TREE_VALUE (parms1)))
+                 != TYPE_QUALS (TREE_TYPE (TREE_VALUE (parms2)))))
+           same = 0;
+         if (! DECL_STATIC_FUNCTION_P (fn))
+           parms1 = TREE_CHAIN (parms1);
+         if (! DECL_STATIC_FUNCTION_P (method))
+           parms2 = TREE_CHAIN (parms2);
+
+         if (same && compparms (parms1, parms2))
            {
-             /* [over.load] Member function declarations with the
-                same name and the same parameter types cannot be
-                overloaded if any of them is a static member
-                function declaration.
-
-                [namespace.udecl] When a using-declaration brings names
-                from a base class into a derived class scope, member
-                functions in the derived class override and/or hide member
-                functions with the same name and parameter types in a base
-                class (rather than conflicting).  */
-             if ((DECL_STATIC_FUNCTION_P (fn)
-                  != DECL_STATIC_FUNCTION_P (method))
-                 || using)
+             if (using && DECL_CONTEXT (fn) == type)
+               /* Defer to the local function.  */
+               return;
+             else
                {
-                 tree parms1 = TYPE_ARG_TYPES (TREE_TYPE (fn));
-                 tree parms2 = TYPE_ARG_TYPES (TREE_TYPE (method));
-                 int same = 1;
-
-                 /* Compare the quals on the 'this' parm.  Don't compare
-                    the whole types, as used functions are treated as
-                    coming from the using class in overload resolution.  */
-                 if (using
-                     && ! DECL_STATIC_FUNCTION_P (fn)
-                     && ! DECL_STATIC_FUNCTION_P (method)
-                     && (TYPE_QUALS (TREE_TYPE (TREE_VALUE (parms1)))
-                         != TYPE_QUALS (TREE_TYPE (TREE_VALUE (parms2)))))
-                   same = 0;
-                 if (! DECL_STATIC_FUNCTION_P (fn))
-                   parms1 = TREE_CHAIN (parms1);
-                 if (! DECL_STATIC_FUNCTION_P (method))
-                   parms2 = TREE_CHAIN (parms2);
-
-                 if (same && compparms (parms1, parms2))
-                   {
-                     if (using && DECL_CONTEXT (fn) == type)
-                       /* Defer to the local function.  */
-                       return;
-                     else
-                       error ("`%#D' and `%#D' cannot be overloaded",
-                                 fn, method);
-                   }
+                 cp_error_at ("`%#D' and `%#D' cannot be overloaded",
+                              method, fn, method);
+
+                 /* We don't call duplicate_decls here to merge
+                    the declarations because that will confuse
+                    things if the methods have inline
+                    definitions.  In particular, we will crash
+                    while processing the definitions.  */
+                 return;
                }
            }
-
-         if (!decls_match (fn, method))
-           continue;
-
-         /* There has already been a declaration of this method
-            or member template.  */
-         cp_error_at ("`%D' has already been declared in `%T'", 
-                      method, type);
-
-         /* We don't call duplicate_decls here to merge the
-            declarations because that will confuse things if the
-            methods have inline definitions.  In particular, we
-            will crash while processing the definitions.  */
-         return;
        }
     }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 734987b8f2ff63e32c66fe0d2babcbde79a49da3..13605c9e619cb7486d0692782bff689140c46598 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-11  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/7224
+       * g++.dg/overload/error1.C: New test.
+       
 2002-07-11  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
        * gcc.misc-tests/linkage.exp: Handle mips-sgi-irix6*o32

diff --git a/gcc/testsuite/g++.dg/overload/error1.C b/gcc/testsuite/g++.dg/overload/error1.C
new file mode 100644 (file)
index 0000000..fcaa445
--- /dev/null
+++ b/gcc/testsuite/g++.dg/overload/error1.C
@@ -0,0 +1,7 @@
+// { dg-do compile }
+
+struct S
+{
+  void f () {}
+  int f () { return 0; } // { dg-error "" "" }
+};