Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-12-02 10:49:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix typo correction usage of SemaAccess.cpp.

Browse Source 
When we check access for lookup results, make sure we propagate the
result's access to the access control APIs; this can be different from
the natural access of the declaration depending on the path used by the lookup.

PR17394.

llvm-svn: 191726
This commit is contained in:
Eli Friedman 2013-10-01 02:44:48 +00:00
parent e4aaac506c
commit 3be1a1c0b5
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Sema/Sema.h
View File

@ -4896,7 +4896,7 @@ public:
AccessResult CheckFriendAccess(NamedDecl *D);
AccessResult CheckMemberAccess(SourceLocation UseLoc,
CXXRecordDecl *NamingClass,
NamedDecl *D);
DeclAccessPair Found);
AccessResult CheckMemberOperatorAccess(SourceLocation Loc,
Expr *ObjectExpr,
Expr *ArgExpr,

8
clang/lib/Sema/SemaAccess.cpp
View File

@ -1390,8 +1390,6 @@ static AccessResult IsAccessible(Sema &S,
CXXBasePath *Path = FindBestPath(S, EC, Entity, FinalAccess, Paths);
if (!Path)
return AR_dependent;
if (Path->Access == AS_none) // This can happen during typo correction.
return AR_inaccessible;
assert(Path->Access <= UnprivilegedAccess &&
"access along best path worse than direct?");
@ -1716,14 +1714,14 @@ Sema::AccessResult Sema::CheckAllocationAccess(SourceLocation OpLoc,
/// \brief Checks access to a member.
Sema::AccessResult Sema::CheckMemberAccess(SourceLocation UseLoc,
CXXRecordDecl *NamingClass,
NamedDecl *D) {
DeclAccessPair Found) {
if (!getLangOpts().AccessControl ||
!NamingClass ||
D->getAccess() == AS_public)
Found.getAccess() == AS_public)
return AR_accessible;
AccessTarget Entity(Context, AccessTarget::Member, NamingClass,
DeclAccessPair::make(D, D->getAccess()), QualType());
Found, QualType());
return CheckAccess(*this, UseLoc, Entity);
}

2
clang/lib/Sema/SemaLookup.cpp
View File

@ -4409,7 +4409,7 @@ retry_lookup:
TRD != TRDEnd; ++TRD) {
if (CheckMemberAccess(TC.getCorrectionRange().getBegin(),
NSType ? NSType->getAsCXXRecordDecl() : 0,
*TRD) == AR_accessible)
TRD.getPair()) == AR_accessible)
TC.addCorrectionDecl(*TRD);
}
if (TC.isResolved())

9
clang/test/SemaCXX/typo-correction-pt2.cpp
View File

@ -135,3 +135,12 @@ void test() {
req.set_check(false); // expected-error-re {{use of undeclared identifier 'req'$}}
}
}
namespace PR17394 {
class A {
protected:
long zzzzzzzzzz;
};
class B : private A {};
B zzzzzzzzzy<>; // expected-error {{expected ';' after top level declarator}}{}
}