Skip to content

[Distributed] Copy @available and spi for resolvable extensions #84973

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 1 commit into from
Oct 17, 2025
Merged

[Distributed] Copy @available and spi for resolvable extensions #84973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions lib/Macros/Sources/SwiftMacros/DistributedResolvableMacro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ public struct DistributedResolvableMacro: ExtensionMacro, PeerMacro {

extension DistributedResolvableMacro {

static let attributesToCopy: [String] = [
"available",
"_spi",
"_spi_available",
]

/// Introduce the `extension MyDistributedActor` which contains default
/// implementations of the protocol's requirements.
public static func expansion(
Expand All @@ -46,7 +52,9 @@ extension DistributedResolvableMacro {
}

let attributes = proto.attributes.filter { attr in
attr.as(AttributeSyntax.self)?.attributeName.trimmed.description == "_spi"
Self.attributesToCopy.contains(
attr.as(AttributeSyntax.self)?.attributeName.trimmed.description ?? ""
)
}
let accessModifiers = proto.accessControlModifiers

Expand All @@ -67,7 +75,7 @@ extension DistributedResolvableMacro {

let extensionDecl: DeclSyntax =
"""
\(raw: attributes.map({$0.description}).joined(separator: "\n"))
\(attributes)
extension \(proto.name.trimmed) where Self: Distributed._DistributedActorStub {
\(raw: requirementStubs)
}
Expand Down Expand Up @@ -160,7 +168,7 @@ extension DistributedResolvableMacro {
guard let ident = attr.attributeName.as(IdentifierTypeSyntax.self) else {
return false
}
return ident.name.text == "_spi"
return Self.attributesToCopy.contains(ident.name.text)
}
let accessModifiers = proto.accessControlModifiers

Expand Down
3 changes: 3 additions & 0 deletions test/Distributed/Macros/distributed_macro_expansion_DistributedProtocol_availability.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import Distributed

@Resolvable
@available(iOS 666, macOS 777, tvOS 888, visionOS 999, *)
public protocol Greeter: DistributedActor where ActorSystem: DistributedActorSystem<any Codable> {
@available(iOS 6666, macOS 7777, tvOS 8888, visionOS 9999, *)
distributed func greet(name: String) -> String
Expand All @@ -22,12 +23,14 @@ public protocol Greeter: DistributedActor where ActorSystem: DistributedActorSys

// @Resolvable ->

// CHECK: @available(iOS 666, macOS 777, tvOS 888, visionOS 999, *)
// CHECK: public distributed actor $Greeter<ActorSystem>: Greeter,
// CHECK: Distributed._DistributedActorStub
// CHECK: where ActorSystem: DistributedActorSystem<any Codable>
// CHECK: {
// CHECK: }

// CHECK: @available(iOS 666, macOS 777, tvOS 888, visionOS 999, *)
// CHECK: extension Greeter where Self: Distributed._DistributedActorStub {
// CHECK: @available(iOS 6666, macOS 7777, tvOS 8888, visionOS 9999, *)
// CHECK: public
Expand Down
9 changes: 8 additions & 1 deletion test/Distributed/Macros/distributed_macro_expansion_DistributedProtocol_spi.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,31 @@
// RUN: %empty-directory(%t-scratch)

// RUN: %target-swift-frontend-emit-module -emit-module-path %t/FakeDistributedActorSystems.swiftmodule -module-name FakeDistributedActorSystems -target %target-swift-6.0-abi-triple %S/../Inputs/FakeDistributedActorSystems.swift
// RUN: %target-swift-frontend -typecheck -verify -target %target-swift-6.0-abi-triple -plugin-path %swift-plugin-dir -parse-as-library -I %t -dump-macro-expansions %s -dump-macro-expansions 2>&1 | %FileCheck %s --dump-input=always
// RUN: %target-swift-frontend -Onone -typecheck -verify -target %target-swift-6.0-abi-triple -plugin-path %swift-plugin-dir -parse-as-library -I %t -dump-macro-expansions %s -dump-macro-expansions 2>&1 | %FileCheck %s --dump-input=always
// RUN: %target-swift-frontend -O -typecheck -verify -target %target-swift-6.0-abi-triple -plugin-path %swift-plugin-dir -parse-as-library -I %t -dump-macro-expansions %s -dump-macro-expansions 2>&1 | %FileCheck %s --dump-input=always

import Distributed
import FakeDistributedActorSystems

@Resolvable
@_spi(CoolFeatures)
@available(SwiftStdlib 6.0, *)
public protocol Greeter: DistributedActor where ActorSystem: DistributedActorSystem<any Codable> {
distributed func greet(name: String) -> String
}

// @Resolvable ->

// CHECK: @_spi(CoolFeatures)
// CHECK: @available(SwiftStdlib 6.0, *)
// CHECK: distributed actor $Greeter<ActorSystem>: Greeter,
// CHECK-NEXT: Distributed._DistributedActorStub
// CHECK-NEXT: where ActorSystem: DistributedActorSystem<any Codable>
// CHECK-NEXT: {
// CHECK: }

// CHECK: @_spi(CoolFeatures)
// CHECK: @available(SwiftStdlib 6.0, *)
// CHECK: extension Greeter where Self: Distributed._DistributedActorStub {
// CHECK: distributed func greet(name: String) -> String {
// CHECK-NEXT: if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
Expand All @@ -41,20 +45,23 @@ public protocol Greeter: DistributedActor where ActorSystem: DistributedActorSys

@_spi(DistributedSPIForTesting)
@Resolvable
@available(SwiftStdlib 6.0, *)
public protocol GreeterWithSPISystem: DistributedActor where ActorSystem == FakeActorSystemWithSPI {
distributed func greet(name: String) -> String
}

// @Resolvable ->

// CHECK: @_spi(DistributedSPIForTesting)
// CHECK: @available(SwiftStdlib 6.0, *)
// CHECK: public distributed actor $GreeterWithSPISystem: GreeterWithSPISystem,
// CHECK-NEXT: Distributed._DistributedActorStub
// CHECK-NEXT: {
// CHECK: public typealias ActorSystem = FakeActorSystemWithSPI
// CHECK-NEXT: }

// CHECK: @_spi(DistributedSPIForTesting)
// CHECK: @available(SwiftStdlib 6.0, *)
// CHECK: extension GreeterWithSPISystem where Self: Distributed._DistributedActorStub {
// CHECK: public distributed func greet(name: String) -> String {
// CHECK-NEXT: if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
Expand Down