Skip to content

Commit b74fc0e

Browse files
committed
Add temporary 'SwiftCompatibilitySpan 6.2' availability macro
1 parent af1f652 commit b74fc0e

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

test/lit.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ def availability_macro_to_swift_abi_target_triple(macro):
502502
# Use a regex and split to pull out the components of an availability macro
503503
# that is formatted like this:
504504
# SwiftStdlib 5.0:macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2
505-
matches = re.search(r'^[\s]*SwiftStdlib[\s]+([0-9\.]+)[\s]*:[\s]*(.+)', macro)
505+
matches = re.search(r'^[\s]*Swift(?:Stdlib|CompatibilitySpan)[\s]+([0-9\.]+)[\s]*:[\s]*(.+)', macro)
506506
stdlib_vers = matches.group(1)
507507
vers_by_platform = {}
508508
for platform_vers in matches.group(2).split(', '):

utils/availability-macros.def

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ SwiftStdlib 5.10:macOS 14.4, iOS 17.4, watchOS 10.4, tvOS 17.4, visionOS 1.1
3838
SwiftStdlib 6.0:macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0
3939
SwiftStdlib 6.1:macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, visionOS 9999
4040
SwiftStdlib 6.2:macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, visionOS 9999
41+
42+
# Note: This cannot be 9999, so use the last non-placeholder entry instead.
43+
# This will go away once 'SwiftStdlib 6.2' is filled in.
44+
SwiftCompatibilitySpan 6.2:macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0
45+
4146
# TODO: When you add a new version, remember to tell the compiler about it
4247
# by also adding it to include/swift/AST/RuntimeVersions.def.
4348

0 commit comments

Comments
 (0)