PR c++/50089

[pf3gnuchains/gcc-fork.git] / gcc / cp / friend.c

diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c
index 297614c..36fcca4 100644 (file)
--- a/gcc/cp/friend.c
+++ b/gcc/cp/friend.c
@@ -1,12 +1,12 @@
 /* Help friends in C++.
 /* Help friends in C++.

-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2007, 2008, 2010  Free Software Foundation, Inc.

 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)

 any later version.
 
 GCC is distributed in the hope that it will be useful,
 any later version.
 
 GCC is distributed in the hope that it will be useful,


@@ -15,21 +15,17 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License

-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
 
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"

-#include "rtl.h"
-#include "expr.h"

 #include "cp-tree.h"
 #include "flags.h"
 #include "output.h"
 #include "cp-tree.h"
 #include "flags.h"
 #include "output.h"

-#include "toplev.h"

 
 /* Friend data structures are described in cp-tree.h.  */
 
 
 /* Friend data structures are described in cp-tree.h.  */
 


@@ -60,15 +56,15 @@ is_friend (tree type, tree supplicant)
              tree friends = FRIEND_DECLS (list);
              for (; friends ; friends = TREE_CHAIN (friends))
                {
              tree friends = FRIEND_DECLS (list);
              for (; friends ; friends = TREE_CHAIN (friends))
                {

-                 tree friend = TREE_VALUE (friends);
+                 tree this_friend = TREE_VALUE (friends);

 
 

-                 if (friend == NULL_TREE)
+                 if (this_friend == NULL_TREE)

                    continue;
 
                    continue;
 

-                 if (supplicant == friend)
+                 if (supplicant == this_friend)

                    return 1;
 
                    return 1;
 

-                 if (is_specialization_of_friend (supplicant, friend))
+                 if (is_specialization_of_friend (supplicant, this_friend))

                    return 1;
                }
              break;
                    return 1;
                }
              break;


@@ -78,33 +74,38 @@ is_friend (tree type, tree supplicant)
   else
     /* It's a type.  */
     {
   else
     /* It's a type.  */
     {

-      /* Nested classes are implicitly friends of their enclosing types, as
-        per core issue 45 (this is a change from the standard).  */
-      for (context = supplicant;
-          context && TYPE_P (context);
-          context = TYPE_CONTEXT (context))
-       if (type == context)
-         return 1;
-      
+      if (same_type_p (supplicant, type))
+       return 1;
+

       list = CLASSTYPE_FRIEND_CLASSES (TREE_TYPE (TYPE_MAIN_DECL (type)));
       for (; list ; list = TREE_CHAIN (list))
        {
          tree t = TREE_VALUE (list);
 
       list = CLASSTYPE_FRIEND_CLASSES (TREE_TYPE (TYPE_MAIN_DECL (type)));
       for (; list ; list = TREE_CHAIN (list))
        {
          tree t = TREE_VALUE (list);
 

-         if (TREE_CODE (t) == TEMPLATE_DECL ? 
-             is_specialization_of (TYPE_MAIN_DECL (supplicant), t) :
+         if (TREE_CODE (t) == TEMPLATE_DECL ?
+             is_specialization_of_friend (TYPE_MAIN_DECL (supplicant), t) :

              same_type_p (supplicant, t))
            return 1;
        }
              same_type_p (supplicant, t))
            return 1;
        }

-    }      
+    }

 
 

-  if (declp && DECL_FUNCTION_MEMBER_P (supplicant))
-    context = DECL_CONTEXT (supplicant);
-  else if (! declp)
-    /* Local classes have the same access as the enclosing function.  */
-    context = decl_function_context (TYPE_MAIN_DECL (supplicant));
+  if (declp)
+    {
+      if (DECL_FUNCTION_MEMBER_P (supplicant))
+       context = DECL_CONTEXT (supplicant);
+      else
+       context = NULL_TREE;
+    }

   else
   else

-    context = NULL_TREE;
+    {
+      if (TYPE_CLASS_SCOPE_P (supplicant))
+       /* Nested classes get the same access as their enclosing types, as
+          per DR 45 (this is a change from the standard).  */
+       context = TYPE_CONTEXT (supplicant);
+      else
+       /* Local classes have the same access as the enclosing function.  */
+       context = decl_function_context (TYPE_MAIN_DECL (supplicant));
+    }

 
   /* A namespace is not friend to anybody.  */
   if (context && TREE_CODE (context) == NAMESPACE_DECL)
 
   /* A namespace is not friend to anybody.  */
   if (context && TREE_CODE (context) == NAMESPACE_DECL)


@@ -129,6 +130,7 @@ add_friend (tree type, tree decl, bool complain)
   tree typedecl;
   tree list;
   tree name;
   tree typedecl;
   tree list;
   tree name;

+  tree ctx;

 
   if (decl == error_mark_node)
     return;
 
   if (decl == error_mark_node)
     return;


@@ -148,7 +150,7 @@ add_friend (tree type, tree decl, bool complain)
              if (decl == TREE_VALUE (friends))
                {
                  if (complain)
              if (decl == TREE_VALUE (friends))
                {
                  if (complain)

-                   warning ("`%D' is already a friend of class `%T'",
+                   warning (0, "%qD is already a friend of class %qT",

                             decl, type);
                  return;
                }
                             decl, type);
                  return;
                }


@@ -163,8 +165,9 @@ add_friend (tree type, tree decl, bool complain)
       list = TREE_CHAIN (list);
     }
 
       list = TREE_CHAIN (list);
     }
 

-  if (DECL_CLASS_SCOPE_P (decl))
-    perform_or_defer_access_check (TYPE_BINFO (DECL_CONTEXT (decl)), decl);
+  ctx = DECL_CONTEXT (decl);
+  if (ctx && CLASS_TYPE_P (ctx) && !uses_template_parms (ctx))
+    perform_or_defer_access_check (TYPE_BINFO (ctx), decl, decl);

 
   maybe_add_class_template_decl_list (type, decl, /*friend_p=*/1);
 
 
   maybe_add_class_template_decl_list (type, decl, /*friend_p=*/1);
 


@@ -172,7 +175,7 @@ add_friend (tree type, tree decl, bool complain)
     = tree_cons (DECL_NAME (decl), build_tree_list (NULL_TREE, decl),
                 DECL_FRIENDLIST (typedecl));
   if (!uses_template_parms (type))
     = tree_cons (DECL_NAME (decl), build_tree_list (NULL_TREE, decl),
                 DECL_FRIENDLIST (typedecl));
   if (!uses_template_parms (type))

-    DECL_BEFRIENDING_CLASSES (decl) 
+    DECL_BEFRIENDING_CLASSES (decl)

       = tree_cons (NULL_TREE, type,
                   DECL_BEFRIENDING_CLASSES (decl));
 }
       = tree_cons (NULL_TREE, type,
                   DECL_BEFRIENDING_CLASSES (decl));
 }


@@ -195,15 +198,46 @@ void
 make_friend_class (tree type, tree friend_type, bool complain)
 {
   tree classes;
 make_friend_class (tree type, tree friend_type, bool complain)
 {
   tree classes;

-  int is_template_friend;

 
 

-  if (! IS_AGGR_TYPE (friend_type))
+  /* CLASS_TEMPLATE_DEPTH counts the number of template headers for
+     the enclosing class.  FRIEND_DEPTH counts the number of template
+     headers used for this friend declaration.  TEMPLATE_MEMBER_P,
+     defined inside the `if' block for TYPENAME_TYPE case, is true if
+     a template header in FRIEND_DEPTH is intended for DECLARATOR.
+     For example, the code
+
+       template <class T> struct A {
+        template <class U> struct B {
+          template <class V> template <class W>
+            friend class C<V>::D;
+        };
+       };
+
+     will eventually give the following results
+
+     1. CLASS_TEMPLATE_DEPTH equals 2 (for `T' and `U').
+     2. FRIEND_DEPTH equals 2 (for `V' and `W').
+     3. TEMPLATE_MEMBER_P is true (for `W').
+
+     The friend is a template friend iff FRIEND_DEPTH is nonzero.  */
+
+  int class_template_depth = template_class_depth (type);
+  int friend_depth = processing_template_decl - class_template_depth;
+
+  if (! MAYBE_CLASS_TYPE_P (friend_type))

     {
     {

-      error ("invalid type `%T' declared `friend'", friend_type);
+      /* N1791: If the type specifier in a friend declaration designates a
+        (possibly cv-qualified) class type, that class is declared as a
+        friend; otherwise, the friend declaration is ignored.
+
+         So don't complain in C++0x mode.  */
+      if (cxx_dialect < cxx0x)
+       pedwarn (input_location, complain ? 0 : OPT_pedantic,
+                "invalid type %qT declared %<friend%>", friend_type);

       return;
     }
 
       return;
     }
 

-  if (processing_template_decl > template_class_depth (type))
+  if (friend_depth)

     /* If the TYPE is a template then it makes sense for it to be
        friends with itself; this means that each instantiation is
        friends with all other instantiations.  */
     /* If the TYPE is a template then it makes sense for it to be
        friends with itself; this means that each instantiation is
        friends with all other instantiations.  */


@@ -215,22 +249,18 @@ make_friend_class (tree type, tree friend_type, bool complain)
          /* [temp.friend]
             Friend declarations shall not declare partial
             specializations.  */
          /* [temp.friend]
             Friend declarations shall not declare partial
             specializations.  */

-         error ("partial specialization `%T' declared `friend'",
+         error ("partial specialization %qT declared %<friend%>",

                 friend_type);
          return;
        }
                 friend_type);
          return;
        }

-  
-      is_template_friend = 1;

     }
   else if (same_type_p (type, friend_type))
     {
       if (complain)
     }
   else if (same_type_p (type, friend_type))
     {
       if (complain)

-       pedwarn ("class `%T' is implicitly friends with itself",
+       warning (0, "class %qT is implicitly friends with itself",

                 type);
       return;
     }
                 type);
       return;
     }

-  else
-    is_template_friend = 0;

 
   /* [temp.friend]
 
 
   /* [temp.friend]
 


@@ -238,30 +268,95 @@ make_friend_class (tree type, tree friend_type, bool complain)
      class template, a specialization of a function template or
      class template, or an ordinary (nontemplate) function or
      class.  */
      class template, a specialization of a function template or
      class template, or an ordinary (nontemplate) function or
      class.  */

-  if (!is_template_friend)
+  if (!friend_depth)

     ;/* ok */
   else if (TREE_CODE (friend_type) == TYPENAME_TYPE)
     {
     ;/* ok */
   else if (TREE_CODE (friend_type) == TYPENAME_TYPE)
     {

-      /* template <class T> friend typename S<T>::X; */
-      error ("typename type `%#T' declared `friend'", friend_type);
-      return;
+      if (TREE_CODE (TYPENAME_TYPE_FULLNAME (friend_type))
+         == TEMPLATE_ID_EXPR)
+       {
+         /* template <class U> friend class T::X<U>; */
+         /* [temp.friend]
+            Friend declarations shall not declare partial
+            specializations.  */
+         error ("partial specialization %qT declared %<friend%>",
+                friend_type);
+         return;
+       }
+      else
+       {
+         /* We will figure this out later.  */
+         bool template_member_p = false;
+
+         tree ctype = TYPE_CONTEXT (friend_type);
+         tree name = TYPE_IDENTIFIER (friend_type);
+         tree decl;
+
+         if (!uses_template_parms_level (ctype, class_template_depth
+                                                + friend_depth))
+           template_member_p = true;
+
+         if (class_template_depth)
+           {
+             /* We rely on tsubst_friend_class to check the
+                validity of the declaration later.  */
+             if (template_member_p)
+               friend_type
+                 = make_unbound_class_template (ctype,
+                                                name,
+                                                current_template_parms,
+                                                tf_error);
+             else
+               friend_type
+                 = make_typename_type (ctype, name, class_type, tf_error);
+           }
+         else
+           {
+             decl = lookup_member (ctype, name, 0, true);
+             if (!decl)
+               {
+                 error ("%qT is not a member of %qT", name, ctype);
+                 return;
+               }
+             if (template_member_p && !DECL_CLASS_TEMPLATE_P (decl))
+               {
+                 error ("%qT is not a member class template of %qT",
+                        name, ctype);
+                 error ("%q+D declared here", decl);
+                 return;
+               }
+             if (!template_member_p && (TREE_CODE (decl) != TYPE_DECL
+                                        || !CLASS_TYPE_P (TREE_TYPE (decl))))
+               {
+                 error ("%qT is not a nested class of %qT",
+                        name, ctype);
+                 error ("%q+D declared here", decl);
+                 return;
+               }
+
+             friend_type = CLASSTYPE_TI_TEMPLATE (TREE_TYPE (decl));
+           }
+       }

     }
   else if (TREE_CODE (friend_type) == TEMPLATE_TYPE_PARM)
     {
       /* template <class T> friend class T; */
     }
   else if (TREE_CODE (friend_type) == TEMPLATE_TYPE_PARM)
     {
       /* template <class T> friend class T; */

-      error ("template parameter type `%T' declared `friend'", friend_type);
+      error ("template parameter type %qT declared %<friend%>", friend_type);

       return;
     }
   else if (!CLASSTYPE_TEMPLATE_INFO (friend_type))
     {
       /* template <class T> friend class A; where A is not a template */
       return;
     }
   else if (!CLASSTYPE_TEMPLATE_INFO (friend_type))
     {
       /* template <class T> friend class A; where A is not a template */

-      error ("`%#T' is not a template", friend_type);
+      error ("%q#T is not a template", friend_type);

       return;
     }
       return;
     }

-
-  if (is_template_friend)
+  else
+    /* template <class T> friend class A; where A is a template */

     friend_type = CLASSTYPE_TI_TEMPLATE (friend_type);
 
     friend_type = CLASSTYPE_TI_TEMPLATE (friend_type);
 

+  if (friend_type == error_mark_node)
+    return;
+

   /* See if it is already a friend.  */
   for (classes = CLASSTYPE_FRIEND_CLASSES (type);
        classes;
   /* See if it is already a friend.  */
   for (classes = CLASSTYPE_FRIEND_CLASSES (type);
        classes;


@@ -274,8 +369,7 @@ make_friend_class (tree type, tree friend_type, bool complain)
          if (friend_type == probe)
            {
              if (complain)
          if (friend_type == probe)
            {
              if (complain)

-               warning ("`%D' is already a friend of `%T'",
-                        probe, type);
+               warning (0, "%qD is already a friend of %qT", probe, type);

              break;
            }
        }
              break;
            }
        }


@@ -284,49 +378,52 @@ make_friend_class (tree type, tree friend_type, bool complain)
          if (same_type_p (probe, friend_type))
            {
              if (complain)
          if (same_type_p (probe, friend_type))
            {
              if (complain)

-               warning ("`%T' is already a friend of `%T'",
-                        probe, type);
+               warning (0, "%qT is already a friend of %qT", probe, type);

              break;
            }
        }
     }
              break;
            }
        }
     }

-  
-  if (!classes) 
+
+  if (!classes)

     {
       maybe_add_class_template_decl_list (type, friend_type, /*friend_p=*/1);
 
       CLASSTYPE_FRIEND_CLASSES (type)
        = tree_cons (NULL_TREE, friend_type, CLASSTYPE_FRIEND_CLASSES (type));
     {
       maybe_add_class_template_decl_list (type, friend_type, /*friend_p=*/1);
 
       CLASSTYPE_FRIEND_CLASSES (type)
        = tree_cons (NULL_TREE, friend_type, CLASSTYPE_FRIEND_CLASSES (type));

-      if (is_template_friend)
+      if (TREE_CODE (friend_type) == TEMPLATE_DECL)

        friend_type = TREE_TYPE (friend_type);
       if (!uses_template_parms (type))
        CLASSTYPE_BEFRIENDING_CLASSES (friend_type)
        friend_type = TREE_TYPE (friend_type);
       if (!uses_template_parms (type))
        CLASSTYPE_BEFRIENDING_CLASSES (friend_type)

-         = tree_cons (NULL_TREE, type, 
-                      CLASSTYPE_BEFRIENDING_CLASSES (friend_type)); 
+         = tree_cons (NULL_TREE, type,
+                      CLASSTYPE_BEFRIENDING_CLASSES (friend_type));

     }
 }
 
     }
 }
 

-/* Main friend processor. 
-
-   CTYPE is the class this friend belongs to.
-
-   DECLARATOR is the name of the friend.
-
-   DECL is the FUNCTION_DECL that the friend is.
-
-   FLAGS is just used for `grokclassfn'.
-
-   QUALS say what special qualifies should apply to the object
-   pointed to by `this'.  */
+/* Record DECL (a FUNCTION_DECL) as a friend of the
+   CURRENT_CLASS_TYPE.  If DECL is a member function, CTYPE is the
+   class of which it is a member, as named in the friend declaration.
+   DECLARATOR is the name of the friend.  FUNCDEF_FLAG is true if the
+   friend declaration is a definition of the function.  FLAGS is as
+   for grokclass fn.  */

 
 tree
 do_friend (tree ctype, tree declarator, tree decl,
 
 tree
 do_friend (tree ctype, tree declarator, tree decl,

-          tree attrlist, enum overload_flags flags, tree quals,
-          int funcdef_flag)
+          tree attrlist, enum overload_flags flags,
+          bool funcdef_flag)

 {
 {

+  gcc_assert (TREE_CODE (decl) == FUNCTION_DECL);
+  gcc_assert (!ctype || MAYBE_CLASS_TYPE_P (ctype));
+

   /* Every decl that gets here is a friend of something.  */
   DECL_FRIEND_P (decl) = 1;
 
   /* Every decl that gets here is a friend of something.  */
   DECL_FRIEND_P (decl) = 1;
 

+  /* Unfortunately, we have to handle attributes here.  Normally we would
+     handle them in start_decl_1, but since this is a friend decl start_decl_1
+     never gets to see it.  */
+
+  /* Set attributes here so if duplicate decl, will have proper attributes.  */
+  cplus_decl_attributes (&decl, attrlist, 0);
+

   if (TREE_CODE (declarator) == TEMPLATE_ID_EXPR)
     {
       declarator = TREE_OPERAND (declarator, 0);
   if (TREE_CODE (declarator) == TEMPLATE_ID_EXPR)
     {
       declarator = TREE_OPERAND (declarator, 0);


@@ -334,9 +431,6 @@ do_friend (tree ctype, tree declarator, tree decl,
        declarator = DECL_NAME (get_first_fn (declarator));
     }
 
        declarator = DECL_NAME (get_first_fn (declarator));
     }
 

-  if (TREE_CODE (decl) != FUNCTION_DECL)
-    abort ();
-

   if (ctype)
     {
       /* CLASS_TEMPLATE_DEPTH counts the number of template headers for
   if (ctype)
     {
       /* CLASS_TEMPLATE_DEPTH counts the number of template headers for


@@ -371,8 +465,7 @@ do_friend (tree ctype, tree declarator, tree decl,
       if (flags == NO_SPECIAL && declarator == cname)
        DECL_CONSTRUCTOR_P (decl) = 1;
 
       if (flags == NO_SPECIAL && declarator == cname)
        DECL_CONSTRUCTOR_P (decl) = 1;
 

-      /* This will set up DECL_ARGUMENTS for us.  */
-      grokclassfn (ctype, decl, flags, quals);
+      grokclassfn (ctype, decl, flags);

 
       if (friend_depth)
        {
 
       if (friend_depth)
        {


@@ -386,7 +479,7 @@ do_friend (tree ctype, tree declarator, tree decl,
         the process of being defined.  */
       if (class_template_depth
          || COMPLETE_TYPE_P (ctype)
         the process of being defined.  */
       if (class_template_depth
          || COMPLETE_TYPE_P (ctype)

-         || TYPE_BEING_DEFINED (ctype))
+         || (CLASS_TYPE_P (ctype) && TYPE_BEING_DEFINED (ctype)))

        {
          if (DECL_TEMPLATE_INFO (decl))
            /* DECL is a template specialization.  No need to
        {
          if (DECL_TEMPLATE_INFO (decl))
            /* DECL is a template specialization.  No need to


@@ -395,9 +488,12 @@ do_friend (tree ctype, tree declarator, tree decl,
          else if (class_template_depth)
            /* We rely on tsubst_friend_function to check the
               validity of the declaration later.  */
          else if (class_template_depth)
            /* We rely on tsubst_friend_function to check the
               validity of the declaration later.  */

-           decl = push_template_decl_real (decl, /*is_friend=*/1);
+           decl = push_template_decl_real (decl, /*is_friend=*/true);

          else
          else

-           decl = check_classfn (ctype, decl, template_member_p);
+           decl = check_classfn (ctype, decl,
+                                 template_member_p
+                                 ? current_template_parms
+                                 : NULL_TREE);

 
          if (template_member_p && decl && TREE_CODE (decl) == FUNCTION_DECL)
            decl = DECL_TI_TEMPLATE (decl);
 
          if (template_member_p && decl && TREE_CODE (decl) == FUNCTION_DECL)
            decl = DECL_TI_TEMPLATE (decl);


@@ -406,7 +502,7 @@ do_friend (tree ctype, tree declarator, tree decl,
            add_friend (current_class_type, decl, /*complain=*/true);
        }
       else
            add_friend (current_class_type, decl, /*complain=*/true);
        }
       else

-       error ("member `%D' declared as friend before type `%T' defined",
+       error ("member %qD declared as friend before type %qT defined",

                  decl, ctype);
     }
   /* A global friend.
                  decl, ctype);
     }
   /* A global friend.


@@ -439,33 +535,52 @@ do_friend (tree ctype, tree declarator, tree decl,
               general, such a declaration depends on template
               parameters.  Instead, we call pushdecl when the class
               is instantiated.  */
               general, such a declaration depends on template
               parameters.  Instead, we call pushdecl when the class
               is instantiated.  */

-           decl = push_template_decl_real (decl, /*is_friend=*/1); 
+           decl = push_template_decl_real (decl, /*is_friend=*/true);

          else if (current_function_decl)
          else if (current_function_decl)

-           /* This must be a local class, so pushdecl will be ok, and
-              insert an unqualified friend into the local scope
-              (rather than the containing namespace scope, which the
-              next choice will do).  */
-           decl = pushdecl (decl);
+           {
+             /* This must be a local class.  11.5p11:
+
+                If a friend declaration appears in a local class (9.8) and
+                the name specified is an unqualified name, a prior
+                declaration is looked up without considering scopes that
+                are outside the innermost enclosing non-class scope. For a
+                friend function declaration, if there is no prior
+                declaration, the program is ill-formed.  */
+             tree t = lookup_name_innermost_nonclass_level (DECL_NAME (decl));
+             if (t)
+               decl = pushdecl_maybe_friend (decl, /*is_friend=*/true);
+             else
+               {
+                 error ("friend declaration %qD in local class without "
+                        "prior declaration", decl);
+                 return error_mark_node;
+               }
+           }

          else
            {
              /* We can't use pushdecl, as we might be in a template
          else
            {
              /* We can't use pushdecl, as we might be in a template

-                class specialization, and pushdecl will insert an
-                unqualified friend decl into the template parameter
-                scope, rather than the namespace containing it.  */
+                class specialization, and pushdecl will insert an
+                unqualified friend decl into the template parameter
+                scope, rather than the namespace containing it.  */

              tree ns = decl_namespace_context (decl);
              tree ns = decl_namespace_context (decl);

-             
+

              push_nested_namespace (ns);
              push_nested_namespace (ns);

-             decl = pushdecl_namespace_level (decl);
+             decl = pushdecl_namespace_level (decl, /*is_friend=*/true);

              pop_nested_namespace (ns);
            }
 
          if (warn)
            {
              static int explained;
              pop_nested_namespace (ns);
            }
 
          if (warn)
            {
              static int explained;

-             warning ("friend declaration `%#D' declares a non-template function", decl);
-             if (! explained)
+             bool warned;
+
+             warned = warning (OPT_Wnon_template_friend, "friend declaration "
+                               "%q#D declares a non-template function", decl);
+             if (! explained && warned)

                {
                {

-                 warning ("(if this is not what you intended, make sure the function template has already been declared and add <> after the function name here) -Wno-non-template-friend disables this warning");
+                 inform (input_location, "(if this is not what you intended, make sure "
+                         "the function template has already been declared "
+                         "and add <> after the function name here) ");

                  explained = 1;
                }
            }
                  explained = 1;
                }
            }


@@ -473,19 +588,12 @@ do_friend (tree ctype, tree declarator, tree decl,
 
       if (decl == error_mark_node)
        return error_mark_node;
 
       if (decl == error_mark_node)
        return error_mark_node;

-      
-      add_friend (current_class_type, 
+
+      add_friend (current_class_type,

                  is_friend_template ? DECL_TI_TEMPLATE (decl) : decl,
                  /*complain=*/true);
       DECL_FRIEND_P (decl) = 1;
     }
 
                  is_friend_template ? DECL_TI_TEMPLATE (decl) : decl,
                  /*complain=*/true);
       DECL_FRIEND_P (decl) = 1;
     }
 

-  /* Unfortunately, we have to handle attributes here.  Normally we would
-     handle them in start_decl_1, but since this is a friend decl start_decl_1
-     never gets to see it.  */
-
-  /* Set attributes here so if duplicate decl, will have proper attributes.  */
-  cplus_decl_attributes (&decl, attrlist, 0);
-

   return decl;
 }
   return decl;
 }