averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71563 from xymus/sdk-version-in-hash

Browse Source 
Serialization: Apply the SDK build version as part of the swiftmodule cache hash
This commit is contained in:
Alexis Laferrière
2024-02-12 16:45:55 -08:00
committed by GitHub
parent 6657349552 86ea594f21
commit 2875980d01
7 changed files with 108 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Serialization/ScanningLoaders.cpp
View File

@@ -154,11 +154,13 @@ SwiftModuleScanner::scanInterfaceFile(Twine moduleInterfacePath,
// name for the module, which includes an appropriate hash.
auto newExt = file_types::getExtension(file_types::TY_SwiftModuleFile);
auto realModuleName = Ctx.getRealModuleName(moduleName);
StringRef sdkPath = Ctx.SearchPathOpts.getSDKPath();
llvm::SmallString<32> modulePath = realModuleName.str();
llvm::sys::path::replace_extension(modulePath, newExt);
llvm::Optional<ModuleDependencyInfo> Result;
std::error_code code = astDelegate.runInSubContext(
realModuleName.str(), moduleInterfacePath.str(), StringRef(), SourceLoc(),
realModuleName.str(), moduleInterfacePath.str(), sdkPath,
StringRef(), SourceLoc(),
[&](ASTContext &Ctx, ModuleDecl *mainMod, ArrayRef<StringRef> BaseArgs,
ArrayRef<StringRef> PCMArgs, StringRef Hash) {
assert(mainMod);