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

[next] Use new VersionTuple API

Browse Source 
The `VersionTuple` API was changed llvm/llvm-project
219672b8dd06c4765185fa3161c98437d49b4a1b to return `VersionTuple`
from `get*Version` rather than pass in major, minor, and subminor output
parameters. Update uses to the new API.

Note that `getMacOSXVersion` is slightly different in that it returns a
boolean while taking a `VersionTuple` output parameter to match its
previous behaviour. There doesn't seem to be any use that actually
checks this value though, so we should either update the API to return
an `Optional` and actually check it *or* remove the "failure" case and
return a `VersionTuple` like all the others.
This commit is contained in:
Ben Barham
2022-04-25 17:00:51 -07:00
parent 68296c9037
commit 114b4d96e4
8 changed files with 71 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Serialization/ModuleFile.cpp
View File

@@ -79,15 +79,15 @@ static bool areCompatibleOSs(const llvm::Triple &moduleTarget,
static bool isTargetTooNew(const llvm::Triple &moduleTarget,
const llvm::Triple &ctxTarget) {
unsigned major, minor, micro;
if (moduleTarget.isMacOSX()) {
moduleTarget.getMacOSXVersion(major, minor, micro);
return ctxTarget.isMacOSXVersionLT(major, minor, micro);
llvm::VersionTuple osVersion;
moduleTarget.getMacOSXVersion(osVersion);
// TODO: Add isMacOSXVersionLT(Triple) API (or taking a VersionTuple)
return ctxTarget.isMacOSXVersionLT(osVersion.getMajor(),
osVersion.getMinor().getValueOr(0),
osVersion.getSubminor().getValueOr(0));
}
moduleTarget.getOSVersion(major, minor, micro);
return ctxTarget.isOSVersionLT(major, minor, micro);
return ctxTarget.isOSVersionLT(moduleTarget);
}
ModuleFile::ModuleFile(std::shared_ptr<const ModuleFileSharedCore> core)