Partial fix for <rdar://problem/6645157> [clang on Xcode; regression]: error: instance variable 'someField' is private.
A recent regression caused by http://llvm.org/viewvc/llvm-project?rev=65912&view=rev.
This commit isn't fully baked. Nevertheless, it should cause Xcode to compile again. Will speak with Fariborz offline.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@66045 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 43909b9..f9d89fd 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -1666,6 +1666,12 @@
return &Idents.get(&SelectorName[0], &SelectorName[SelectorName.size()]);
}
+ObjCImplementationDecl *getCurImplementationDecl(DeclContext *DC) {
+ while (DC && !isa<ObjCImplementationDecl>(DC))
+ DC = DC->getParent();
+ return dyn_cast_or_null<ObjCImplementationDecl>(DC);
+}
+
Action::OwningExprResult
Sema::ActOnMemberReferenceExpr(Scope *S, ExprArg Base, SourceLocation OpLoc,
tok::TokenKind OpKind, SourceLocation MemberLoc,
@@ -1797,9 +1803,17 @@
ObjCInterfaceDecl *ClassOfMethodDecl = 0;
if (ObjCMethodDecl *MD = getCurMethodDecl())
ClassOfMethodDecl = MD->getClassInterface();
- if (IV->getAccessControl() == ObjCIvarDecl::Private) {
+ else if (FunctionDecl *FD = getCurFunctionDecl()) {
+ // FIXME: This isn't working yet. Will discuss with Fariborz.
+ // FIXME: Should be ObjCImplDecl, so categories can work.
+ // Need to fiddle with castToDeclContext/castFromDeclContext.
+ ObjCImplementationDecl *ImpDecl = getCurImplementationDecl(FD);
+ if (ImpDecl)
+ ClassOfMethodDecl = ImpDecl->getClassInterface();
+ }
+ if (IV->getAccessControl() == ObjCIvarDecl::Private) {
if (ClassDeclared != IFTy->getDecl() ||
- ClassOfMethodDecl != ClassDeclared)
+ (ClassOfMethodDecl && (ClassOfMethodDecl != ClassDeclared)))
Diag(MemberLoc, diag::error_private_ivar_access) << IV->getDeclName();
}
// @protected