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

[Dependency Scanning] Model main module as separate dependency kind: SwiftSource

Browse Source 
These kinds of modules differ from `SwiftTextual` modules in that they do not have an interface and have source-files.
It is cleaner to enforce this distinction with types, instead of checking for interface optionality everywhere.
This commit is contained in:
Artem Chikin
2021-09-13 16:46:54 -07:00
parent 8cd8ca01ad
commit e64a40451b
16 changed files with 473 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Serialization/ModuleDependencyScanner.cpp
View File

@@ -121,7 +121,7 @@ ErrorOr<ModuleDependencies> ModuleDependencyScanner::scanInterfaceFile(
std::string InPath = moduleInterfacePath.str();
auto compiledCandidates = getCompiledCandidates(Ctx, moduleName.str(),
InPath);
Result = ModuleDependencies::forSwiftTextualModule(InPath,
Result = ModuleDependencies::forSwiftInterfaceModule(InPath,
compiledCandidates,
Args,
PCMArgs,
@@ -163,10 +163,15 @@ Optional<ModuleDependencies> SerializedModuleLoaderBase::getModuleDependencies(
StringRef moduleName, ModuleDependenciesCache &cache,
InterfaceSubContextDelegate &delegate) {
auto currentSearchPathSet = Ctx.getAllModuleSearchPathsSet();
// Check whether we've cached this result.
if (auto found = cache.findDependencies(
moduleName,
{ModuleDependenciesKind::SwiftTextual, currentSearchPathSet}))
{ModuleDependenciesKind::SwiftInterface, currentSearchPathSet}))
return found;
if (auto found = cache.findDependencies(
moduleName,
{ModuleDependenciesKind::SwiftSource, currentSearchPathSet}))
return found;
if (auto found = cache.findDependencies(
moduleName,