aboutsummaryrefslogtreecommitdiff
path: root/lib/Sema/SemaAccess.cpp
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2010-03-25 21:39:55 +0000
committerJohn McCall <rjmccall@apple.com>2010-03-25 21:39:55 +0000
commite06c1a13172bd6ef38fe927d72198ab3f97c0b4a (patch)
tree921ab58373d358aa21b583bb3caa6859ff001622 /lib/Sema/SemaAccess.cpp
parent9c86b513cb42ea6d9e3f98cb2b7eda39a2eb526b (diff)
Fix a very minor oversight in privileges-elevation: we were only considering
friendship for a derived class if the base class specifier was non-public, and thus not considering friendship for non-public members of public bases. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@99554 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaAccess.cpp')
-rw-r--r--lib/Sema/SemaAccess.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Sema/SemaAccess.cpp b/lib/Sema/SemaAccess.cpp
index 196bc11779..a92989696e 100644
--- a/lib/Sema/SemaAccess.cpp
+++ b/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);