From: Douglas Gregor Date: Tue, 8 Jun 2010 21:27:36 +0000 (+0000) Subject: When referring to a tag that was previously declared only as a friend, X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1aa9f3a5d3e2c0f8a5606e82eef3c65a6f30672;p=clang When referring to a tag that was previously declared only as a friend, build a new declaration for that tag type that will be visible for future lookups of that tag. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@105643 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 03b2ef5643..249cbef38a 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -5238,7 +5238,8 @@ Sema::DeclPtrTy Sema::ActOnTag(Scope *S, unsigned TagSpec, TagUseKind TUK, // for the consumer of this Decl to know it doesn't own it. // For our current ASTs this shouldn't be a problem, but will // need to be changed with DeclGroups. - if (TUK == TUK_Reference || TUK == TUK_Friend) + if ((TUK == TUK_Reference && !PrevTagDecl->getFriendObjectKind()) || + TUK == TUK_Friend) return DeclPtrTy::make(PrevTagDecl); // Diagnose attempts to redefine a tag. diff --git a/test/SemaCXX/friend.cpp b/test/SemaCXX/friend.cpp index ffad0e2b44..4f86d6a94d 100644 --- a/test/SemaCXX/friend.cpp +++ b/test/SemaCXX/friend.cpp @@ -47,3 +47,17 @@ namespace test3 { friend const int getInt(int inInt = 0); }; } + +namespace test4 { + class T4A { + friend class T4B; + + public: + T4A(class T4B *); + + protected: + T4B *mB; // error here + }; + + class T4B {}; +}