From 41c5ee0615beab8b7c047fc2c3e6d117c0240da7 Mon Sep 17 00:00:00 2001 From: Kriang Lerdsuwanakij Date: Thu, 17 Jul 2003 15:47:40 +0000 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/friend.c | 3 +++ gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/parse/access3.C | 14 ++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 gcc/testsuite/g++.dg/parse/access3.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 72bd508f6a1..82db5a44e35 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2003-07-17 Kriang Lerdsuwanakij + + PR c++/7809 + * g++.dg/parse/access3.C: New test. + 2003-07-17 Gabriel Dos Reis PR c++/10668 diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c index e31a0559a0f..b71c5f203db 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 61938bf8660..f2ce617d2d1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2003-07-17 Kriang Lerdsuwanakij + + PR c++/7809 + * friend.c (add_friend): Check access for member functions + and templates. + 2003-06-17 Andrew Pinski 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 00000000000..43303c95a94 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/access3.C @@ -0,0 +1,14 @@ +// { dg-do compile } + +// Origin: + +// PR c++/7809: Befriending inaccessible name. + +class A { +private: + void f(); // { dg-error "private" } +}; + +class B { + friend void A::f(); // { dg-error "context" } +}; -- 2.30.2