Skip to content

[6.0] Define availability for the 6.0 stdlib & runtime #74367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 14, 2024
Merged

[6.0] Define availability for the 6.0 stdlib & runtime #74367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2870f01
[stdlib] Define availability for SwiftStdlib 6.0
lorentey Jun 12, 2024
2ae6892
[benchmark] Update/fix availability checks
lorentey Jun 12, 2024
6b8140a
[AST] Define runtime version 6.0
lorentey Jun 12, 2024
7ab3622
[AST] Update availability of features targeting 6.0
lorentey Jun 13, 2024
4545a15
[test] Update availability tests
lorentey Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions benchmark/single-source/CharacterRecognizer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import TestsUtils

public var benchmarks: [BenchmarkInfo] {
guard #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) else {
guard #available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *) else {
return []
}
return [
Expand Down Expand Up @@ -82,7 +82,7 @@ let _asciiString = #"""
"""#
let asciiString = String(repeating: _asciiString, count: 10)

@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
@available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *)
func run(string: String, n: Int) {
var state = Unicode._CharacterRecognizer()
var c = 0
Expand Down
73 changes: 39 additions & 34 deletions benchmark/single-source/StringTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,36 +14,43 @@ import TestsUtils
@_spi(_Unicode)
import Swift

public let benchmarks = [
BenchmarkInfo(
name: "StringEqualPointerComparison",
runFunction: run_StringEqualPointerComparison,
tags: [.validation, .api, .String]),
BenchmarkInfo(
name: "StringHasPrefixAscii",
runFunction: run_StringHasPrefixAscii,
tags: [.validation, .api, .String],
legacyFactor: 10),
BenchmarkInfo(
name: "StringHasPrefixUnicode",
runFunction: run_StringHasPrefixUnicode,
tags: [.validation, .api, .String],
legacyFactor: 1000),
BenchmarkInfo(
name: "StringHasSuffixAscii",
runFunction: run_StringHasSuffixAscii,
tags: [.validation, .api, .String],
legacyFactor: 10),
BenchmarkInfo(
name: "StringHasSuffixUnicode",
runFunction: run_StringHasSuffixUnicode,
tags: [.validation, .api, .String],
legacyFactor: 1000),
BenchmarkInfo(
name: "StringIterateWords",
runFunction: run_iterateWords,
tags: [.validation, .String]),
]
public var benchmarks: [BenchmarkInfo] {
var result = [
BenchmarkInfo(
name: "StringEqualPointerComparison",
runFunction: run_StringEqualPointerComparison,
tags: [.validation, .api, .String]),
BenchmarkInfo(
name: "StringHasPrefixAscii",
runFunction: run_StringHasPrefixAscii,
tags: [.validation, .api, .String],
legacyFactor: 10),
BenchmarkInfo(
name: "StringHasPrefixUnicode",
runFunction: run_StringHasPrefixUnicode,
tags: [.validation, .api, .String],
legacyFactor: 1000),
BenchmarkInfo(
name: "StringHasSuffixAscii",
runFunction: run_StringHasSuffixAscii,
tags: [.validation, .api, .String],
legacyFactor: 10),
BenchmarkInfo(
name: "StringHasSuffixUnicode",
runFunction: run_StringHasSuffixUnicode,
tags: [.validation, .api, .String],
legacyFactor: 1000),
]

if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
result.append(
BenchmarkInfo(
name: "StringIterateWords",
runFunction: run_iterateWords,
tags: [.validation, .String]))
}
return result
}

// FIXME(string)
public func run_StringHasPrefixAscii(_ n: Int) {
Expand Down Expand Up @@ -1644,11 +1651,8 @@ architecture on Linux.</p>

extension String {
@inline(never)
@available(SwiftStdlib 5.9, *)
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
var _words: [Substring] {
guard #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) else {
fatalError("Can't run this benchmark")
}
var result: [Substring] = []

var i = startIndex
Expand All @@ -1666,6 +1670,7 @@ extension String {
}
}

@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
public func run_iterateWords(_ n: Int) {
for _ in 0 ..< n {
blackHole(swiftOrgHTML._words)
Expand Down
10 changes: 5 additions & 5 deletions include/swift/AST/FeatureAvailability.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ FEATURE(ConcurrencyDiscardingTaskGroup, (5, 9))
FEATURE(ConcurrencyDistributedActorWithCustomExecutor, (5, 9))
FEATURE(SignedDescriptor, (5, 9))

FEATURE(ObjCSymbolicReferences, (5, 11))
FEATURE(TypedThrows, (5, 11))
FEATURE(StaticReadOnlyArrays, (5, 11))
FEATURE(SwiftExceptionPersonality, (5, 11))
FEATURE(ObjCSymbolicReferences, (6, 0))
FEATURE(TypedThrows, (6, 0))
FEATURE(StaticReadOnlyArrays, (6, 0))
FEATURE(SwiftExceptionPersonality, (6, 0))
// Metadata support for @isolated(any) function types
FEATURE(IsolatedAny, (5, 11))
FEATURE(IsolatedAny, (6, 0))

FEATURE(TaskExecutor, FUTURE)
FEATURE(Differentiation, FUTURE)
Expand Down
13 changes: 10 additions & 3 deletions include/swift/AST/RuntimeVersions.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,19 @@ RUNTIME_VERSION(
PLATFORM(xrOS, (1, 0, 0))
)

END_MAJOR_VERSION(5)

MAJOR_VERSION(6)

RUNTIME_VERSION(
(5, 11),
FUTURE
(6, 0),
PLATFORM(macOS, (15, 0, 0))
PLATFORM(iOS, (18, 0, 0))
PLATFORM(watchOS, (11, 0, 0))
PLATFORM(xrOS, (2, 0, 0))
)

END_MAJOR_VERSION(5)
END_MAJOR_VERSION(6)

// .......................................................................... //

Expand Down
14 changes: 7 additions & 7 deletions stdlib/public/ClangOverlays/float.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public let FLT_RADIX = Double.radix
// significand bit, but Swift does not. Neither is really right or wrong.
@available(swift, deprecated: 3.0, message: "Please use '${type}.significandBitCount + 1'.")
@available(macOS 10.9, iOS 7.0, watchOS 2.0, tvOS 9.0, *)
@_originallyDefinedIn(module: "Darwin", macOS 9999, iOS 9999, watchOS 9999, tvOS 9999)
@_originallyDefinedIn(module: "Darwin", macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0)
public let ${prefix}_MANT_DIG = ${type}.significandBitCount + 1

// Where does the 1 come from? C models floating-point numbers as having a
Expand All @@ -34,32 +34,32 @@ public let ${prefix}_MANT_DIG = ${type}.significandBitCount + 1
// as well.
@available(swift, deprecated: 3.0, message: "Please use '${type}.greatestFiniteMagnitude.exponent + 1'.")
@available(macOS 10.9, iOS 7.0, watchOS 2.0, tvOS 9.0, *)
@_originallyDefinedIn(module: "Darwin", macOS 9999, iOS 9999, watchOS 9999, tvOS 9999)
@_originallyDefinedIn(module: "Darwin", macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0)
public let ${prefix}_MAX_EXP = ${type}.greatestFiniteMagnitude.exponent + 1

@available(swift, deprecated: 3.0, message: "Please use '${type}.leastNormalMagnitude.exponent + 1'.")
@available(macOS 10.9, iOS 7.0, watchOS 2.0, tvOS 9.0, *)
@_originallyDefinedIn(module: "Darwin", macOS 9999, iOS 9999, watchOS 9999, tvOS 9999)
@_originallyDefinedIn(module: "Darwin", macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0)
public let ${prefix}_MIN_EXP = ${type}.leastNormalMagnitude.exponent + 1

@available(swift, deprecated: 3.0, message: "Please use '${type}.greatestFiniteMagnitude' or '.greatestFiniteMagnitude'.")
@available(macOS 10.9, iOS 7.0, watchOS 2.0, tvOS 9.0, *)
@_originallyDefinedIn(module: "Darwin", macOS 9999, iOS 9999, watchOS 9999, tvOS 9999)
@_originallyDefinedIn(module: "Darwin", macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0)
public let ${prefix}_MAX = ${type}.greatestFiniteMagnitude

@available(swift, deprecated: 3.0, message: "Please use '${type}.ulpOfOne' or '.ulpOfOne'.")
@available(macOS 10.9, iOS 7.0, watchOS 2.0, tvOS 9.0, *)
@_originallyDefinedIn(module: "Darwin", macOS 9999, iOS 9999, watchOS 9999, tvOS 9999)
@_originallyDefinedIn(module: "Darwin", macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0)
public let ${prefix}_EPSILON = ${type}.ulpOfOne

@available(swift, deprecated: 3.0, message: "Please use '${type}.leastNormalMagnitude' or '.leastNormalMagnitude'.")
@available(macOS 10.9, iOS 7.0, watchOS 2.0, tvOS 9.0, *)
@_originallyDefinedIn(module: "Darwin", macOS 9999, iOS 9999, watchOS 9999, tvOS 9999)
@_originallyDefinedIn(module: "Darwin", macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0)
public let ${prefix}_MIN = ${type}.leastNormalMagnitude

@available(swift, deprecated: 3.0, message: "Please use '${type}.leastNonzeroMagnitude' or '.leastNonzeroMagnitude'.")
@available(macOS 10.9, iOS 7.0, watchOS 2.0, tvOS 9.0, *)
@_originallyDefinedIn(module: "Darwin", macOS 9999, iOS 9999, watchOS 9999, tvOS 9999)
@_originallyDefinedIn(module: "Darwin", macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0)
public let ${prefix}_TRUE_MIN = ${type}.leastNonzeroMagnitude

% if type == "Float80":
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/core/ErrorType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func _willThrowTypedImpl<E: Error>(_ error: E)
@_alwaysEmitIntoClient
@_silgen_name("swift_willThrowTyped")
public func _willThrowTyped<E: Error>(_ error: E) {
if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, visionOS 9999, *) {
if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
_willThrowTypedImpl(error)
}
}
Expand Down
4 changes: 2 additions & 2 deletions test/ModuleInterface/distributed-actor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public distributed actor DAG<ActorSystem> where ActorSystem: DistributedActorSys
// CHECK: get
// CHECK: }
// CHECK: public init(actorSystem system: ActorSystem)
// CHECK: @available(iOS 9999, tvOS 9999, watchOS 9999, visionOS 9999, macOS 9999, *)
// CHECK: @available(iOS 18.0, tvOS 18.0, watchOS 11.0, visionOS 2.0, macOS 15.0, *)
// CHECK: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor {
// CHECK: get
// CHECK: }
Expand All @@ -84,7 +84,7 @@ public distributed actor DAG<ActorSystem> where ActorSystem: DistributedActorSys
// CHECK-NEXT:extension Library.DA : Swift.Decodable {}

// CHECK-NOT: #if compiler(>=5.3) && $Actors
// CHECK: @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, visionOS 9999, *)
// CHECK: @available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
// CHECK-NEXT: extension Library.DAG : Distributed.DistributedActor {}

//--- Client.swift
Expand Down
2 changes: 1 addition & 1 deletion utils/availability-macros.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ SwiftStdlib 5.7:macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0
SwiftStdlib 5.8:macOS 13.3, iOS 16.4, watchOS 9.4, tvOS 16.4
SwiftStdlib 5.9:macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0
SwiftStdlib 5.10:macOS 14.4, iOS 17.4, watchOS 10.4, tvOS 17.4, visionOS 1.1
SwiftStdlib 6.0:macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, visionOS 9999
SwiftStdlib 6.0:macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0
# TODO: Also update ASTContext::getSwift510Availability when needed
# TODO: Also update ASTContext::getSwift60Availability when needed

Expand Down