From: Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
Date: Thu, 17 Jul 2003 15:47:40 +0000 (+0000)
Subject: re PR c++/7809 (befriending inaccessible names)
X-Git-Tag: releases/gcc-3.4.0~4777
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41c5ee0615beab8b7c047fc2c3e6d117c0240da7;p=thirdparty%2Fgcc.git

re PR c++/7809 (befriending inaccessible names)

	PR c++/7809
	* friend.c (add_friend): Check access for member functions
	and templates.

	* g++.dg/parse/access3.C: New test.

From-SVN: r69513
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 72bd508f6a10..82db5a44e35e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-17  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+	PR c++/7809
+	* g++.dg/parse/access3.C: New test.
+
 2003-07-17  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
 	PR c++/10668
diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c
index e31a0559a0fd..b71c5f203db0 100644
--- a/gcc/cp/friend.c
+++ b/gcc/cp/friend.c
@@ -170,6 +170,9 @@ add_friend (tree type, tree decl)
       list = TREE_CHAIN (list);
     }
 
+  if (DECL_CLASS_SCOPE_P (decl))
+    perform_or_defer_access_check (TYPE_BINFO (DECL_CONTEXT (decl)), decl);
+
   maybe_add_class_template_decl_list (type, decl, /*friend_p=*/1);
 
   DECL_FRIENDLIST (typedecl)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 61938bf86600..f2ce617d2d16 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-17  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+	PR c++/7809
+	* friend.c (add_friend): Check access for member functions
+	and templates.
+
 2003-06-17  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	PR c++/11384
diff --git a/gcc/testsuite/g++.dg/parse/access3.C b/gcc/testsuite/g++.dg/parse/access3.C
new file mode 100644
index 000000000000..43303c95a943
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/access3.C
@@ -0,0 +1,14 @@
+// { dg-do compile }
+
+// Origin: <bagnara@cs.unipr.it>
+
+// PR c++/7809: Befriending inaccessible name.
+
+class A {
+private:
+  void f();		// { dg-error "private" }
+};
+
+class B {
+  friend void A::f();	// { dg-error "context" }
+};