diff options
| -rw-r--r-- | clang/lib/Sema/SemaAccess.cpp | 2 | ||||
| -rw-r--r-- | clang/test/CXX/class.access/class.friend/p1.cpp | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaAccess.cpp b/clang/lib/Sema/SemaAccess.cpp index 196bc117791..a92989696e3 100644 --- a/clang/lib/Sema/SemaAccess.cpp +++ b/clang/lib/Sema/SemaAccess.cpp @@ -429,7 +429,7 @@ static CXXBasePath *FindBestPath(Sema &S, } AccessSpecifier BaseAccess = I->Base->getAccessSpecifier(); - if (BaseAccess != AS_public) { + if (BaseAccess != AS_public || PathAccess != AS_public) { switch (GetFriendKind(S, EC, I->Class)) { case Sema::AR_inaccessible: PathAccess = CXXRecordDecl::MergeAccess(BaseAccess, PathAccess); diff --git a/clang/test/CXX/class.access/class.friend/p1.cpp b/clang/test/CXX/class.access/class.friend/p1.cpp index 851cd3d0088..d9c23c110d5 100644 --- a/clang/test/CXX/class.access/class.friend/p1.cpp +++ b/clang/test/CXX/class.access/class.friend/p1.cpp @@ -149,3 +149,19 @@ namespace test2 { // expected-error {{'getNext' is a private member of 'test2::ilist_node'}} }; } + +namespace test3 { + class A { protected: int x; }; // expected-note {{declared protected here}} + + class B : public A { + friend int foo(B*); + }; + + int foo(B *p) { + return p->x; + } + + int foo(const B *p) { + return p->x; // expected-error {{'x' is a protected member of 'test3::A'}} + } +} |
