mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
9c76e0d1bf
When synthesizing a declaration and inferring its availability, the synthesized attribute should factor in unavailability of the parent declarations. This recently regressed with https://github.com/apple/swift/pull/63361. However, the previous implementation did not produce correct results, either, because the logic for merging availability attributes produced a non-sensical result when both `unavailable` and `introduced:` availability attributes were merged. For example, this was the result for the synthesized `unownedExecutor` property of an actor when the actor was marked unavailable: ``` @available(macOS, unavailable) actor A { // Incorrectly synthesized availability for `unownedExecutor` which results from merging // the unavailability of the parent and the availability of the UnownedSerialExecutor type. @available(macOS, unavailable, introduced: macOS 10.15) @_semantics("defaultActor") nonisolated final var unownedExecutor: UnownedSerialExecutor { get } } ``` This is fixed by omitting all version components from the synthesized attribute when the overall attribute kind is "unavailable". Additionally, I discovered that the `concurrency_availability.swift` test case was no longer testing what it intended to test. The conformances to `Actor` for each `actor` in the test were no longer being synthesized and therefore `unownedExecutor` was not being synthesized. That was fixed by importing the `_Concurrency` module directly, which seems to be necessary because of the `-parse-stdlib` flag in the test. Resolves rdar://106055566
69 lines
2.8 KiB
Swift
69 lines
2.8 KiB
Swift
// RUN: %empty-directory(%t)
|
|
// RUN: %target-swift-emit-module-interface(%t/Library.swiftinterface) %s -module-name Library -target %target-swift-abi-5.3-triple
|
|
// RUN: %target-swift-typecheck-module-from-interface(%t/Library.swiftinterface) -module-name Library
|
|
// RUN: %FileCheck %s < %t/Library.swiftinterface
|
|
|
|
// REQUIRES: VENDOR=apple
|
|
|
|
// CHECK: #if compiler(>=5.3) && $Actors
|
|
// CHECK-NEXT: public actor ActorWithImplicitAvailability {
|
|
public actor ActorWithImplicitAvailability {
|
|
// CHECK: @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
|
|
// CHECK-NEXT: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor {
|
|
// CHECK-NEXT: get
|
|
// CHECK-NEXT: }
|
|
}
|
|
// CHECK: #endif
|
|
|
|
// CHECK: #if compiler(>=5.3) && $Actors
|
|
// CHECK-NEXT: @available(macOS 10.15.4, iOS 13.4, watchOS 6.2, tvOS 13.4, *)
|
|
// CHECK-NEXT: public actor ActorWithExplicitAvailability {
|
|
@available(SwiftStdlib 5.2, *)
|
|
public actor ActorWithExplicitAvailability {
|
|
// CHECK: @available(iOS 13.4, tvOS 13.4, watchOS 6.2, macOS 10.15.4, *)
|
|
// CHECK-NEXT: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor {
|
|
// CHECK-NEXT: get
|
|
// CHECK-NEXT: }
|
|
}
|
|
// CHECK: #endif
|
|
|
|
// CHECK: #if compiler(>=5.3) && $Actors
|
|
// CHECK-NEXT: @_hasMissingDesignatedInitializers @available(macOS, unavailable)
|
|
// CHECK-NEXT: public actor UnavailableActor {
|
|
@available(macOS, unavailable)
|
|
public actor UnavailableActor {
|
|
// CHECK: @available(iOS 13.0, tvOS 13.0, watchOS 6.0, *)
|
|
// CHECK-NEXT: @available(macOS, unavailable)
|
|
// CHECK-NEXT: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor {
|
|
// CHECK-NEXT: get
|
|
// CHECK-NEXT: }
|
|
}
|
|
// CHECK: #endif
|
|
|
|
// CHECK: @available(macOS 10.15.4, iOS 13.4, watchOS 6.2, tvOS 13.4, *)
|
|
// CHECK-NEXT: public enum Enum {
|
|
@available(SwiftStdlib 5.2, *)
|
|
public enum Enum {
|
|
// CHECK: #if compiler(>=5.3) && $Actors
|
|
// CHECK-NEXT: @_hasMissingDesignatedInitializers public actor NestedActor {
|
|
public actor NestedActor {
|
|
// CHECK: @available(iOS 13.4, tvOS 13.4, watchOS 6.2, macOS 10.15.4, *)
|
|
// CHECK-NEXT: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor {
|
|
// CHECK-NEXT: get
|
|
// CHECK-NEXT: }
|
|
}
|
|
// CHECK: #endif
|
|
}
|
|
|
|
// CHECK: extension Library.Enum {
|
|
extension Enum {
|
|
// CHECK: #if compiler(>=5.3) && $Actors
|
|
// CHECK-NEXT: @_hasMissingDesignatedInitializers public actor ExtensionNestedActor {
|
|
public actor ExtensionNestedActor {
|
|
// CHECK: @available(iOS 13.4, tvOS 13.4, watchOS 6.2, macOS 10.15.4, *)
|
|
// CHECK-NEXT: @_semantics("defaultActor") nonisolated final public var unownedExecutor: _Concurrency.UnownedSerialExecutor {
|
|
// CHECK-NEXT: get
|
|
// CHECK-NEXT: }
|
|
}
|
|
}
|