Skip to content

Commit 3a3ea0c

Browse files
authored
Merge pull request #81871 from glessard/rdar138440979-mutablespan-abi-fix-62
[6.2, stdlib] fix an extraneous symbol exported by MutableSpan
2 parents 0a3e134 + 6acbdde commit 3a3ea0c

File tree

3 files changed

+1
-7
lines changed

3 files changed

+1
-7
lines changed

stdlib/public/core/Span/MutableSpan.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ extension MutableSpan: @unchecked Sendable where Element: Sendable {}
5555
extension MutableSpan where Element: ~Copyable {
5656

5757
@unsafe
58-
@_unsafeNonescapableResult
59-
@usableFromInline
58+
@_alwaysEmitIntoClient
6059
@lifetime(borrow elements)
6160
internal init(
6261
_unchecked elements: UnsafeMutableBufferPointer<Element>

test/abi/macOS/arm64/stdlib.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,6 @@ Added: _$ss11MutableSpanVMa
917917
Added: _$ss11MutableSpanVMn
918918
Added: _$ss11MutableSpanVsRi_zrlE6_countSivg
919919
Added: _$ss11MutableSpanVsRi_zrlE8_pointerSvSgvg
920-
Added: _$ss11MutableSpanVsRi_zrlE10_uncheckedAByxGSryxG_tcfC
921920
Added: _$ss14MutableRawSpanV6_countSivg
922921
Added: _$ss14MutableRawSpanV8_pointerSvSgvg
923922
Added: _$ss14MutableRawSpanVMa
@@ -1049,7 +1048,6 @@ Added: __swift_stdlib_CreateIndirectTaggedPointerString
10491048
// Span backward deployment
10501049
Added: $ld$previous$@rpath/libswiftCompatibilitySpan.dylib$$1$10.14$15.0$_$ss11MutableSpanVMa$
10511050
Added: $ld$previous$@rpath/libswiftCompatibilitySpan.dylib$$1$10.14$15.0$_$ss11MutableSpanVMn$
1052-
Added: $ld$previous$@rpath/libswiftCompatibilitySpan.dylib$$1$10.14$15.0$_$ss11MutableSpanVsRi_zrlE10_uncheckedAByxGSryxG_tcfC$
10531051
Added: $ld$previous$@rpath/libswiftCompatibilitySpan.dylib$$1$10.14$15.0$_$ss11MutableSpanVsRi_zrlE6_countSivg$
10541052
Added: $ld$previous$@rpath/libswiftCompatibilitySpan.dylib$$1$10.14$15.0$_$ss11MutableSpanVsRi_zrlE8_pointerSvSgvg$
10551053
Added: $ld$previous$@rpath/libswiftCompatibilitySpan.dylib$$1$10.14$15.0$_$ss14MutableRawSpanV6_countSivg$

test/abi/macOS/x86_64/stdlib.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -918,7 +918,6 @@ Added: _$ss11MutableSpanVMa
918918
Added: _$ss11MutableSpanVMn
919919
Added: _$ss11MutableSpanVsRi_zrlE6_countSivg
920920
Added: _$ss11MutableSpanVsRi_zrlE8_pointerSvSgvg
921-
Added: _$ss11MutableSpanVsRi_zrlE10_uncheckedAByxGSryxG_tcfC
922921
Added: _$ss14MutableRawSpanV6_countSivg
923922
Added: _$ss14MutableRawSpanV8_pointerSvSgvg
924923
Added: _$ss14MutableRawSpanVMa
@@ -1046,11 +1045,9 @@ Added: _$ss18EnumeratedSequenceVyxGSKsSkRzrlMc
10461045
// Indirect tagged string creation
10471046
Added: __swift_stdlib_CreateIndirectTaggedPointerString
10481047

1049-
10501048
// Span backward deployment
10511049
Added: $ld$previous$@rpath/libswiftCompatibilitySpan.dylib$$1$10.14$15.0$_$ss11MutableSpanVMa$
10521050
Added: $ld$previous$@rpath/libswiftCompatibilitySpan.dylib$$1$10.14$15.0$_$ss11MutableSpanVMn$
1053-
Added: $ld$previous$@rpath/libswiftCompatibilitySpan.dylib$$1$10.14$15.0$_$ss11MutableSpanVsRi_zrlE10_uncheckedAByxGSryxG_tcfC$
10541051
Added: $ld$previous$@rpath/libswiftCompatibilitySpan.dylib$$1$10.14$15.0$_$ss11MutableSpanVsRi_zrlE6_countSivg$
10551052
Added: $ld$previous$@rpath/libswiftCompatibilitySpan.dylib$$1$10.14$15.0$_$ss11MutableSpanVsRi_zrlE8_pointerSvSgvg$
10561053
Added: $ld$previous$@rpath/libswiftCompatibilitySpan.dylib$$1$10.14$15.0$_$ss14MutableRawSpanV6_countSivg$

0 commit comments

Comments
 (0)