[cfe-commits] r143635 - in /cfe/trunk: lib/Sema/SemaAccess.cpp test/Index/complete-ivar-access.m

[Douglas Gregor]

Author: dgregor
Date: Thu Nov  3 14:00:24 2011
New Revision: 143635

URL: http://llvm.org/viewvc/llvm-project?rev=143635&view=rev
Log:
Extend IsSimplyAccessible to check for Objective-C instance variable
accessibility. Fixes <rdar://problem/3727335>.

Added:
    cfe/trunk/test/Index/complete-ivar-access.m
Modified:
    cfe/trunk/lib/Sema/SemaAccess.cpp

Modified: cfe/trunk/lib/Sema/SemaAccess.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaAccess.cpp?rev=143635&r1=143634&r2=143635&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaAccess.cpp (original)
+++ cfe/trunk/lib/Sema/SemaAccess.cpp Thu Nov  3 14:00:24 2011
@@ -19,6 +19,7 @@
 #include "clang/AST/CXXInheritance.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/DeclFriend.h"
+#include "clang/AST/DeclObjC.h"
 #include "clang/AST/DependentDiagnostic.h"
 #include "clang/AST/ExprCXX.h"
 
@@ -1667,7 +1668,46 @@
     return ::IsAccessible(*this, EC, Entity) != ::AR_inaccessible;
   }
   
-  // FIXME: Check access for Objective-C ivars.
+  if (ObjCIvarDecl *Ivar = dyn_cast<ObjCIvarDecl>(Decl)) {
+    // @public and @package ivars are always accessible.
+    if (Ivar->getCanonicalAccessControl() == ObjCIvarDecl::Public ||
+        Ivar->getCanonicalAccessControl() == ObjCIvarDecl::Package)
+      return true;
+    
+    
+    
+    // If we are inside a class or category implementation, determine the
+    // interface we're in.
+    ObjCInterfaceDecl *ClassOfMethodDecl = 0;
+    if (ObjCMethodDecl *MD = getCurMethodDecl())
+      ClassOfMethodDecl =  MD->getClassInterface();
+    else if (FunctionDecl *FD = getCurFunctionDecl()) {
+      if (ObjCImplDecl *Impl 
+            = dyn_cast<ObjCImplDecl>(FD->getLexicalDeclContext())) {
+        if (ObjCImplementationDecl *IMPD
+              = dyn_cast<ObjCImplementationDecl>(Impl))
+          ClassOfMethodDecl = IMPD->getClassInterface();
+        else if (ObjCCategoryImplDecl* CatImplClass
+                   = dyn_cast<ObjCCategoryImplDecl>(Impl))
+          ClassOfMethodDecl = CatImplClass->getClassInterface();
+      }
+    }
+    
+    // If we're not in an interface, this ivar is inaccessible.
+    if (!ClassOfMethodDecl)
+      return false;
+    
+    // If we're inside the same interface that owns the ivar, we're fine.
+    if (ClassOfMethodDecl == Ivar->getContainingInterface())
+      return true;
+    
+    // If the ivar is private, it's inaccessible.
+    if (Ivar->getCanonicalAccessControl() == ObjCIvarDecl::Private)
+      return false;
+    
+    return Ivar->getContainingInterface()->isSuperClassOf(ClassOfMethodDecl);
+  }
+  
   return true;
 }
 

Added: cfe/trunk/test/Index/complete-ivar-access.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/complete-ivar-access.m?rev=143635&view=auto
==============================================================================
--- cfe/trunk/test/Index/complete-ivar-access.m (added)
+++ cfe/trunk/test/Index/complete-ivar-access.m Thu Nov  3 14:00:24 2011
@@ -0,0 +1,69 @@
+ at interface Other {
+ at private
+  int other_private;
+ at protected
+  int other_protected;
+ at public
+  int other_public;
+}
+ at end
+
+ at interface Super {
+ at private
+  int super_private;
+ at protected
+  int super_protected;
+ at public
+  int super_public;
+}
+ at end
+
+ at interface Super () {
+ at private
+  int super_ext_private;
+ at protected
+  int super_ext_protected;
+ at public
+  int super_ext_public;
+}
+ at end
+
+ at interface Sub : Super {
+ at private
+  int sub_private;
+ at protected
+  int sub_protected;
+ at public
+  int sub_public;
+}
+ at end
+
+ at implementation Sub
+- (void)method:(Sub *)sub with:(Other *)other {
+  sub->super_protected = 1;
+  other->other_public = 1;
+}
+
+void f(Sub *sub, Other *other) {
+  sub->super_protected = 1;
+  other->other_public = 1;
+}
+ at end
+
+// RUN: c-index-test -code-completion-at=%s:43:8 %s | FileCheck -check-prefix=CHECK-SUB %s
+// RUN: c-index-test -code-completion-at=%s:48:8 %s | FileCheck -check-prefix=CHECK-SUB %s
+// CHECK-SUB: ObjCIvarDecl:{ResultType int}{TypedText sub_private} (35)
+// CHECK-SUB: ObjCIvarDecl:{ResultType int}{TypedText sub_protected} (35)
+// CHECK-SUB: ObjCIvarDecl:{ResultType int}{TypedText sub_public} (35)
+// CHECK-SUB: ObjCIvarDecl:{ResultType int}{TypedText super_ext_private} (35) (inaccessible)
+// CHECK-SUB: ObjCIvarDecl:{ResultType int}{TypedText super_ext_protected} (35)
+// CHECK-SUB: ObjCIvarDecl:{ResultType int}{TypedText super_ext_public} (35)
+// CHECK-SUB: ObjCIvarDecl:{ResultType int}{TypedText super_private} (37) (inaccessible)
+// CHECK-SUB: ObjCIvarDecl:{ResultType int}{TypedText super_protected} (37)
+// CHECK-SUB: ObjCIvarDecl:{ResultType int}{TypedText super_public} (37)
+
+// RUN: c-index-test -code-completion-at=%s:44:10 %s | FileCheck -check-prefix=CHECK-OTHER %s
+// RUN: c-index-test -code-completion-at=%s:49:10 %s | FileCheck -check-prefix=CHECK-OTHER %s
+// CHECK-OTHER: ObjCIvarDecl:{ResultType int}{TypedText other_private} (35) (inaccessible)
+// CHECK-OTHER: ObjCIvarDecl:{ResultType int}{TypedText other_protected} (35) (inaccessible)
+// CHECK-OTHER: ObjCIvarDecl:{ResultType int}{TypedText other_public} (35)