[C++ PATCH] PR c++/62101

[Ville Voutilainen]

We didn't allow deleted friend definitions, because that was diagnosed
in grokdeclarator, which doesn't have knowledge of the kind of a function
declaration "initializer". Move the test to grokfield and adjust where
necessary. Tested on Linux x86-64.
-------------- next part --------------
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 79e7362..92a6dbc 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -9765,8 +9765,6 @@ grokdeclarator (const cp_declarator *declarator,
 	      }
 	    else if (friendp)
 	      {
-		if (initialized)
-		  error ("can%'t initialize friend function %qs", name);
 		if (virtualp)
 		  {
 		    /* Cannot be both friend and virtual.  */
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 1740a2e..5fa689a 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -846,6 +846,7 @@ grokfield (const cp_declarator *declarator,
   const char *asmspec = 0;
   int flags;
   tree name;
+  int friendp = 0;
 
   if (init
       && TREE_CODE (init) == TREE_LIST
@@ -870,11 +871,6 @@ grokfield (const cp_declarator *declarator,
   if (value == void_type_node)
     return value;
 
-  /* Pass friend decls back.  */
-  if ((TREE_CODE (value) == FUNCTION_DECL
-       || TREE_CODE (value) == TEMPLATE_DECL)
-      && DECL_CONTEXT (value) != current_class_type)
-    return value;
 
   name = DECL_NAME (value);
 
@@ -926,7 +922,9 @@ grokfield (const cp_declarator *declarator,
       return value;
     }
 
-  if (DECL_IN_AGGR_P (value))
+  friendp = decl_spec_seq_has_spec_p (declspecs, ds_friend);
+
+  if (!friendp && DECL_IN_AGGR_P (value))
     {
       error ("%qD is already defined in %qT", value, DECL_CONTEXT (value));
       return void_type_node;
@@ -939,8 +937,6 @@ grokfield (const cp_declarator *declarator,
     {
       if (TREE_CODE (value) == FUNCTION_DECL)
 	{
-	  /* Initializers for functions are rejected early in the parser.
-	     If we get here, it must be a pure specifier for a method.  */
 	  if (init == ridpointers[(int)RID_DELETE])
 	    {
 	      DECL_DELETED_FN (value) = 1;
@@ -971,8 +967,12 @@ grokfield (const cp_declarator *declarator,
 	  else
 	    {
 	      gcc_assert (TREE_CODE (TREE_TYPE (value)) == FUNCTION_TYPE);
-	      error ("initializer specified for static member function %qD",
-		     value);
+	      if (friendp)
+		error ("initializer specified for friend function %qD", 
+		       value);
+	      else
+		error ("initializer specified for static member function %qD",
+		       value);
 	    }
 	}
       else if (TREE_CODE (value) == FIELD_DECL)
@@ -981,6 +981,12 @@ grokfield (const cp_declarator *declarator,
 	gcc_unreachable ();
     }
 
+  /* Pass friend decls back.  */
+  if ((TREE_CODE (value) == FUNCTION_DECL
+       || TREE_CODE (value) == TEMPLATE_DECL)
+      && DECL_CONTEXT (value) != current_class_type)
+    return value;
+
   if (processing_template_decl && VAR_OR_FUNCTION_DECL_P (value))
     {
       value = push_template_decl (value);
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr62101.C b/gcc/testsuite/g++.dg/cpp0x/pr62101.C
new file mode 100644
index 0000000..abec7f7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/pr62101.C
@@ -0,0 +1,32 @@
+// PR c++/62101
+// { dg-do compile { target c++11 } }
+
+struct X
+{
+  friend void g(X, int) = 0; // { dg-error "initializer specified for friend function" }
+  friend void g(X, int) = default; // { dg-error "cannot be defaulted" }
+  // { dg-prune-output "note" }
+  friend void f(X, int) = delete; 
+  friend void f(X, double) {}
+};
+
+struct Y;
+void g(Y, int);
+void g(Y, double);
+
+struct Y
+{
+  // { dg-prune-output "note" }
+  friend void g(Y, int) = delete;
+  friend void g(Y, double) {}
+};
+
+int main()
+{
+  X x;
+  f(x, 5.0);
+  f(x, 5); // { dg-error "use of deleted function" }
+  Y y;
+  g(y, 5.0);
+  g(y, 5); // { dg-error "use of deleted function" }
+}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pr62101.changelog
Type: application/octet-stream
Size: 476 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/gcc-patches/attachments/20140813/a4fd00dd/attachment.obj>