[cfe-commits] r65912 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.def lib/Sema/SemaExpr.cpp test/SemaObjC/ivar-access-tests.m test/SemaObjC/static-ivar-ref-1.m
Fariborz Jahanian
fjahanian at apple.com
Mon Mar 2 17:21:13 PST 2009
Author: fjahanian
Date: Mon Mar 2 19:21:12 2009
New Revision: 65912
URL: http://llvm.org/viewvc/llvm-project?rev=65912&view=rev
Log:
Check of ivar access access control.
Added:
cfe/trunk/test/SemaObjC/ivar-access-tests.m
Modified:
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def
cfe/trunk/lib/Sema/SemaExpr.cpp
cfe/trunk/test/SemaObjC/static-ivar-ref-1.m
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def?rev=65912&r1=65911&r2=65912&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def Mon Mar 2 19:21:12 2009
@@ -1440,4 +1440,7 @@
"local declaration of %0 hides instance variable")
DIAG(error_ivar_use_in_class_method, ERROR,
"instance variable %0 accessed in class method")
-
+DIAG(error_private_ivar_access, ERROR,
+ "instance variable %0 is private")
+DIAG(error_protected_ivar_access, ERROR,
+ "instance variable %0 is protected")
Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=65912&r1=65911&r2=65912&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Mon Mar 2 19:21:12 2009
@@ -632,7 +632,8 @@
// this name, if the lookup sucedes, we replace it our current decl.
if (D == 0 || D->isDefinedOutsideFunctionOrMethod()) {
ObjCInterfaceDecl *IFace = getCurMethodDecl()->getClassInterface();
- if (ObjCIvarDecl *IV = IFace->lookupInstanceVariable(II)) {
+ ObjCInterfaceDecl *ClassDeclared;
+ if (ObjCIvarDecl *IV = IFace->lookupInstanceVariable(II, ClassDeclared)) {
// Check if referencing a field with __attribute__((deprecated)).
if (DiagnoseUseOfDecl(IV, Loc))
return ExprError();
@@ -645,6 +646,9 @@
// If a class method uses a global variable, even if an ivar with
// same name exists, use the global.
if (!IsClsMethod) {
+ if (IV->getAccessControl() == ObjCIvarDecl::Private &&
+ ClassDeclared != IFace)
+ Diag(Loc, diag::error_private_ivar_access) << IV->getDeclName();
// FIXME: This should use a new expr for a direct reference, don't turn
// this into Self->ivar, just return a BareIVarExpr or something.
IdentifierInfo &II = Context.Idents.get("self");
@@ -660,8 +664,12 @@
else if (getCurMethodDecl()->isInstanceMethod()) {
// We should warn if a local variable hides an ivar.
ObjCInterfaceDecl *IFace = getCurMethodDecl()->getClassInterface();
- if (ObjCIvarDecl *IV = IFace->lookupInstanceVariable(II))
- Diag(Loc, diag::warn_ivar_use_hidden)<<IV->getDeclName();
+ ObjCInterfaceDecl *ClassDeclared;
+ if (ObjCIvarDecl *IV = IFace->lookupInstanceVariable(II, ClassDeclared)) {
+ if (IV->getAccessControl() != ObjCIvarDecl::Private ||
+ IFace == ClassDeclared)
+ Diag(Loc, diag::warn_ivar_use_hidden)<<IV->getDeclName();
+ }
}
// Needed to implement property "super.method" notation.
if (D == 0 && II->isStr("super")) {
@@ -1773,7 +1781,9 @@
// Handle access to Objective-C instance variables, such as "Obj->ivar" and
// (*Obj).ivar.
if (const ObjCInterfaceType *IFTy = BaseType->getAsObjCInterfaceType()) {
- if (ObjCIvarDecl *IV = IFTy->getDecl()->lookupInstanceVariable(&Member)) {
+ ObjCInterfaceDecl *ClassDeclared;
+ if (ObjCIvarDecl *IV = IFTy->getDecl()->lookupInstanceVariable(&Member,
+ ClassDeclared)) {
// If the decl being referenced had an error, return an error for this
// sub-expr without emitting another error, in order to avoid cascading
// error cases.
@@ -1783,6 +1793,19 @@
// Check whether we can reference this field.
if (DiagnoseUseOfDecl(IV, MemberLoc))
return ExprError();
+ if (IV->getAccessControl() != ObjCIvarDecl::Public) {
+ ObjCInterfaceDecl *ClassOfMethodDecl = 0;
+ if (ObjCMethodDecl *MD = getCurMethodDecl())
+ ClassOfMethodDecl = MD->getClassInterface();
+ if (IV->getAccessControl() == ObjCIvarDecl::Private) {
+ if (ClassDeclared != IFTy->getDecl() ||
+ ClassOfMethodDecl != ClassDeclared)
+ Diag(MemberLoc, diag::error_private_ivar_access) << IV->getDeclName();
+ }
+ // @protected
+ else if (!IFTy->getDecl()->isSuperClassOf(ClassOfMethodDecl))
+ Diag(MemberLoc, diag::error_protected_ivar_access) << IV->getDeclName();
+ }
ObjCIvarRefExpr *MRef= new (Context) ObjCIvarRefExpr(IV, IV->getType(),
MemberLoc, BaseExpr,
Added: cfe/trunk/test/SemaObjC/ivar-access-tests.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/ivar-access-tests.m?rev=65912&view=auto
==============================================================================
--- cfe/trunk/test/SemaObjC/ivar-access-tests.m (added)
+++ cfe/trunk/test/SemaObjC/ivar-access-tests.m Mon Mar 2 19:21:12 2009
@@ -0,0 +1,80 @@
+// RUN: clang -fsyntax-only -verify %s
+
+ at interface MySuperClass
+{
+ at private
+ int private;
+
+ at protected
+ int protected;
+
+ at public
+ int public;
+}
+ at end
+
+ at implementation MySuperClass
+- (void) test {
+ int access;
+ MySuperClass *s = 0;
+ access = s->private;
+ access = s->protected;
+}
+ at end
+
+
+ at interface MyClass : MySuperClass
+ at end
+
+ at implementation MyClass
+- (void) test {
+ int access;
+ MySuperClass *s = 0;
+ access = s->private; // expected-error {{instance variable 'private' is private}}
+ access = s->protected;
+ MyClass *m=0;
+ access = m->private; // expected-error {{instance variable 'private' is private}}
+ access = m->protected;
+}
+ at end
+
+
+ at interface Deeper : MyClass
+ at end
+
+ at implementation Deeper
+- (void) test {
+ int access;
+ MySuperClass *s = 0;
+ access = s->private; // expected-error {{instance variable 'private' is private}}
+ access = s->protected;
+ MyClass *m=0;
+ access = m->private; // expected-error {{instance variable 'private' is private}}
+ access = m->protected;
+}
+ at end
+
+ at interface Unrelated
+ at end
+
+ at implementation Unrelated
+- (void) test {
+ int access;
+ MySuperClass *s = 0;
+ access = s->private; // expected-error {{instance variable 'private' is private}}
+ access = s->protected; // expected-error {{instance variable 'protected' is protected}}
+ MyClass *m=0;
+ access = m->private; // expected-error {{instance variable 'private' is private}}
+ access = m->protected; // expected-error {{instance variable 'protected' is protected}}
+}
+ at end
+
+int main (void)
+{
+ MySuperClass *s = 0;
+ int access;
+ access = s->private; // expected-error {{instance variable 'private' is private}}
+ access = s->protected; // expected-error {{instance variable 'protected' is protected}}
+ return 0;
+}
+
Modified: cfe/trunk/test/SemaObjC/static-ivar-ref-1.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/static-ivar-ref-1.m?rev=65912&r1=65911&r2=65912&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/static-ivar-ref-1.m (original)
+++ cfe/trunk/test/SemaObjC/static-ivar-ref-1.m Mon Mar 2 19:21:12 2009
@@ -2,6 +2,7 @@
@interface current
{
+ at public
int ivar;
int ivar1;
int ivar2;
More information about the cfe-commits
mailing list