averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Index] Use access level to check decls to include

Browse Source 
`isAccessibleFrom` has special handling for `@_objcImplementation`
members, which causes the definition in Swift to be missed. Use access
level directly rather than passing `nullptr` into `isAccessibleFrom`.
This commit is contained in:
Ben Barham
2023-01-30 19:06:03 -08:00
parent 4480d89536
commit 1808a398f1
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/AST/Module.cpp
View File

@@ -3467,14 +3467,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;
}
}

2
lib/Index/Index.cpp
View File

@@ -1008,7 +1008,7 @@ private:
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))

24
test/Index/index_objc_impl.swift Normal file
View File

@@ -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
}