r186331 - Re-revert r86040, which was un-reverted in r186199.
Richard Smith
richard at metafoo.co.uk
Mon Jul 15 10:35:15 PDT 2013
Thank you!
On Mon, Jul 15, 2013 at 10:27 AM, Chandler Carruth <chandlerc at gmail.com>wrote:
> Author: chandlerc
> Date: Mon Jul 15 12:27:42 2013
> New Revision: 186331
>
> URL: http://llvm.org/viewvc/llvm-project?rev=186331&view=rev
> Log:
> Re-revert r86040, which was un-reverted in r186199.
>
> This breaks the build of basic patterns with repeated friend
> declarations. See the added test case in SemaCXX/friend.cpp or the test
> case reported to the original commit log.
>
> Original commit log:
> If we friend a declaration twice, that should not make it visible to
> name lookup in the surrounding context. Slightly rework how we handle
> friend declarations to inherit the visibility of the prior
> declaration, rather than setting a friend declaration to be visible
> whenever there was a prior declaration.
>
> Modified:
> cfe/trunk/include/clang/AST/Decl.h
> cfe/trunk/include/clang/AST/DeclBase.h
> cfe/trunk/lib/Sema/SemaDecl.cpp
> cfe/trunk/lib/Sema/SemaLookup.cpp
> cfe/trunk/lib/Sema/SemaTemplate.cpp
> cfe/trunk/lib/Sema/SemaTemplateInstantiateDecl.cpp
> cfe/trunk/test/CXX/temp/temp.decls/temp.friend/p4.cpp
> cfe/trunk/test/SemaCXX/friend.cpp
>
> Modified: cfe/trunk/include/clang/AST/Decl.h
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Decl.h?rev=186331&r1=186330&r2=186331&view=diff
>
> ==============================================================================
> --- cfe/trunk/include/clang/AST/Decl.h (original)
> +++ cfe/trunk/include/clang/AST/Decl.h Mon Jul 15 12:27:42 2013
> @@ -3415,12 +3415,6 @@ void Redeclarable<decl_type>::setPreviou
> First->RedeclLink = LatestDeclLink(static_cast<decl_type*>(this));
> assert(!isa<NamedDecl>(static_cast<decl_type*>(this)) ||
>
> cast<NamedDecl>(static_cast<decl_type*>(this))->isLinkageValid());
> -
> - // If the declaration was previously visible, a redeclaration of it
> remains
> - // visible even if it wouldn't be visible by itself.
> - static_cast<decl_type*>(this)->IdentifierNamespace |=
> - First->getIdentifierNamespace() &
> - (Decl::IDNS_Ordinary | Decl::IDNS_Tag | Decl::IDNS_Type);
> }
>
> // Inline function definitions.
>
> Modified: cfe/trunk/include/clang/AST/DeclBase.h
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclBase.h?rev=186331&r1=186330&r2=186331&view=diff
>
> ==============================================================================
> --- cfe/trunk/include/clang/AST/DeclBase.h (original)
> +++ cfe/trunk/include/clang/AST/DeclBase.h Mon Jul 15 12:27:42 2013
> @@ -295,8 +295,6 @@ protected:
> friend class ASTReader;
> friend class LinkageComputer;
>
> - template<typename decl_type> friend class Redeclarable;
> -
> private:
> void CheckAccessDeclContext() const;
>
> @@ -826,7 +824,7 @@ public:
> /// class, but in the semantic context of the actual entity. This
> property
> /// applies only to a specific decl object; other redeclarations of the
> /// same entity may not (and probably don't) share this property.
> - void setObjectOfFriendDecl(bool PerformFriendInjection = false) {
> + void setObjectOfFriendDecl(bool PreviouslyDeclared) {
> unsigned OldNS = IdentifierNamespace;
> assert((OldNS & (IDNS_Tag | IDNS_Ordinary |
> IDNS_TagFriend | IDNS_OrdinaryFriend)) &&
> @@ -835,20 +833,15 @@ public:
> IDNS_TagFriend | IDNS_OrdinaryFriend)) &&
> "namespace includes other than ordinary or tag");
>
> - Decl *Prev = getPreviousDecl();
> IdentifierNamespace = 0;
> if (OldNS & (IDNS_Tag | IDNS_TagFriend)) {
> IdentifierNamespace |= IDNS_TagFriend;
> - if (PerformFriendInjection ||
> - (Prev && Prev->getIdentifierNamespace() & IDNS_Tag))
> - IdentifierNamespace |= IDNS_Tag | IDNS_Type;
> + if (PreviouslyDeclared) IdentifierNamespace |= IDNS_Tag | IDNS_Type;
> }
>
> if (OldNS & (IDNS_Ordinary | IDNS_OrdinaryFriend)) {
> IdentifierNamespace |= IDNS_OrdinaryFriend;
> - if (PerformFriendInjection ||
> - (Prev && Prev->getIdentifierNamespace() & IDNS_Ordinary))
> - IdentifierNamespace |= IDNS_Ordinary;
> + if (PreviouslyDeclared) IdentifierNamespace |= IDNS_Ordinary;
> }
> }
>
>
> Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=186331&r1=186330&r2=186331&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaDecl.cpp Mon Jul 15 12:27:42 2013
> @@ -6328,11 +6328,12 @@ Sema::ActOnFunctionDeclarator(Scope *S,
> }
>
> if (isFriend) {
> + // For now, claim that the objects have no previous declaration.
> if (FunctionTemplate) {
> - FunctionTemplate->setObjectOfFriendDecl();
> + FunctionTemplate->setObjectOfFriendDecl(false);
> FunctionTemplate->setAccess(AS_public);
> }
> - NewFD->setObjectOfFriendDecl();
> + NewFD->setObjectOfFriendDecl(false);
> NewFD->setAccess(AS_public);
> }
>
> @@ -6651,6 +6652,8 @@ Sema::ActOnFunctionDeclarator(Scope *S,
>
> NewFD->setAccess(Access);
> if (FunctionTemplate) FunctionTemplate->setAccess(Access);
> +
> + PrincipalDecl->setObjectOfFriendDecl(true);
> }
>
> if (NewFD->isOverloadedOperator() && !DC->isRecord() &&
> @@ -10381,8 +10384,9 @@ CreateNewDecl:
> // declaration so we always pass true to setObjectOfFriendDecl to make
> // the tag name visible.
> if (TUK == TUK_Friend)
> - New->setObjectOfFriendDecl(!FriendSawTagOutsideEnclosingNamespace &&
> - getLangOpts().MicrosoftExt);
> + New->setObjectOfFriendDecl(/* PreviouslyDeclared = */
> !Previous.empty() ||
> + (!FriendSawTagOutsideEnclosingNamespace &&
> + getLangOpts().MicrosoftExt));
>
> // Set the access specifier.
> if (!Invalid && SearchDC->isRecord())
>
> Modified: cfe/trunk/lib/Sema/SemaLookup.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaLookup.cpp?rev=186331&r1=186330&r2=186331&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Sema/SemaLookup.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaLookup.cpp Mon Jul 15 12:27:42 2013
> @@ -2757,15 +2757,8 @@ void Sema::ArgumentDependentLookup(Decla
> // If the only declaration here is an ordinary friend, consider
> // it only if it was declared in an associated classes.
> if (D->getIdentifierNamespace() == Decl::IDNS_OrdinaryFriend) {
> - bool DeclaredInAssociatedClass = false;
> - for (Decl *DI = D; DI; DI = DI->getPreviousDecl()) {
> - DeclContext *LexDC = DI->getLexicalDeclContext();
> - if (AssociatedClasses.count(cast<CXXRecordDecl>(LexDC))) {
> - DeclaredInAssociatedClass = true;
> - break;
> - }
> - }
> - if (!DeclaredInAssociatedClass)
> + DeclContext *LexDC = D->getLexicalDeclContext();
> + if (!AssociatedClasses.count(cast<CXXRecordDecl>(LexDC)))
> continue;
> }
>
>
> Modified: cfe/trunk/lib/Sema/SemaTemplate.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplate.cpp?rev=186331&r1=186330&r2=186331&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Sema/SemaTemplate.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaTemplate.cpp Mon Jul 15 12:27:42 2013
> @@ -1120,7 +1120,8 @@ Sema::CheckClassTemplate(Scope *S, unsig
> NewClass->setAccess(PrevClassTemplate->getAccess());
> }
>
> - NewTemplate->setObjectOfFriendDecl();
> + NewTemplate->setObjectOfFriendDecl(/* PreviouslyDeclared = */
> + PrevClassTemplate != NULL);
>
> // Friend templates are visible in fairly strange ways.
> if (!CurContext->isDependentContext()) {
>
> Modified: cfe/trunk/lib/Sema/SemaTemplateInstantiateDecl.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplateInstantiateDecl.cpp?rev=186331&r1=186330&r2=186331&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Sema/SemaTemplateInstantiateDecl.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaTemplateInstantiateDecl.cpp Mon Jul 15 12:27:42
> 2013
> @@ -960,7 +960,7 @@ Decl *TemplateDeclInstantiator::VisitCla
> else
> Inst->setAccess(D->getAccess());
>
> - Inst->setObjectOfFriendDecl();
> + Inst->setObjectOfFriendDecl(PrevClassTemplate != 0);
> // TODO: do we want to track the instantiation progeny of this
> // friend target decl?
> } else {
> @@ -1110,8 +1110,8 @@ Decl *TemplateDeclInstantiator::VisitCXX
>
> // If the original function was part of a friend declaration,
> // inherit its namespace state.
> - if (D->getFriendObjectKind())
> - Record->setObjectOfFriendDecl();
> + if (Decl::FriendObjectKind FOK = D->getFriendObjectKind())
> + Record->setObjectOfFriendDecl(FOK == Decl::FOK_Declared);
>
> // Make sure that anonymous structs and unions are recorded.
> if (D->isAnonymousStructOrUnion()) {
> @@ -1315,7 +1315,7 @@ Decl *TemplateDeclInstantiator::VisitFun
> assert(isFriend && "non-friend has dependent specialization info?");
>
> // This needs to be set now for future sanity.
> - Function->setObjectOfFriendDecl();
> + Function->setObjectOfFriendDecl(/*HasPrevious*/ true);
>
> // Instantiate the explicit template arguments.
> TemplateArgumentListInfo ExplicitArgs(Info->getLAngleLoc(),
> @@ -1365,7 +1365,13 @@ Decl *TemplateDeclInstantiator::VisitFun
> // If the original function was part of a friend declaration,
> // inherit its namespace state and add it to the owner.
> if (isFriend) {
> - PrincipalDecl->setObjectOfFriendDecl();
> + NamedDecl *PrevDecl;
> + if (TemplateParams)
> + PrevDecl = FunctionTemplate->getPreviousDecl();
> + else
> + PrevDecl = Function->getPreviousDecl();
> +
> + PrincipalDecl->setObjectOfFriendDecl(PrevDecl != 0);
> DC->makeDeclVisibleInContext(PrincipalDecl);
>
> bool queuedInstantiation = false;
> @@ -1633,7 +1639,7 @@ TemplateDeclInstantiator::VisitCXXMethod
> TemplateParams,
> Method);
> if (isFriend) {
> FunctionTemplate->setLexicalDeclContext(Owner);
> - FunctionTemplate->setObjectOfFriendDecl();
> + FunctionTemplate->setObjectOfFriendDecl(true);
> } else if (D->isOutOfLine())
> FunctionTemplate->setLexicalDeclContext(D->getLexicalDeclContext());
> Method->setDescribedFunctionTemplate(FunctionTemplate);
> @@ -1660,7 +1666,7 @@ TemplateDeclInstantiator::VisitCXXMethod
> TempParamLists.data());
>
> Method->setLexicalDeclContext(Owner);
> - Method->setObjectOfFriendDecl();
> + Method->setObjectOfFriendDecl(true);
> } else if (D->isOutOfLine())
> Method->setLexicalDeclContext(D->getLexicalDeclContext());
>
>
> Modified: cfe/trunk/test/CXX/temp/temp.decls/temp.friend/p4.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/temp/temp.decls/temp.friend/p4.cpp?rev=186331&r1=186330&r2=186331&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/CXX/temp/temp.decls/temp.friend/p4.cpp (original)
> +++ cfe/trunk/test/CXX/temp/temp.decls/temp.friend/p4.cpp Mon Jul 15
> 12:27:42 2013
> @@ -26,20 +26,3 @@ void g() {
> X2<float> xf;
> f(xf);
> }
> -
> -template<typename T>
> -struct X3 {
> - operator int();
> -
> - friend void h(int x);
> -};
> -
> -int array2[sizeof(X3<int>)];
> -int array3[sizeof(X3<float>)];
> -
> -void i() {
> - X3<int> xi;
> - h(xi);
> - X3<float> xf;
> - h(xf);
> -}
>
> Modified: cfe/trunk/test/SemaCXX/friend.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/friend.cpp?rev=186331&r1=186330&r2=186331&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/SemaCXX/friend.cpp (original)
> +++ cfe/trunk/test/SemaCXX/friend.cpp Mon Jul 15 12:27:42 2013
> @@ -166,24 +166,13 @@ namespace test9 {
>
> namespace test10 {
> struct A {
> - friend void f10();
> + friend void f();
> };
> + extern void f();
> struct B {
> - friend void f10();
> + friend void f();
> };
> void g() {
> - f10(); // expected-error {{undeclared identifier}}
> + ::test10::f();
> }
> }
> -
> -namespace PR16597 {
> - struct A {
> - friend void f_16597();
> - };
> - struct B {
> - friend void f_16597();
> - };
> - struct C {
> - };
> - void g(C a) { f_16597(a); } // expected-error {{undeclared identifier}}
> -}
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20130715/976fe2bd/attachment.html>
More information about the cfe-commits
mailing list