Skip to content

Commit 1869832

Browse files
jckarterjckarter
authored
Merge pull request #82153 from tshortli/rhombicuboctahedron
Upstream support for the Xcode 26 SDKs
2 parents 6164af2 + b3273f7 commit 1869832

34 files changed

+576
-166
lines changed

‎include/swift/AST/AvailabilityDomain.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,10 @@ class AvailabilityDomain final {
209209
/// version ranges.
210210
bool isVersioned() const;
211211

212+
/// Returns true if the given version is a valid version number for this
213+
/// domain. It is an error to call this on an un-versioned domain.
214+
bool isVersionValid(const llvm::VersionTuple &version) const;
215+
212216
/// Returns true if availability of the domain can be refined using
213217
/// `@available` attributes and `if #available` queries. If not, then the
214218
/// domain's availability is fixed by compilation settings. For example,

‎include/swift/AST/DiagnosticsSema.def

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -891,6 +891,14 @@ ERROR(serialization_failed,none,
891891
WARNING(can_import_invalid_swiftmodule,none,
892892
"canImport() evaluated to false due to invalid swiftmodule: %0", (StringRef))
893893

894+
ERROR(map_os_version_from_textual_interface_failed,none,
895+
"failed to map OS version from %0 to %1 in %2",
896+
(StringRef, StringRef, StringRef))
897+
898+
ERROR(target_os_version_from_textual_interface_invalid,none,
899+
"invalid target triple %0 in %1",
900+
(StringRef, StringRef))
901+
894902
ERROR(serialization_load_failed,Fatal,
895903
"failed to load module '%0'", (StringRef))
896904
ERROR(module_interface_build_failed,Fatal,
@@ -6929,6 +6937,9 @@ GROUPED_ERROR(availability_suggest_platform_name,
69296937
(Identifier, StringRef))
69306938
WARNING(availability_unsupported_version_number, none,
69316939
"'%0' is not a supported version number", (llvm::VersionTuple))
6940+
WARNING(availability_invalid_version_number_for_domain, none,
6941+
"'%0' is not a valid version number for %1",
6942+
(llvm::VersionTuple, AvailabilityDomain))
69326943

69336944
WARNING(attr_availability_expected_deprecated_version, none,
69346945
"expected version number with 'deprecated' in '%0' attribute for %1",

‎include/swift/AST/PlatformKind.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "swift/Config.h"
2222
#include "llvm/ADT/StringRef.h"
2323
#include "llvm/Support/VersionTuple.h"
24+
#include "llvm/TargetParser/Triple.h"
2425
#include <optional>
2526

2627
namespace swift {
@@ -91,6 +92,10 @@ PlatformKind targetVariantPlatform(const LangOptions &LangOpts);
9192
/// an explicit attribute for the child.
9293
bool inheritsAvailabilityFromPlatform(PlatformKind Child, PlatformKind Parent);
9394

95+
/// Returns the LLVM triple OS type for the given platform, if there is one.
96+
std::optional<llvm::Triple::OSType>
97+
tripleOSTypeForPlatform(PlatformKind platform);
98+
9499
llvm::VersionTuple canonicalizePlatformVersion(
95100
PlatformKind platform, const llvm::VersionTuple &version);
96101

‎include/swift/Serialization/SerializedModuleLoader.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,8 @@ class SerializedASTFile final : public LoadedFile {
580580
bool extractCompilerFlagsFromInterface(
581581
StringRef interfacePath, StringRef buffer, llvm::StringSaver &ArgSaver,
582582
SmallVectorImpl<const char *> &SubArgs,
583-
std::optional<llvm::Triple> PreferredTarget = std::nullopt);
583+
std::optional<llvm::Triple> PreferredTarget = std::nullopt,
584+
DiagnosticEngine *diagEngine = nullptr);
584585

585586
/// Extract the user module version number from an interface file.
586587
llvm::VersionTuple extractUserModuleVersionFromInterface(StringRef moduleInterfacePath);

‎lib/AST/Attr.cpp

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2375,16 +2375,13 @@ static StringRef getLinkerModuleName(StringRef OriginalModuleName) {
23752375
}
23762376

23772377
OriginallyDefinedInAttr::OriginallyDefinedInAttr(
2378-
SourceLoc AtLoc, SourceRange Range,
2379-
StringRef OriginalModuleName,
2380-
PlatformKind Platform,
2381-
const llvm::VersionTuple MovedVersion, bool Implicit)
2382-
: DeclAttribute(DeclAttrKind::OriginallyDefinedIn, AtLoc, Range,
2383-
Implicit),
2384-
ManglingModuleName(getManglingModuleName(OriginalModuleName)),
2385-
LinkerModuleName(getLinkerModuleName(OriginalModuleName)),
2386-
Platform(Platform),
2387-
MovedVersion(MovedVersion) {}
2378+
SourceLoc AtLoc, SourceRange Range, StringRef OriginalModuleName,
2379+
PlatformKind Platform, const llvm::VersionTuple MovedVersion, bool Implicit)
2380+
: DeclAttribute(DeclAttrKind::OriginallyDefinedIn, AtLoc, Range, Implicit),
2381+
ManglingModuleName(getManglingModuleName(OriginalModuleName)),
2382+
LinkerModuleName(getLinkerModuleName(OriginalModuleName)),
2383+
Platform(Platform),
2384+
MovedVersion(canonicalizePlatformVersion(Platform, MovedVersion)) {}
23882385

23892386
std::optional<OriginallyDefinedInAttr::ActiveVersion>
23902387
OriginallyDefinedInAttr::isActivePlatform(const ASTContext &ctx) const {

‎lib/AST/Availability.cpp

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,14 +832,27 @@ SemanticAvailableAttrRequest::evaluate(swift::Evaluator &evaluator,
832832

833833
auto checkVersion = [&](std::optional<llvm::VersionTuple> version,
834834
SourceRange sourceRange) {
835-
if (version && !VersionRange::isValidVersion(*version)) {
835+
if (!version)
836+
return false;
837+
838+
if (!VersionRange::isValidVersion(*version)) {
836839
diags
837840
.diagnose(attrLoc, diag::availability_unsupported_version_number,
838841
*version)
839842
.highlight(sourceRange);
840843
return true;
841844
}
842845

846+
// Warn if the version is not a valid one for the domain. For example, macOS
847+
// 17 will never exist.
848+
if (domain->isVersioned() && !domain->isVersionValid(*version)) {
849+
diags
850+
.diagnose(attrLoc,
851+
diag::availability_invalid_version_number_for_domain,
852+
*version, *domain)
853+
.highlight(sourceRange);
854+
}
855+
843856
return false;
844857
};
845858

‎lib/AST/AvailabilityDomain.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,26 @@ bool AvailabilityDomain::isVersioned() const {
109109
}
110110
}
111111

112+
bool AvailabilityDomain::isVersionValid(
113+
const llvm::VersionTuple &version) const {
114+
ASSERT(isVersioned());
115+
116+
switch (getKind()) {
117+
case Kind::Universal:
118+
case Kind::Embedded:
119+
llvm_unreachable("unexpected domain kind");
120+
case Kind::SwiftLanguage:
121+
case Kind::PackageDescription:
122+
return true;
123+
case Kind::Platform:
124+
if (auto osType = tripleOSTypeForPlatform(getPlatformKind()))
125+
return llvm::Triple::isValidVersionForOS(*osType, version);
126+
return true;
127+
case Kind::Custom:
128+
return true;
129+
}
130+
}
131+
112132
bool AvailabilityDomain::supportsContextRefinement() const {
113133
switch (getKind()) {
114134
case Kind::Universal:

‎lib/AST/PlatformKind.cpp

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -263,15 +263,43 @@ bool swift::inheritsAvailabilityFromPlatform(PlatformKind Child,
263263
return false;
264264
}
265265

266-
llvm::VersionTuple swift::canonicalizePlatformVersion(
267-
PlatformKind platform, const llvm::VersionTuple &version) {
268-
269-
// Canonicalize macOS version for macOS Big Sur to treat
270-
// 10.16 as 11.0.
271-
if (platform == PlatformKind::macOS ||
272-
platform == PlatformKind::macOSApplicationExtension) {
273-
return llvm::Triple::getCanonicalVersionForOS(llvm::Triple::MacOSX,
274-
version);
266+
std::optional<llvm::Triple::OSType>
267+
swift::tripleOSTypeForPlatform(PlatformKind platform) {
268+
switch (platform) {
269+
case PlatformKind::macOS:
270+
case PlatformKind::macOSApplicationExtension:
271+
return llvm::Triple::MacOSX;
272+
case PlatformKind::iOS:
273+
case PlatformKind::iOSApplicationExtension:
274+
case PlatformKind::macCatalyst:
275+
case PlatformKind::macCatalystApplicationExtension:
276+
return llvm::Triple::IOS;
277+
case PlatformKind::tvOS:
278+
case PlatformKind::tvOSApplicationExtension:
279+
return llvm::Triple::TvOS;
280+
case PlatformKind::watchOS:
281+
case PlatformKind::watchOSApplicationExtension:
282+
return llvm::Triple::WatchOS;
283+
case PlatformKind::visionOS:
284+
case PlatformKind::visionOSApplicationExtension:
285+
return llvm::Triple::XROS;
286+
case PlatformKind::OpenBSD:
287+
return llvm::Triple::OpenBSD;
288+
case PlatformKind::Windows:
289+
return llvm::Triple::Win32;
290+
case PlatformKind::none:
291+
return std::nullopt;
292+
}
293+
llvm_unreachable("bad PlatformKind");
294+
}
295+
296+
llvm::VersionTuple
297+
swift::canonicalizePlatformVersion(PlatformKind platform,
298+
const llvm::VersionTuple &version) {
299+
if (auto osType = tripleOSTypeForPlatform(platform)) {
300+
bool isInValidRange = llvm::Triple::isValidVersionForOS(*osType, version);
301+
return llvm::Triple::getCanonicalVersionForOS(*osType, version,
302+
isInValidRange);
275303
}
276304

277305
return version;

‎lib/Frontend/ModuleInterfaceLoader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1547,7 +1547,7 @@ static bool readSwiftInterfaceVersionAndArgs(
15471547

15481548
if (extractCompilerFlagsFromInterface(interfacePath, SB, ArgSaver,
15491549
interfaceInfo.Arguments,
1550-
preferredTarget)) {
1550+
preferredTarget, &Diags)) {
15511551
InterfaceSubContextDelegateImpl::diagnose(
15521552
interfacePath, diagnosticLoc, SM, &Diags,
15531553
diag::error_extracting_version_from_module_interface);

‎lib/Serialization/SerializedModuleLoader.cpp

Lines changed: 56 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,30 +1470,70 @@ static std::optional<StringRef> getFlagsFromInterfaceFile(StringRef &file,
14701470
bool swift::extractCompilerFlagsFromInterface(
14711471
StringRef interfacePath, StringRef buffer, llvm::StringSaver &ArgSaver,
14721472
SmallVectorImpl<const char *> &SubArgs,
1473-
std::optional<llvm::Triple> PreferredTarget) {
1473+
std::optional<llvm::Triple> PreferredTarget, DiagnosticEngine *Diag) {
14741474
auto FlagMatch = getFlagsFromInterfaceFile(buffer, SWIFT_MODULE_FLAGS_KEY);
14751475
if (!FlagMatch)
14761476
return true;
14771477
llvm::cl::TokenizeGNUCommandLine(*FlagMatch, ArgSaver, SubArgs);
14781478

1479-
// If the target triple parsed from the Swift interface file differs
1480-
// only in subarchitecture from the compatible target triple, then
1481-
// we have loaded a Swift interface from a different-but-compatible
1482-
// architecture slice. Use the compatible subarchitecture.
1483-
if (PreferredTarget) {
1484-
for (unsigned I = 1; I < SubArgs.size(); ++I) {
1485-
if (strcmp(SubArgs[I - 1], "-target") != 0 &&
1486-
strcmp(SubArgs[I - 1], "-target-variant") != 0)
1487-
continue;
1479+
for (unsigned I = 1; I < SubArgs.size(); ++I) {
1480+
if (strcmp(SubArgs[I - 1], "-target") != 0 &&
1481+
strcmp(SubArgs[I - 1], "-target-variant") != 0)
1482+
continue;
14881483

1489-
llvm::Triple triple(SubArgs[I]);
1490-
if (triple.getArch() != PreferredTarget->getArch())
1491-
continue;
1492-
if (triple.getSubArch() == PreferredTarget->getSubArch())
1493-
continue;
1484+
llvm::Triple triple(SubArgs[I]);
1485+
bool shouldModify = false;
1486+
// If the target triple parsed from the swiftinterface file differs
1487+
// only in subarchitecture from the compatible target triple, then
1488+
// we have loaded a Swift interface from a different-but-compatible
1489+
// architecture slice. Use the compatible subarchitecture.
1490+
if (PreferredTarget && triple.getArch() == PreferredTarget->getArch() &&
1491+
triple.getSubArch() != PreferredTarget->getSubArch()) {
14941492
triple.setArch(PreferredTarget->getArch(), PreferredTarget->getSubArch());
1495-
SubArgs[I] = ArgSaver.save(triple.str()).data();
1493+
shouldModify = true;
14961494
}
1495+
1496+
// Diagnose if the version in the target triple parsed from the
1497+
// swiftinterface is invalid for the OS.
1498+
const llvm::VersionTuple originalVer = triple.getOSVersion();
1499+
bool isValidVersion =
1500+
llvm::Triple::isValidVersionForOS(triple.getOS(), originalVer);
1501+
if (!isValidVersion) {
1502+
if (Diag) {
1503+
Diag->diagnose(SourceLoc(),
1504+
diag::target_os_version_from_textual_interface_invalid,
1505+
triple.str(), interfacePath);
1506+
}
1507+
break;
1508+
}
1509+
1510+
// Canonicalize the version in the target triple parsed from the
1511+
// swiftinterface.
1512+
llvm::VersionTuple newVer = llvm::Triple::getCanonicalVersionForOS(
1513+
triple.getOS(), originalVer, isValidVersion);
1514+
if (originalVer != newVer) {
1515+
std::string originalOSName = triple.getOSName().str();
1516+
std::string originalVerStr = originalVer.getAsString();
1517+
std::string newVerStr = newVer.getAsString();
1518+
const int OSNameWithoutVersionLength =
1519+
originalOSName.size() - originalVerStr.size();
1520+
if (!StringRef(originalOSName).ends_with(originalVerStr) ||
1521+
(OSNameWithoutVersionLength <= 0)) {
1522+
if (Diag) {
1523+
Diag->diagnose(SourceLoc(),
1524+
diag::map_os_version_from_textual_interface_failed,
1525+
originalVerStr, newVerStr, interfacePath);
1526+
}
1527+
break;
1528+
}
1529+
llvm::SmallString<64> buffer(
1530+
originalOSName.substr(0, OSNameWithoutVersionLength));
1531+
buffer.append(newVerStr);
1532+
triple.setOSName(buffer.str());
1533+
shouldModify = true;
1534+
}
1535+
if (shouldModify)
1536+
SubArgs[I] = ArgSaver.save(triple.str()).data();
14971537
}
14981538

14991539
auto IgnFlagMatch =

‎stdlib/public/Concurrency/DispatchGlobalExecutor.cpp

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -314,22 +314,10 @@ clock_and_value_to_time(int clock, long long sec, long long nsec) {
314314
case swift_clock_id_continuous:
315315
return value | DISPATCH_UP_OR_MONOTONIC_TIME_MASK;
316316
case swift_clock_id_wall: {
317-
#if defined(_WIN32)
318-
struct timespec ts = {
319-
.tv_sec = sec,
320-
.tv_nsec = static_cast<long>(nsec)
321-
};
322-
#elif defined(__APPLE__)
323-
struct timespec ts = {
324-
.tv_sec = static_cast<__darwin_time_t>(sec),
325-
.tv_nsec = nsec
317+
struct timespec ts = {
318+
.tv_sec = static_cast<decltype(ts.tv_sec)>(sec),
319+
.tv_nsec = static_cast<decltype(ts.tv_nsec)>(nsec)
326320
};
327-
#else
328-
struct timespec ts = {
329-
.tv_sec = static_cast<long>(sec),
330-
.tv_nsec = static_cast<long>(nsec)
331-
};
332-
#endif
333321
return dispatch_walltime(&ts, 0);
334322
}
335323
}

‎test/ClangImporter/Inputs/custom-modules/MacOSVersionCanonicalization.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,20 @@ void FunctionIntroducedIn10_16();
44
__attribute__((availability(macosx,introduced=11.0)))
55
void FunctionIntroducedIn11_0();
66

7+
__attribute__((availability(macosx,introduced=16.0)))
8+
void FunctionIntroducedIn16_0();
9+
10+
__attribute__((availability(macosx,introduced=26.0)))
11+
void FunctionIntroducedIn26_0();
12+
713
__attribute__((availability(macosx_app_extension,introduced=10.16)))
814
void FunctionIntroducedIn10_16AppExt();
915

1016
__attribute__((availability(macosx_app_extension,introduced=11.0)))
1117
void FunctionIntroducedIn11_0AppExt();
18+
19+
__attribute__((availability(macosx_app_extension,introduced=16.0)))
20+
void FunctionIntroducedIn16_0AppExt();
21+
22+
__attribute__((availability(macosx_app_extension,introduced=26.0)))
23+
void FunctionIntroducedIn26_0AppExt();

‎test/ClangImporter/availability_macosx_canonical_versions.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,11 @@ FunctionIntroducedIn10_16()
1111
FunctionIntroducedIn11_0()
1212
// expected-error@-1 {{'FunctionIntroducedIn11_0()' is only available in macOS 11.0 or newer}}
1313
// expected-note@-2 {{add 'if #available' version check}}
14+
15+
FunctionIntroducedIn16_0()
16+
// expected-error@-1 {{'FunctionIntroducedIn16_0()' is only available in macOS 26.0 or newer}}
17+
// expected-note@-2 {{add 'if #available' version check}}
18+
19+
FunctionIntroducedIn26_0()
20+
// expected-error@-1 {{'FunctionIntroducedIn26_0()' is only available in macOS 26.0 or newer}}
21+
// expected-note@-2 {{add 'if #available' version check}}

‎test/ClangImporter/availability_macosx_canonical_versions_appext.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,11 @@ FunctionIntroducedIn10_16AppExt()
1111
FunctionIntroducedIn11_0AppExt()
1212
// expected-error@-1 {{'FunctionIntroducedIn11_0AppExt()' is only available in application extensions for macOS 11.0 or newer}}
1313
// expected-note@-2 {{add 'if #available' version check}}
14+
15+
FunctionIntroducedIn16_0AppExt()
16+
// expected-error@-1 {{'FunctionIntroducedIn16_0AppExt()' is only available in application extensions for macOS 26.0 or newer}}
17+
// expected-note@-2 {{add 'if #available' version check}}
18+
19+
FunctionIntroducedIn26_0AppExt()
20+
// expected-error@-1 {{'FunctionIntroducedIn26_0AppExt()' is only available in application extensions for macOS 26.0 or newer}}
21+
// expected-note@-2 {{add 'if #available' version check}}

‎test/Constraints/operator_availability.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ public func ~><T> (lhs: T, rhs: (T) -> Void) -> T {
3737
}
3838

3939
struct S {
40-
@available(macOS 20, *)
40+
@available(macOS 50, *)
4141
func f() {}
4242
}
4343

4444
let s = S() ~> {
45-
if #available(macOS 20.0, *) {
45+
if #available(macOS 50.0, *) {
4646
$0.f()
4747
}
4848
}

0 commit comments

Comments
 (0)