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 #75704 from swiftlang/version-number-hack

Browse Source 
DependencyScanner: report user module version in dependency scanning results for binary Swift modules
This commit is contained in:
Xi Ge
2024-08-06 15:42:39 -07:00
committed by GitHub
parent 31a9cd9b4f b4d64bde55
commit 370bcec229
13 changed files with 70 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -515,12 +515,13 @@ SerializedModuleLoaderBase::scanModuleFile(Twine modulePath, bool isFramework,
std::string definingModulePath =
loadedModuleFile->resolveModuleDefiningFilePath(Ctx.SearchPathOpts.getSDKPath());
std::string userModuleVer = loadedModuleFile->getUserModuleVersion().getAsString();
// Map the set of dependencies over to the "module dependencies".
auto dependencies = ModuleDependencyInfo::forSwiftBinaryModule(
modulePath.str(), moduleDocPath, sourceInfoPath, moduleImports,
optionalModuleImports, linkLibraries, importedHeader,
definingModulePath, isFramework, loadedModuleFile->isStaticLibrary(),
/*module-cache-key*/ "");
/*module-cache-key*/ "", userModuleVer);
return std::move(dependencies);
}