Skip to content

Commit 3ef1242

Browse files
committed
Merge branch 'swift/master' of github.com:apple/llvm-project into swift/tensorflow-stage
* 'swift/master' of github.com:apple/llvm-project: [NFC] Update ImportFilterKinds to match rename in Swift. [NFC] Cache all imports, not just public & private.
2 parents 0decb96 + ba3adbb commit 3ef1242

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8313,9 +8313,14 @@ bool SwiftASTContext::CacheUserImports(SwiftASTContext &swift_ast_context,
83138313
llvm::SmallString<1> m_description;
83148314
llvm::SmallVector<swift::ModuleDecl::ImportedModule, 2> parsed_imports;
83158315

8316-
swift::ModuleDecl::ImportFilter import_filter;
8317-
import_filter |= swift::ModuleDecl::ImportFilterKind::Public;
8318-
import_filter |= swift::ModuleDecl::ImportFilterKind::Private;
8316+
swift::ModuleDecl::ImportFilter import_filter {
8317+
swift::ModuleDecl::ImportFilterKind::Exported,
8318+
swift::ModuleDecl::ImportFilterKind::Default,
8319+
swift::ModuleDecl::ImportFilterKind::ImplementationOnly,
8320+
swift::ModuleDecl::ImportFilterKind::SPIAccessControl,
8321+
swift::ModuleDecl::ImportFilterKind::ShadowedByCrossImportOverlay
8322+
};
8323+
83198324
source_file.getImportedModules(parsed_imports, import_filter);
83208325

83218326
auto *persistent_expression_state =

0 commit comments

Comments
 (0)