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

AST: Use ImportCache to simplify SourceFile::isImportedImplementationOnly()

Browse Source
This commit is contained in:
Slava Pestov
2019-08-26 17:01:48 -04:00
parent acf5371dfc
commit 3819f341bd
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/AST/Module.cpp
View File

@@ -1611,20 +1611,7 @@ bool SourceFile::isImportedImplementationOnly(const ModuleDecl *module) const {
if (!hasImplementationOnlyImports())
return false;
auto isImportedBy = [](const ModuleDecl *dest, const ModuleDecl *src) {
// Fast path.
if (dest == src) return true;
// Walk the transitive imports, respecting visibility.
// This return true if the search *didn't* short-circuit, and it short
// circuits if we found `dest`, so we need to invert the sense before
// returning.
return !const_cast<ModuleDecl*>(src)
->forAllVisibleModules({}, [dest](ModuleDecl::ImportedModule im) {
// Continue searching as long as we haven't found `dest` yet.
return im.second != dest;
});
};
auto &imports = getASTContext().getImportCache();
// Look at the imports of this source file.
for (auto &desc : Imports) {
@@ -1634,12 +1621,12 @@ bool SourceFile::isImportedImplementationOnly(const ModuleDecl *module) const {
// If the module is imported this way, it's not imported
// implementation-only.
if (isImportedBy(module, desc.module.second))
if (imports.isImportedBy(module, desc.module.second))
return false;
}
// Now check this file's enclosing module in case there are re-exports.
return !isImportedBy(module, getParentModule());
return !imports.isImportedBy(module, getParentModule());
}
void ModuleDecl::clearLookupCache() {