mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-04 02:50:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c++/18681 ([DR 45] template friend declaration not recognized)

Browse Source 
PR c++/18681
        * friend.c (is_friend): Fix DR 45 implementation.

From-SVN: r115208
This commit is contained in:
Jason Merrill 2006-07-05 15:44:28 -04:00 committed by Jason Merrill
parent ad6d4e435e
commit 03b1c2062b
4 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2006-07-05 Jason Merrill <jason@redhat.com>
PR c++/18681
* friend.c (is_friend): Fix DR 45 implementation.
2006-07-05 Richard Guenther <rguenther@suse.de>
Andrew Pinski <pinskia@gcc.gnu.org>

31
gcc/cp/friend.c
View File

@ -78,13 +78,8 @@ is_friend (tree type, tree supplicant)
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))
@ -98,13 +93,23 @@ is_friend (tree type, tree supplicant)
}
}
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
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)

4
gcc/cp/search.c
View File

@ -792,8 +792,8 @@ friend_accessible_p (tree scope, tree decl, tree binfo)
if (protected_accessible_p (decl, TREE_VALUE (t), binfo))
return 1;
/* Nested classes are implicitly friends of their enclosing types, as
per core issue 45 (this is a change from the standard). */
/* Nested classes have the same access as their enclosing types, as
per DR 45 (this is a change from the standard). */
if (TYPE_P (scope))
for (t = TYPE_CONTEXT (scope); t && TYPE_P (t); t = TYPE_CONTEXT (t))
if (protected_accessible_p (decl, t, binfo))

22
gcc/testsuite/g++.dg/lookup/friend10.C Normal file
View File

@ -0,0 +1,22 @@
// PR c++/18681
// Bug: The friend declaration in A failed to give C::D access to A::B
// as specified in DR 45.
class A
{
struct B;
friend class C;
};
class C
{
struct D
{
void f();
};
};
void C::D::f()
{
A::B* p;
}