From 5149fbfd56f2cc85e3f7d17887ef536e666b23b7 Mon Sep 17 00:00:00 2001 From: John McCall Date: Fri, 22 Feb 2013 03:52:55 +0000 Subject: Only suppress instance context if a member is actually accessible in its declaring class; otherwise we might fail to apply [class.protected] when considering accessibility in derived classes. Noticed by inspection; . I had an existing test wrong. Here's why it's wrong: Follow the rules (and notation) of [class.access]p5. The naming class (N) is B and the context (R) is D::getX. - 'x' as a member of B is protected, but R does not occur in a member or friend of a class derived from B. - There does exist a base class of B, A, which is accessible from R, and 'x' is accessible at R when named in A because 'x' as a member of A is protected and R occurs in a member of a class, D, that is derived from A; however, by [class.protected], the class of the object expression must be equal to or derived from that class, and A does not derive from D. llvm-svn: 175858 --- clang/lib/Sema/SemaAccess.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'clang/lib/Sema/SemaAccess.cpp') diff --git a/clang/lib/Sema/SemaAccess.cpp b/clang/lib/Sema/SemaAccess.cpp index 229e6f4b8ff..55bd76b7376 100644 --- a/clang/lib/Sema/SemaAccess.cpp +++ b/clang/lib/Sema/SemaAccess.cpp @@ -1317,7 +1317,13 @@ static AccessResult IsAccessible(Sema &S, FinalAccess = Target->getAccess(); switch (HasAccess(S, EC, DeclaringClass, FinalAccess, Entity)) { case AR_accessible: + // Target is accessible at EC when named in its declaring class. + // We can now hill-climb and simply check whether the declaring + // class is accessible as a base of the naming class. This is + // equivalent to checking the access of a notional public + // member with no instance context. FinalAccess = AS_public; + Entity.suppressInstanceContext(); break; case AR_inaccessible: break; case AR_dependent: return AR_dependent; // see above @@ -1325,8 +1331,6 @@ static AccessResult IsAccessible(Sema &S, if (DeclaringClass == NamingClass) return (FinalAccess == AS_public ? AR_accessible : AR_inaccessible); - - Entity.suppressInstanceContext(); } else { FinalAccess = AS_public; } -- cgit v1.2.3