Skip to content

Commit b0739a5

Browse files
DougGregorDougGregor
authored
Merge pull request #82850 from DougGregor/span-back-deployment-version-fixes
Fix deployment version for Span back-deployment library
2 parents 6f6ce0a + cabc0bb commit b0739a5

File tree

12 files changed

+161
-162
lines changed

12 files changed

+161
-162
lines changed

‎stdlib/toolchain/CompatibilitySpan/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND DEFINED SWIFT_STDLIB_LIBRARY_BUILD_TY
2121

2222
NO_SWIFTMODULE
2323

24-
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
25-
DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}
26-
DEPLOYMENT_VERSION_TVOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_TVOS}
27-
DEPLOYMENT_VERSION_WATCHOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_WATCHOS}
28-
DEPLOYMENT_VERSION_XROS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_XROS}
29-
DEPLOYMENT_VERSION_MACCATALYST ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_MACCATALYST}
24+
DEPLOYMENT_VERSION_OSX "10.14.4"
25+
DEPLOYMENT_VERSION_IOS "12.2"
26+
DEPLOYMENT_VERSION_TVOS "12.2"
27+
DEPLOYMENT_VERSION_WATCHOS "5.2"
28+
DEPLOYMENT_VERSION_XROS "1.0"
29+
DEPLOYMENT_VERSION_MACCATALYST "13.1"
3030

3131
MACCATALYST_BUILD_FLAVOR "zippered"
3232

‎test/Interop/C/swiftify-import/Inputs/counted-by-noescape.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
void simple(int len, int * __counted_by(len) __noescape p);
88

99
void swiftAttr(int len, int *p) __attribute__((
10-
swift_attr("@_SwiftifyImport(.countedBy(pointer: .param(2), count: \"len\"), .nonescaping(pointer: .param(2)), spanAvailability: \"visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4\")")));
10+
swift_attr("@_SwiftifyImport(.countedBy(pointer: .param(2), count: \"len\"), .nonescaping(pointer: .param(2)), spanAvailability: \"visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4\")")));
1111

1212
void shared(int len, int * __counted_by(len) __noescape p1, int * __counted_by(len) __noescape p2);
1313

‎test/Interop/C/swiftify-import/Inputs/sized-by-noescape.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
void simple(int len, const void * __sized_by(len) __noescape p);
1111

1212
void swiftAttr(int len, const void *p) __attribute__((swift_attr(
13-
"@_SwiftifyImport(.sizedBy(pointer: .param(2), size: \"len\"), .nonescaping(pointer: .param(2)), spanAvailability: \"visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4\")")));
13+
"@_SwiftifyImport(.sizedBy(pointer: .param(2), size: \"len\"), .nonescaping(pointer: .param(2)), spanAvailability: \"visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4\")")));
1414

1515
void shared(int len, const void * __sized_by(len) __noescape p1, const void * __sized_by(len) __noescape p2);
1616

‎test/Interop/C/swiftify-import/counted-by-lifetimebound.swift

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,96 +12,96 @@
1212
import CountedByLifetimeboundClang
1313

1414
// CHECK: /// This is an auto-generated wrapper for safer interop
15-
// CHECK-NEXT: @available(visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
15+
// CHECK-NEXT: @available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
1616
// CHECK-NEXT: @_lifetime(copy p)
1717
// CHECK-NEXT: @_lifetime(p: copy p)
1818
// CHECK-NEXT: @_alwaysEmitIntoClient @_disfavoredOverload public func complexExpr(_ len: Int32, _ offset: Int32, _ p: inout MutableSpan<Int32>) -> MutableSpan<Int32>
1919

2020
// CHECK: /// This is an auto-generated wrapper for safer interop
21-
// CHECK-NEXT: @available(visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
21+
// CHECK-NEXT: @available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
2222
// CHECK-NEXT: @_lifetime(copy p)
2323
// CHECK-NEXT: @_lifetime(p: copy p)
2424
// CHECK-NEXT: @_alwaysEmitIntoClient @_disfavoredOverload public func constant(_ p: inout MutableSpan<Int32>?) -> MutableSpan<Int32>?
2525

2626
// CHECK-NEXT: /// This is an auto-generated wrapper for safer interop
27-
// CHECK-NEXT: @available(visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
27+
// CHECK-NEXT: @available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
2828
// CHECK-NEXT: @_lifetime(borrow p)
2929
// CHECK-NEXT: @_alwaysEmitIntoClient @_disfavoredOverload public func noncountedLifetime(_ len: Int32, _ p: UnsafeMutablePointer<Int32>!) -> MutableSpan<Int32>
3030

3131
// CHECK-NEXT: /// This is an auto-generated wrapper for safer interop
32-
// CHECK-NEXT: @available(visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
32+
// CHECK-NEXT: @available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
3333
// CHECK-NEXT: @_lifetime(copy p)
3434
// CHECK-NEXT: @_lifetime(p: copy p)
3535
// CHECK-NEXT: @_alwaysEmitIntoClient @_disfavoredOverload public func nonnull(_ len: Int32, _ p: inout MutableSpan<Int32>) -> MutableSpan<Int32>
3636

3737
// CHECK-NEXT: /// This is an auto-generated wrapper for safer interop
38-
// CHECK-NEXT: @available(visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
38+
// CHECK-NEXT: @available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
3939
// CHECK-NEXT: @_lifetime(copy p)
4040
// CHECK-NEXT: @_lifetime(p: copy p)
4141
// CHECK-NEXT: @_alwaysEmitIntoClient @_disfavoredOverload public func nullUnspecified(_ len: Int32, _ p: inout MutableSpan<Int32>) -> MutableSpan<Int32>
4242

4343
// CHECK-NEXT: /// This is an auto-generated wrapper for safer interop
44-
// CHECK-NEXT: @available(visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
44+
// CHECK-NEXT: @available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
4545
// CHECK-NEXT: @_lifetime(copy p)
4646
// CHECK-NEXT: @_lifetime(p: copy p)
4747
// CHECK-NEXT: @_alwaysEmitIntoClient @_disfavoredOverload public func nullable(_ len: Int32, _ p: inout MutableSpan<Int32>?) -> MutableSpan<Int32>?
4848

4949
// CHECK-NEXT: /// This is an auto-generated wrapper for safer interop
50-
// CHECK-NEXT: @available(visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
50+
// CHECK-NEXT: @available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
5151
// CHECK-NEXT: @_lifetime(copy p)
5252
// CHECK-NEXT: @_lifetime(p: copy p)
5353
// CHECK-NEXT: @_alwaysEmitIntoClient @_disfavoredOverload public func shared(_ p: inout MutableSpan<Int32>) -> MutableSpan<Int32>
5454

5555
// CHECK-NEXT: /// This is an auto-generated wrapper for safer interop
56-
// CHECK-NEXT: @available(visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
56+
// CHECK-NEXT: @available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
5757
// CHECK-NEXT: @_lifetime(copy p)
5858
// CHECK-NEXT: @_lifetime(p: copy p)
5959
// CHECK-NEXT: @_alwaysEmitIntoClient @_disfavoredOverload public func simple(_ len: Int32, _ p: inout MutableSpan<Int32>) -> MutableSpan<Int32>
6060

6161

62-
@available(visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
62+
@available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
6363
@inlinable
6464
public func callComplexExpr(_ p: inout MutableSpan<CInt>) {
6565
let _: MutableSpan<CInt> = complexExpr(73, 37, &p)
6666
}
6767

68-
@available(visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
68+
@available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
6969
@inlinable
7070
public func callNonnull(_ p: inout MutableSpan<CInt>) {
7171
let _: MutableSpan<CInt> = nonnull(73, &p)
7272
}
7373

74-
@available(visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
74+
@available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
7575
@inlinable
7676
public func callNullUnspecified(_ p: inout MutableSpan<CInt>) {
7777
let _: MutableSpan<CInt> = nullUnspecified(73, &p)
7878
}
7979

80-
@available(visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
80+
@available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
8181
@inlinable
8282
public func callNullable(_ p: inout MutableSpan<CInt>?) {
8383
let _: MutableSpan<CInt> = nullable(73, &p)!
8484
}
8585

86-
@available(visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
86+
@available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
8787
@inlinable
8888
public func callShared(_ p: inout MutableSpan<CInt>) {
8989
let _: MutableSpan<CInt> = shared(&p)
9090
}
9191

92-
@available(visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
92+
@available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
9393
@inlinable
9494
public func callSimple(_ p: inout MutableSpan<CInt>) {
9595
let _: MutableSpan<CInt> = simple(73, &p)
9696
}
9797

98-
@available(visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
98+
@available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
9999
@inlinable
100100
public func callNoncountedLifetime(_ p: UnsafeMutablePointer<CInt>) {
101101
let _: MutableSpan<CInt> = unsafe noncountedLifetime(73, p)
102102
}
103103

104-
@available(visionOS 1.1, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
104+
@available(visionOS 1.0, tvOS 12.2, watchOS 5.2, iOS 12.2, macOS 10.14.4, *)
105105
@inlinable
106106
public func callConstant(_ p: inout MutableSpan<CInt>?) {
107107
let _: MutableSpan<CInt>? = constant(&p)

0 commit comments

Comments
 (0)