Merge pull request swiftlang#63478 from bnbarham/index-use-accesslevel-instead

[Index] Use access level to check decls to include

Author: bnbarham

lib/AST/Module.cpp

@@ -3470,14 +3470,14 @@ bool FileUnit::walk(ASTWalker &walker) {
     if (SkipInternal) {
       // Ignore if the decl isn't visible
       if (auto *VD = dyn_cast<ValueDecl>(D)) {
-        if (!VD->isAccessibleFrom(nullptr))
+        if (VD->getFormalAccess() < AccessLevel::Public)
           continue;
       }
 
       // Also ignore if the extended nominal isn't visible
       if (auto *ED = dyn_cast<ExtensionDecl>(D)) {
         auto *ND = ED->getExtendedNominal();
-        if (ND && !ND->isAccessibleFrom(nullptr))
+        if (ND && ND->getFormalAccess() < AccessLevel::Public)
           continue;
       }
     }

lib/Index/Index.cpp

@@ -1008,7 +1008,7 @@ class IndexSwiftASTWalker : public SourceEntityWalker {
       return false;
 
     // Do not handle non-public imported decls.
-    if (IsModuleFile && !D->isAccessibleFrom(nullptr))
+    if (IsModuleFile && D->getFormalAccess() < AccessLevel::Public)
       return false;
 
     if (!IdxConsumer.indexLocals() && isLocalSymbol(D))

test/Index/index_objc_impl.swift

@@ -0,0 +1,24 @@
+// REQUIRES: objc_interop
+
+// RUN: %empty-directory(%t)
+// RUN: %empty-directory(%t/mods)
+// RUN: split-file %s %t
+
+// RUN: %target-swift-frontend -emit-module -o %t/mods %t/ObjcImpl.swift -import-objc-header %t/objc_impl.h -disable-objc-attr-requires-foundation-module
+// RUN: %target-swift-ide-test -print-indexed-symbols -module-to-print ObjcImpl -source-filename none -I %t/mods | %FileCheck %s
+
+//--- objc_impl.h
+@interface NSObject
+@end
+
+@interface ObjCClass : NSObject
+@property int someObjCDeclaredVar;
+@end
+
+//--- ObjcImpl.swift
+// CHECK: extension/ext-class/Swift | ObjCClass | s:e:c:@CM@ObjcImpl@@objc(cs)ObjCClass(py)someObjCDeclaredVar | Def
+// CHECK: class/Swift | ObjCClass | c:objc(cs)ObjCClass | Ref
+@_objcImplementation public extension ObjCClass {
+  // CHECK: instance-property/Swift | someObjCDeclaredVar | c:@CM@ObjcImpl@@objc(cs)ObjCClass(py)someObjCDeclaredVar | Def
+  @objc var someObjCDeclaredVar: CInt
+}