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

Merge pull request #63201 from artemcm/ScannerNoPriorSourceDeps

Browse Source 
[Dependency Scanner] Do not re-use prior source dependencies in successive scans
This commit is contained in:
Artem Chikin
2023-01-26 08:57:00 -08:00
committed by GitHub
parent af7cf15133 e2eb8c8f47
commit b1707ef534
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/AST/ModuleDependencies.cpp
View File

@@ -422,7 +422,19 @@ ModuleDependenciesCache::ModuleDependenciesCache(
Optional<const ModuleDependencyInfo*>
ModuleDependenciesCache::findDependency(
StringRef moduleName, Optional<ModuleDependencyKind> kind) const {
return globalScanningService.findDependency(moduleName, kind);
auto optionalDep = globalScanningService.findDependency(moduleName, kind);
// During a scan, only produce the cached source module info for the current module
// under scan.
if (optionalDep.hasValue()) {
auto dep = optionalDep.getValue();
if (dep->getAsSwiftSourceModule() &&
moduleName != mainScanModuleName &&
moduleName != "DummyMainModuleForResolvingCrossImportOverlays") {
return None;
}
}
return optionalDep;
}
bool ModuleDependenciesCache::hasDependency(