decl.c (grokdeclarator): Set constexprness before announcing friendship.

	* decl.c (grokdeclarator): Set constexprness before announcing
	friendship.

Co-Authored-By: Jason Merrill <jason@redhat.com>

From-SVN: r152393

gcc/cp/ChangeLog

+2009-10-01  Gabriel Dos Reis  <gdr@cse.tamu.edu>
+	    Jason Merrill <jason@redhat.com>
+
+	* decl.c (grokdeclarator): Set constexprness before announcing
+	friendship.
+
 2009-10-01  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* decl.c (record_builtin_java_type): Undo unintended change.

gcc/cp/decl.c

@@ -9299,10 +9299,10 @@ grokdeclarator (const cp_declarator *declarator,
 		      return error_mark_node;
 		  }
 
+                DECL_DECLARED_CONSTEXPR_P (decl) = constexpr_p;
 		decl = do_friend (ctype, unqualified_id, decl,
 				  *attrlist, flags,
 				  funcdef_flag);
-                DECL_DECLARED_CONSTEXPR_P (decl) = constexpr_p;
 		return decl;
 	      }
 	    else