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] Have the scanner cache answer queries relevant to current search paths only.

Browse Source 
The dependency scanner's cache persists across different queries and answering a subsequent query's module lookup with a module not in the query's search path is not correct.

For example, suppose we are looking for a Swift module `Foo` with a set of search paths `SP`.
And dependency scanner cache already contains a module `Foo`, for which we found an interface file at location `L`. If `L`∉`SP`, then we cannot re-use the cached entry because we’d be resolving the scanning query to a filesystem location that the current scanning context is not aware of.

Resolves rdar://81175942
This commit is contained in:
Artem Chikin
2021-07-29 10:46:48 -07:00
parent 77cb4b639c
commit 6a12dc0070
11 changed files with 480 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
lib/DependencyScan/ModuleDependencyCacheSerialization.cpp
View File

@@ -682,7 +682,10 @@ void Serializer::writeModuleInfo(ModuleDependencyID moduleID,
getIdentifier(moduleID.first),
getArray(moduleID, ModuleIdentifierArrayKind::DirectDependencies));
if (auto swiftTextDeps = dependencyInfo.getAsSwiftTextualModule()) {
switch (dependencyInfo.getKind()) {
case swift::ModuleDependenciesKind::SwiftTextual: {
auto swiftTextDeps = dependencyInfo.getAsSwiftTextualModule();
assert(swiftTextDeps);
unsigned swiftInterfaceFileId =
swiftTextDeps->swiftInterfaceFile
? getIdentifier(swiftTextDeps->swiftInterfaceFile.getValue())
@@ -703,24 +706,33 @@ void Serializer::writeModuleInfo(ModuleDependencyID moduleID,
getArray(moduleID, ModuleIdentifierArrayKind::BridgingSourceFiles),
getArray(moduleID,
ModuleIdentifierArrayKind::BridgingModuleDependencies));
} else if (auto swiftBinDeps = dependencyInfo.getAsSwiftBinaryModule()) {
break;
}
case swift::ModuleDependenciesKind::SwiftBinary: {
auto swiftBinDeps = dependencyInfo.getAsSwiftBinaryModule();
assert(swiftBinDeps);
SwiftBinaryModuleDetailsLayout::emitRecord(
Out, ScratchRecord, AbbrCodes[SwiftBinaryModuleDetailsLayout::Code],
getIdentifier(swiftBinDeps->compiledModulePath),
getIdentifier(swiftBinDeps->moduleDocPath),
getIdentifier(swiftBinDeps->sourceInfoPath), swiftBinDeps->isFramework);
} else if (auto swiftPHDeps =
dependencyInfo.getAsPlaceholderDependencyModule()) {
break;
}
case swift::ModuleDependenciesKind::SwiftPlaceholder: {
auto swiftPHDeps = dependencyInfo.getAsPlaceholderDependencyModule();
assert(swiftPHDeps);
SwiftPlaceholderModuleDetailsLayout::emitRecord(
Out, ScratchRecord,
AbbrCodes[SwiftPlaceholderModuleDetailsLayout::Code],
getIdentifier(swiftPHDeps->compiledModulePath),
getIdentifier(swiftPHDeps->moduleDocPath),
getIdentifier(swiftPHDeps->sourceInfoPath));
} else if (auto clangDeps = dependencyInfo.getAsClangModule()) {
break;
}
case swift::ModuleDependenciesKind::Clang: {
auto clangDeps = dependencyInfo.getAsClangModule();
assert(clangDeps);
ClangModuleDetailsLayout::emitRecord(
Out, ScratchRecord, AbbrCodes[ClangModuleDetailsLayout::Code],
getIdentifier(clangDeps->moduleMapFile),
@@ -728,8 +740,8 @@ void Serializer::writeModuleInfo(ModuleDependencyID moduleID,
getArray(moduleID, ModuleIdentifierArrayKind::NonPathCommandLine),
getArray(moduleID, ModuleIdentifierArrayKind::FileDependencies));
} else {
llvm_unreachable("Unexpected module dependency kind.");
break;
}
}
}
@@ -802,52 +814,69 @@ unsigned Serializer::getArray(ModuleDependencyID moduleID,
void Serializer::collectStringsAndArrays(const ModuleDependenciesCache &cache) {
for (auto &moduleID : cache.getAllModules()) {
auto dependencyInfo =
cache.findDependencies(moduleID.first, moduleID.second);
assert(dependencyInfo.hasValue() && "Expected dependency info.");
// Add the module's name
addIdentifier(moduleID.first);
// Add the module's dependencies
addArray(moduleID, ModuleIdentifierArrayKind::DirectDependencies,
dependencyInfo->getModuleDependencies());
auto dependencyInfos = cache.findAllDependenciesIrrespectiveOfSearchPaths(
moduleID.first, moduleID.second);
assert(dependencyInfos.hasValue() && "Expected dependency info.");
for (auto &dependencyInfo : *dependencyInfos) {
// Add the module's name
addIdentifier(moduleID.first);
// Add the module's dependencies
addArray(moduleID, ModuleIdentifierArrayKind::DirectDependencies,
dependencyInfo.getModuleDependencies());
// Add the dependency-kind-specific data
if (auto swiftTextDeps = dependencyInfo->getAsSwiftTextualModule()) {
if (swiftTextDeps->swiftInterfaceFile)
addIdentifier(swiftTextDeps->swiftInterfaceFile.getValue());
addArray(moduleID, ModuleIdentifierArrayKind::CompiledModuleCandidates,
swiftTextDeps->compiledModuleCandidates);
addArray(moduleID, ModuleIdentifierArrayKind::BuildCommandLine,
swiftTextDeps->buildCommandLine);
addArray(moduleID, ModuleIdentifierArrayKind::ExtraPCMArgs,
swiftTextDeps->extraPCMArgs);
addIdentifier(swiftTextDeps->contextHash);
if (swiftTextDeps->bridgingHeaderFile)
addIdentifier(swiftTextDeps->bridgingHeaderFile.getValue());
addArray(moduleID, ModuleIdentifierArrayKind::SourceFiles,
swiftTextDeps->sourceFiles);
addArray(moduleID, ModuleIdentifierArrayKind::BridgingSourceFiles,
swiftTextDeps->bridgingSourceFiles);
addArray(moduleID, ModuleIdentifierArrayKind::BridgingModuleDependencies,
swiftTextDeps->bridgingModuleDependencies);
} else if (auto swiftBinDeps = dependencyInfo->getAsSwiftBinaryModule()) {
addIdentifier(swiftBinDeps->compiledModulePath);
addIdentifier(swiftBinDeps->moduleDocPath);
addIdentifier(swiftBinDeps->sourceInfoPath);
} else if (auto swiftPHDeps =
dependencyInfo->getAsPlaceholderDependencyModule()) {
addIdentifier(swiftPHDeps->compiledModulePath);
addIdentifier(swiftPHDeps->moduleDocPath);
addIdentifier(swiftPHDeps->sourceInfoPath);
} else if (auto clangDeps = dependencyInfo->getAsClangModule()) {
addIdentifier(clangDeps->moduleMapFile);
addIdentifier(clangDeps->contextHash);
addArray(moduleID, ModuleIdentifierArrayKind::NonPathCommandLine,
clangDeps->nonPathCommandLine);
addArray(moduleID, ModuleIdentifierArrayKind::FileDependencies,
clangDeps->fileDependencies);
} else {
llvm_unreachable("Unexpected module dependency kind.");
// Add the dependency-kind-specific data
switch (dependencyInfo.getKind()) {
case swift::ModuleDependenciesKind::SwiftTextual: {
auto swiftTextDeps = dependencyInfo.getAsSwiftTextualModule();
assert(swiftTextDeps);
if (swiftTextDeps->swiftInterfaceFile)
addIdentifier(swiftTextDeps->swiftInterfaceFile.getValue());
addArray(moduleID, ModuleIdentifierArrayKind::CompiledModuleCandidates,
swiftTextDeps->compiledModuleCandidates);
addArray(moduleID, ModuleIdentifierArrayKind::BuildCommandLine,
swiftTextDeps->buildCommandLine);
addArray(moduleID, ModuleIdentifierArrayKind::ExtraPCMArgs,
swiftTextDeps->extraPCMArgs);
addIdentifier(swiftTextDeps->contextHash);
if (swiftTextDeps->bridgingHeaderFile)
addIdentifier(swiftTextDeps->bridgingHeaderFile.getValue());
addArray(moduleID, ModuleIdentifierArrayKind::SourceFiles,
swiftTextDeps->sourceFiles);
addArray(moduleID, ModuleIdentifierArrayKind::BridgingSourceFiles,
swiftTextDeps->bridgingSourceFiles);
addArray(moduleID,
ModuleIdentifierArrayKind::BridgingModuleDependencies,
swiftTextDeps->bridgingModuleDependencies);
break;
}
case swift::ModuleDependenciesKind::SwiftBinary: {
auto swiftBinDeps = dependencyInfo.getAsSwiftBinaryModule();
assert(swiftBinDeps);
addIdentifier(swiftBinDeps->compiledModulePath);
addIdentifier(swiftBinDeps->moduleDocPath);
addIdentifier(swiftBinDeps->sourceInfoPath);
break;
}
case swift::ModuleDependenciesKind::SwiftPlaceholder: {
auto swiftPHDeps = dependencyInfo.getAsPlaceholderDependencyModule();
assert(swiftPHDeps);
addIdentifier(swiftPHDeps->compiledModulePath);
addIdentifier(swiftPHDeps->moduleDocPath);
addIdentifier(swiftPHDeps->sourceInfoPath);
break;
}
case swift::ModuleDependenciesKind::Clang: {
auto clangDeps = dependencyInfo.getAsClangModule();
assert(clangDeps);
addIdentifier(clangDeps->moduleMapFile);
addIdentifier(clangDeps->contextHash);
addArray(moduleID, ModuleIdentifierArrayKind::NonPathCommandLine,
clangDeps->nonPathCommandLine);
addArray(moduleID, ModuleIdentifierArrayKind::FileDependencies,
clangDeps->fileDependencies);
break;
}
}
}
}
}
@@ -888,10 +917,12 @@ void Serializer::writeInterModuleDependenciesCache(
// Write the core graph
for (auto &moduleID : cache.getAllModules()) {
auto dependencyInfo =
cache.findDependencies(moduleID.first, moduleID.second);
assert(dependencyInfo.hasValue() && "Expected dependency info.");
writeModuleInfo(moduleID, dependencyInfo.getValue());
auto dependencyInfos = cache.findAllDependenciesIrrespectiveOfSearchPaths(
moduleID.first, moduleID.second);
assert(dependencyInfos.hasValue() && "Expected dependency info.");
for (auto &dependencyInfo : *dependencyInfos) {
writeModuleInfo(moduleID, dependencyInfo);
}
}
return;