Merge remote-tracking branch 'origin/main' into rebranch

This commit is contained in:
swift-ci
2025-08-11 09:35:30 -07:00
4 changed files with 23 additions and 24 deletions

View File

@@ -22,6 +22,7 @@
#include "swift/Basic/Feature.h"
#include "swift/Basic/FunctionBodySkipping.h"
#include "swift/Basic/LLVM.h"
#include "swift/Basic/Platform.h"
#include "swift/Basic/PlaygroundOption.h"
#include "swift/Basic/Version.h"
#include "swift/Config.h"
@@ -693,18 +694,7 @@ namespace swift {
/// This is only implemented on certain OSs. If no target has been
/// configured, returns v0.0.0.
llvm::VersionTuple getMinPlatformVersion() const {
if (Target.isMacOSX()) {
llvm::VersionTuple OSVersion;
Target.getMacOSXVersion(OSVersion);
return OSVersion;
} else if (Target.isiOS()) {
return Target.getiOSVersion();
} else if (Target.isWatchOS()) {
return Target.getOSVersion();
} else if (Target.isXROS()) {
return Target.getOSVersion();
}
return llvm::VersionTuple(/*Major=*/0, /*Minor=*/0, /*Subminor=*/0);
return getVersionForTriple(Target);
}
/// Sets an implicit platform condition.

View File

@@ -85,6 +85,9 @@ namespace swift {
/// returned.
StringRef getPlatformNameForTriple(const llvm::Triple &triple);
/// Returns the version tuple for a given target triple
llvm::VersionTuple getVersionForTriple(const llvm::Triple &triple);
/// Returns the platform Kind for Darwin triples.
DarwinPlatformKind getDarwinPlatformKind(const llvm::Triple &triple);