Skip to content

CompatibilitySpan: Fix stdlib build on visionOS #80678

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 2 commits into from
Apr 10, 2025
Merged

CompatibilitySpan: Fix stdlib build on visionOS #80678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17868a7
CompatibilitySpan: Fix stdlib build on visionOS
slavapestov Apr 9, 2025
758284a
cmake: Establish dependency on utils/availability-macros.def
slavapestov Apr 9, 2025
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: 4 additions & 1 deletion Runtimes/Core/cmake/modules/AvailabilityMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
file(STRINGS "${SwiftCore_SWIFTC_SOURCE_DIR}/utils/availability-macros.def" availability_defs)
configure_file("${SwiftCore_SWIFTC_SOURCE_DIR}/utils/availability-macros.def"
"${CMAKE_CURRENT_BINARY_DIR}/availability-macros.def"
COPYONLY)
file(STRINGS "${CMAKE_CURRENT_BINARY_DIR}/availability-macros.def" availability_defs)
list(FILTER availability_defs EXCLUDE REGEX "^\\s*(#.*)?$")
foreach(def ${availability_defs})
add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -define-availability -Xfrontend \"${def}\">")
Expand Down
22 changes: 11 additions & 11 deletions stdlib/public/core/Span/MutableRawSpan.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Swift
// contains initialized `Element` instances.
@safe
@frozen
@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
public struct MutableRawSpan: ~Copyable & ~Escapable {
@usableFromInline
Expand All @@ -45,11 +45,11 @@ public struct MutableRawSpan: ~Copyable & ~Escapable {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableRawSpan: @unchecked Sendable {}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableRawSpan {

Expand Down Expand Up @@ -122,7 +122,7 @@ extension MutableRawSpan {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableRawSpan {
@_alwaysEmitIntoClient
Expand All @@ -137,7 +137,7 @@ extension MutableRawSpan {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableRawSpan {

Expand All @@ -163,7 +163,7 @@ extension MutableRawSpan {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension RawSpan {

Expand All @@ -176,7 +176,7 @@ extension RawSpan {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableRawSpan {

Expand Down Expand Up @@ -213,7 +213,7 @@ extension MutableRawSpan {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableRawSpan {

Expand Down Expand Up @@ -355,7 +355,7 @@ extension MutableRawSpan {
#if !SPAN_COMPATIBILITY_STUB

//MARK: copyMemory
@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableRawSpan {

Expand Down Expand Up @@ -449,7 +449,7 @@ extension MutableRawSpan {
#endif

// MARK: sub-spans
@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableRawSpan {

Expand Down Expand Up @@ -565,7 +565,7 @@ extension MutableRawSpan {
}

// MARK: prefixes and suffixes
@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableRawSpan {

Expand Down
44 changes: 22 additions & 22 deletions stdlib/public/core/Span/MutableSpan.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Swift
// contains initialized `Element` instances.
@safe
@frozen
@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
public struct MutableSpan<Element: ~Copyable>
: ~Copyable, ~Escapable {
Expand Down Expand Up @@ -46,11 +46,11 @@ public struct MutableSpan<Element: ~Copyable>
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan: @unchecked Sendable where Element: Sendable {}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan where Element: ~Copyable {

Expand Down Expand Up @@ -94,7 +94,7 @@ extension MutableSpan where Element: ~Copyable {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan {

Expand All @@ -110,7 +110,7 @@ extension MutableSpan {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan where Element: BitwiseCopyable {

Expand Down Expand Up @@ -163,7 +163,7 @@ extension MutableSpan where Element: BitwiseCopyable {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension Span where Element: ~Copyable {

Expand All @@ -180,7 +180,7 @@ extension Span where Element: ~Copyable {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan where Element: ~Copyable {

Expand All @@ -193,7 +193,7 @@ extension MutableSpan where Element: ~Copyable {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension RawSpan {

Expand All @@ -210,7 +210,7 @@ extension RawSpan {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan where Element: ~Copyable {

Expand All @@ -224,7 +224,7 @@ extension MutableSpan where Element: ~Copyable {
}

//MARK: Collection, RandomAccessCollection
@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan where Element: ~Copyable {

Expand All @@ -242,7 +242,7 @@ extension MutableSpan where Element: ~Copyable {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan where Element: BitwiseCopyable {

Expand All @@ -258,7 +258,7 @@ extension MutableSpan where Element: BitwiseCopyable {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan where Element: ~Copyable {

Expand Down Expand Up @@ -312,7 +312,7 @@ extension MutableSpan where Element: ~Copyable {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan where Element: ~Copyable {

Expand All @@ -336,7 +336,7 @@ extension MutableSpan where Element: ~Copyable {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan where Element: BitwiseCopyable {

Expand Down Expand Up @@ -386,7 +386,7 @@ extension MutableSpan where Element: BitwiseCopyable {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan where Element: ~Copyable {

Expand Down Expand Up @@ -418,7 +418,7 @@ extension MutableSpan where Element: ~Copyable {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan where Element: BitwiseCopyable {

Expand All @@ -445,7 +445,7 @@ extension MutableSpan where Element: BitwiseCopyable {
}

//MARK: bulk-update functions
@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan {

Expand Down Expand Up @@ -531,7 +531,7 @@ extension MutableSpan {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan where Element: ~Copyable {

Expand Down Expand Up @@ -565,7 +565,7 @@ extension MutableSpan where Element: ~Copyable {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan {

Expand All @@ -578,7 +578,7 @@ extension MutableSpan {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan where Element: BitwiseCopyable {

Expand Down Expand Up @@ -673,7 +673,7 @@ extension MutableSpan where Element: BitwiseCopyable {
}

// MARK: sub-spans
@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan where Element: ~Copyable {

Expand Down Expand Up @@ -792,7 +792,7 @@ extension MutableSpan where Element: ~Copyable {
}

// MARK: prefixes and suffixes
@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension MutableSpan where Element: ~Copyable {

Expand Down
20 changes: 10 additions & 10 deletions stdlib/public/core/Span/RawSpan.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import Swift
/// owning the contiguous memory, ensuring temporal safety and avoiding
/// use-after-free errors. Operations on `RawSpan` are bounds-checked,
/// ensuring spcial safety and avoiding buffer overflow errors.
@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
@frozen
@safe
Expand Down Expand Up @@ -85,11 +85,11 @@ public struct RawSpan: ~Escapable, Copyable, BitwiseCopyable {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension RawSpan: @unchecked Sendable {}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension RawSpan {

Expand Down Expand Up @@ -329,7 +329,7 @@ extension RawSpan {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension RawSpan {

Expand Down Expand Up @@ -359,7 +359,7 @@ extension RawSpan {
}

// MARK: extracting sub-spans
@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension RawSpan {

Expand Down Expand Up @@ -473,7 +473,7 @@ extension RawSpan {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension RawSpan {

Expand Down Expand Up @@ -504,7 +504,7 @@ extension RawSpan {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension RawSpan {

Expand Down Expand Up @@ -537,7 +537,7 @@ extension RawSpan {
}

// MARK: load
@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension RawSpan {

Expand Down Expand Up @@ -654,7 +654,7 @@ extension RawSpan {
}
}

@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension RawSpan {
/// Returns a Boolean value indicating whether two `RawSpan` instances
Expand Down Expand Up @@ -687,7 +687,7 @@ extension RawSpan {
}

// MARK: prefixes and suffixes
@available(SwiftStdlib 5.0, *)
@available(SwiftCompatibilitySpan 5.0, *)
@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
extension RawSpan {

Expand Down
Loading