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 #72067 from artemcm/FixTransitiveHeaderLookupInDependencyScan

Browse Source 
[Dependency Scanning] Scan header inputs of binary Swift module dependencies
This commit is contained in:
Artem Chikin
2024-03-06 16:05:12 -08:00
committed by GitHub
parent ce21af54d8 bfa8c0ee4f
commit d113ea11ac
16 changed files with 300 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -403,7 +403,7 @@ SerializedModuleLoaderBase::getImportsOfModule(
return moduleBuf.getError();
llvm::StringSet<> importedModuleNames;
llvm::StringSet<> importedHeaders;
std::string importedHeader = "";
// Load the module file without validation.
std::shared_ptr<const ModuleFileSharedCore> loadedModuleFile;
serialization::ValidationInfo loadInfo = ModuleFileSharedCore::load(
@@ -413,7 +413,9 @@ SerializedModuleLoaderBase::getImportsOfModule(
for (const auto &dependency : loadedModuleFile->getDependencies()) {
if (dependency.isHeader()) {
importedHeaders.insert(dependency.RawPath);
assert(importedHeader.empty() &&
"Unexpected more than one header dependency");
importedHeader = dependency.RawPath;
continue;
}
@@ -436,7 +438,7 @@ SerializedModuleLoaderBase::getImportsOfModule(
importedModuleNames.insert(moduleName);
}
return SerializedModuleLoaderBase::BinaryModuleImports{importedModuleNames, importedHeaders};
return SerializedModuleLoaderBase::BinaryModuleImports{importedModuleNames, importedHeader};
}
llvm::ErrorOr<ModuleDependencyInfo>
@@ -479,22 +481,7 @@ SerializedModuleLoaderBase::scanModuleFile(Twine modulePath, bool isFramework) {
return N.str();
});
auto importedHeaderSet = binaryModuleImports.get().headerImports;
std::vector<std::string> importedHeaders;
// FIXME: We only record these dependencies in CAS mode, because
// we require explicit PCH tasks to be produced for imported header
// of binary module dependencies. In the meantime, in non-CAS mode
// loading clients will consume the `.h` files encoded in the `.swiftmodules`
// directly.
if (Ctx.CASOpts.EnableCaching) {
importedHeaders.reserve(importedHeaderSet.size());
llvm::transform(importedHeaderSet.keys(),
std::back_inserter(importedHeaders),
[](llvm::StringRef N) {
return N.str();
});
}
auto importedHeader = binaryModuleImports.get().headerImport;
auto &importedOptionalModuleSet = binaryModuleOptionalImports.get().moduleImports;
std::vector<std::string> importedOptionalModuleNames;
for (const auto optionalImportedModule : importedOptionalModuleSet.keys())
@@ -505,7 +492,7 @@ SerializedModuleLoaderBase::scanModuleFile(Twine modulePath, bool isFramework) {
auto dependencies = ModuleDependencyInfo::forSwiftBinaryModule(
modulePath.str(), moduleDocPath, sourceInfoPath,
importedModuleNames, importedOptionalModuleNames,
importedHeaders, isFramework, /*module-cache-key*/ "");
importedHeader, isFramework, /*module-cache-key*/ "");
return std::move(dependencies);
}