Skip to content

AST: Print official spelling of @backDeployed attr in swiftinterfaces #65775

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
May 9, 2023
Merged

AST: Print official spelling of @backDeployed attr in swiftinterfaces #65775

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
5 changes: 3 additions & 2 deletions include/swift/AST/Attr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2214,8 +2214,9 @@ class UnavailableFromAsyncAttr : public DeclAttribute {
}
};

/// The @_backDeploy(...) attribute, used to make function declarations available
/// for back deployment to older OSes via emission into the client binary.
/// The `@backDeployed(...)` attribute, used to make function declarations
/// available for back deployment to older OSes via emission into the client
/// binary.
class BackDeployedAttr : public DeclAttribute {
public:
BackDeployedAttr(SourceLoc AtLoc, SourceRange Range, PlatformKind Platform,
Expand Down
6 changes: 2 additions & 4 deletions lib/AST/Attr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,8 +548,7 @@ static void printShortFormBackDeployed(ArrayRef<const DeclAttribute *> Attrs,
ASTPrinter &Printer,
const PrintOptions &Options) {
assert(!Attrs.empty());
// TODO: Print `@backDeployed` in swiftinterfaces (rdar://104920183)
Printer << "@_backDeploy(before: ";
Printer << "@backDeployed(before: ";
bool isFirst = true;

for (auto *DA : Attrs) {
Expand Down Expand Up @@ -1344,8 +1343,7 @@ bool DeclAttribute::printImpl(ASTPrinter &Printer, const PrintOptions &Options,
}

case DAK_BackDeployed: {
// TODO: Print `@backDeployed` in swiftinterfaces (rdar://104920183)
Printer.printAttrName("@_backDeploy");
Printer.printAttrName("@backDeployed");
Printer << "(before: ";
auto Attr = cast<BackDeployedAttr>(this);
Printer << platformString(Attr->Platform) << " " <<
Expand Down
21 changes: 10 additions & 11 deletions test/ModuleInterface/back-deployed-attr.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,32 @@
// REQUIRES: OS=macosx

public struct TopLevelStruct {
// TODO: Print `@backDeployed` in swiftinterfaces (rdar://104920183)
// CHECK: @_backDeploy(before: macOS 12.0)
// CHECK: @backDeployed(before: macOS 12.0)
// CHECK: public func backDeployedFunc_SinglePlatform() -> Swift.Int { return 41 }
@backDeployed(before: macOS 12.0)
public func backDeployedFunc_SinglePlatform() -> Int { return 41 }

// CHECK: @_backDeploy(before: macOS 12.0, iOS 15.0)
// CHECK: @backDeployed(before: macOS 12.0, iOS 15.0)
// CHECK: public func backDeployedFunc_MultiPlatform() -> Swift.Int { return 42 }
@backDeployed(before: macOS 12.0, iOS 15.0)
public func backDeployedFunc_MultiPlatform() -> Int { return 42 }

// CHECK: @_backDeploy(before: macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0)
// CHECK: @backDeployed(before: macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0)
// CHECK: public func backDeployedFunc_MultiPlatformSeparate() -> Swift.Int { return 43 }
@backDeployed(before: macOS 12.0)
@backDeployed(before: iOS 15.0)
@backDeployed(before: watchOS 8.0)
@backDeployed(before: tvOS 15.0)
public func backDeployedFunc_MultiPlatformSeparate() -> Int { return 43 }

// CHECK: @_backDeploy(before: macOS 12.0)
// CHECK: @backDeployed(before: macOS 12.0)
// CHECK: public var backDeployedComputedProperty: Swift.Int {
// CHECK-NEXT: get { 44 }
// CHECK-NEXT: }
@backDeployed(before: macOS 12.0)
public var backDeployedComputedProperty: Int { 44 }

// CHECK: @_backDeploy(before: macOS 12.0)
// CHECK: @backDeployed(before: macOS 12.0)
// CHECK: public var backDeployedPropertyWithAccessors: Swift.Int {
// CHECK-NEXT: get { 45 }
// CHECK-NEXT: }
Expand All @@ -43,7 +42,7 @@ public struct TopLevelStruct {
get { 45 }
}

// CHECK: @_backDeploy(before: macOS 12.0)
// CHECK: @backDeployed(before: macOS 12.0)
// CHECK: public subscript(index: Swift.Int) -> Swift.Int {
// CHECK-NEXT: get { 46 }
// CHECK-NEXT: }
Expand All @@ -53,13 +52,13 @@ public struct TopLevelStruct {
}
}

// CHECK: @_backDeploy(before: iOS 15.0)
// CHECK: @backDeployed(before: iOS 15.0)
// CHECK: public func backDeployedFunc_iOSOnly() -> Swift.Int
// CHECK-NOT: return 99
@backDeployed(before: iOS 15.0)
public func backDeployedFunc_iOSOnly() -> Int { return 99 }

// CHECK: @_backDeploy(before: macOS 12.0)
// CHECK: @backDeployed(before: macOS 12.0)
// CHECK: public func backDeployTopLevelFunc_macOS() -> Swift.Int {
// CHECK-NEXT: return 47
// CHECK-NEXT: }
Expand All @@ -75,12 +74,12 @@ public func backDeployTopLevelFunc_macOS() -> Int {

// MARK: - Availability macros

// CHECK: @_backDeploy(before: macOS 12.1)
// CHECK: @backDeployed(before: macOS 12.1)
// CHECK: public func backDeployTopLevelFunc_macOS12_1() -> Swift.Int { return 48 }
@backDeployed(before: _macOS12_1)
public func backDeployTopLevelFunc_macOS12_1() -> Int { return 48 }

// CHECK: @_backDeploy(before: macOS 12.1, iOS 15.1)
// CHECK: @backDeployed(before: macOS 12.1, iOS 15.1)
// CHECK: public func backDeployTopLevelFunc_myProject() -> Swift.Int { return 49 }
@backDeployed(before: _myProject 1.0)
public func backDeployTopLevelFunc_myProject() -> Int { return 49 }