mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
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
56 lines
1.7 KiB
Swift
56 lines
1.7 KiB
Swift
// RUN: %target-swift-frontend -parse-stdlib -target x86_64-apple-macosx10.14 -typecheck -verify %s
|
|
// RUN: %target-swift-frontend -parse-stdlib -target x86_64-apple-macosx11 -typecheck %s
|
|
// RUN: %target-swift-frontend -parse-stdlib -target x86_64-apple-macosx12 -typecheck %s -DTARGET_MACOS_12
|
|
// REQUIRES: OS=macosx
|
|
|
|
import _Concurrency
|
|
|
|
func f() async { } // expected-error{{concurrency is only available in}}
|
|
// expected-note@-1{{add @available}}
|
|
|
|
actor A { } // expected-error{{concurrency is only available in}}
|
|
// expected-note@-1{{add @available}}
|
|
|
|
// Allow this without any availability for Historical Reasons.
|
|
public func swift_deletedAsyncMethodError() async {
|
|
}
|
|
|
|
@available(macOS 12.0, *)
|
|
struct S {
|
|
// Ensure that our synthesis of the actor's unownedExecutor does not cause
|
|
// availability errors.
|
|
actor NestedActor {
|
|
}
|
|
|
|
// The synthesized unownedExecutor inside this actor should inherit the
|
|
// un-availability of UnavailableActor.
|
|
@available(macOS, unavailable)
|
|
actor UnavailableActor {
|
|
}
|
|
}
|
|
|
|
#if TARGET_MACOS_12
|
|
// The synthesized unownedExecutor inside this extension on S should inherit
|
|
// availability from S to avoid availability errors.
|
|
extension S {
|
|
actor ExtensionNestedActor {
|
|
}
|
|
}
|
|
#endif
|
|
|
|
// Make sure that the conformances to Actor are actually being synthesized
|
|
// since otherwise this test isn't actually testing what it is designed to test.
|
|
@available(macOS 10.15, *)
|
|
func takesExecutor(_ e: UnownedSerialExecutor) { }
|
|
|
|
@available(macOS 12.0, *)
|
|
func testNestedActorConformance(_ a: S.NestedActor) {
|
|
takesExecutor(a.unownedExecutor)
|
|
}
|
|
|
|
#if TARGET_MACOS_12
|
|
func testExtensionNestedActorConformance(_ a: S.ExtensionNestedActor) {
|
|
takesExecutor(a.unownedExecutor)
|
|
}
|
|
#endif
|