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

[NFC] Add type for ModuleDecl::getImplicitImports()

Browse Source 
This doesn’t really change the design yet.
This commit is contained in:
Brent Royal-Gordon
2020-09-25 16:26:39 -07:00
parent 8070e8aaed
commit d55c5bd549
9 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Sema/ImportResolution.cpp
View File

@@ -174,15 +174,7 @@ public:
addImplicitImports();
}
void addImplicitImports() {
// TODO: Support cross-module imports.
for (auto &import : SF.getParentModule()->getImplicitImports()) {
assert(!(SF.Kind == SourceFileKind::SIL &&
import.Module->isStdlibModule()));
ImportedModule importedMod{ImportPath::Access(), import.Module};
boundImports.emplace_back(importedMod, import.Options);
}
}
void addImplicitImports();
/// Retrieve the finalized imports.
ArrayRef<AttributedImport<ImportedModule>> getFinishedImports() const {
@@ -400,7 +392,7 @@ UnboundImport::getTopLevelModule(ModuleDecl *M, SourceFile &SF) {
// MARK: Implicit imports
//===----------------------------------------------------------------------===//
ArrayRef<ImplicitImport>
ImplicitImportList
ModuleImplicitImportsRequest::evaluate(Evaluator &evaluator,
ModuleDecl *module) const {
SmallVector<ImplicitImport, 4> imports;
@@ -468,7 +460,19 @@ ModuleImplicitImportsRequest::evaluate(Evaluator &evaluator,
}
}
return ctx.AllocateCopy(imports);
return { ctx.AllocateCopy(imports) };
}
void ImportResolver::addImplicitImports() {
auto implicitImports = SF.getParentModule()->getImplicitImports();
// TODO: Support cross-module imports.
for (auto &import : implicitImports.imports) {
assert(!(SF.Kind == SourceFileKind::SIL &&
import.Module->isStdlibModule()));
ImportedModule importedMod{ImportPath::Access(), import.Module};
boundImports.emplace_back(importedMod, import.Options);
}
}
//===----------------------------------------------------------------------===//