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

[Modules] Allow implicit conversions when loading interfaces with invalid os versions (#82228)

Browse Source 
Initially, the compiler rejected building dependencies that contained OS
versions in an invalid range. However, this happens to be quite
disruptive, so instead allow it and request that these versions be
implicitly bumped based on what `llvm::Triple::getCanonicalVersionForOS`
computes.

resolves: rdar://153205856
This commit is contained in:
Cyndy Ishida
2025-06-16 12:46:32 -07:00
committed by GitHub
parent 060c9f4c5f
commit 64168edbf5
6 changed files with 126 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -1479,43 +1479,27 @@ bool swift::extractCompilerFlagsFromInterface(
shouldModify = true;
}
// Diagnose if the version in the target triple parsed from the
// swiftinterface is invalid for the OS.
const llvm::VersionTuple originalVer = triple.getOSVersion();
bool isValidVersion =
llvm::Triple::isValidVersionForOS(triple.getOS(), originalVer);
if (!isValidVersion) {
// Canonicalize the version in the target triple parsed from the
// swiftinterface.
auto canonicalTriple = getCanonicalTriple(triple);
if (!canonicalTriple.has_value()) {
if (Diag) {
const llvm::VersionTuple OSVersion = triple.getOSVersion();
const bool isOSVersionInValidRange =
llvm::Triple::isValidVersionForOS(triple.getOS(), OSVersion);
const llvm::VersionTuple canonicalVersion =
llvm::Triple::getCanonicalVersionForOS(
triple.getOS(), triple.getOSVersion(), isOSVersionInValidRange);
Diag->diagnose(SourceLoc(),
diag::target_os_version_from_textual_interface_invalid,
triple.str(), interfacePath);
diag::map_os_version_from_textual_interface_failed,
OSVersion.getAsString(), canonicalVersion.getAsString(),
interfacePath);
}
break;
}
// Canonicalize the version in the target triple parsed from the
// swiftinterface.
llvm::VersionTuple newVer = llvm::Triple::getCanonicalVersionForOS(
triple.getOS(), originalVer, isValidVersion);
if (originalVer != newVer) {
std::string originalOSName = triple.getOSName().str();
std::string originalVerStr = originalVer.getAsString();
std::string newVerStr = newVer.getAsString();
const int OSNameWithoutVersionLength =
originalOSName.size() - originalVerStr.size();
if (!StringRef(originalOSName).ends_with(originalVerStr) ||
(OSNameWithoutVersionLength <= 0)) {
if (Diag) {
Diag->diagnose(SourceLoc(),
diag::map_os_version_from_textual_interface_failed,
originalVerStr, newVerStr, interfacePath);
}
break;
}
llvm::SmallString<64> buffer(
originalOSName.substr(0, OSNameWithoutVersionLength));
buffer.append(newVerStr);
triple.setOSName(buffer.str());
// Update the triple to use if it differs.
if (!areTriplesStrictlyEqual(triple, *canonicalTriple)) {
triple = *canonicalTriple;
shouldModify = true;
}
if (shouldModify)