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 #34244 from artemcm/RefactorScannerBinaryDependencies

Browse Source 
[Dependency Scanner] Refactor ModuleDependencies to represent binary-only Swift modules explicitly
This commit is contained in:
Artem Chikin
2020-10-12 17:03:25 -07:00
committed by GitHub
parent 54fc26f6bd f9d6c6a619
commit 3221734e7b
11 changed files with 358 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -394,8 +394,13 @@ llvm::ErrorOr<ModuleDependencies> SerializedModuleLoaderBase::scanModuleFile(
nullptr,
isFramework, loadedModuleFile);
const std::string moduleDocPath;
const std::string sourceInfoPath;
// Map the set of dependencies over to the "module dependencies".
auto dependencies = ModuleDependencies::forSwiftModule(modulePath.str(), isFramework);
auto dependencies = ModuleDependencies::forSwiftBinaryModule(modulePath.str(),
moduleDocPath,
sourceInfoPath,
isFramework);
llvm::StringSet<> addedModuleNames;
for (const auto &dependency : loadedModuleFile->getDependencies()) {
// FIXME: Record header dependency?