Skip to content

Commit 084698d

Browse files
authored
Merge pull request #17489 from slavapestov/stdlib-usable-from-inline
stdlib: Update for stricter enforcement of @usableFromInline
2 parents 612b49d + 5d1f48e commit 084698d

File tree

7 files changed

+16
-0
lines changed

7 files changed

+16
-0
lines changed

stdlib/public/core/Character.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ public struct Character {
8484
return UInt64(Builtin.zext_Int63_Int64(value))
8585
}
8686

87+
@usableFromInline // FIXME(sil-serialize-all)
8788
typealias UTF16View = String.UTF16View
8889
@inlinable // FIXME(sil-serialize-all)
8990
internal var utf16: UTF16View {

stdlib/public/core/HeapBuffer.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ internal protocol _HeapBufferHeader_ {
2525
@_fixed_layout // FIXME(sil-serialize-all)
2626
@usableFromInline
2727
internal struct _HeapBufferHeader<T> : _HeapBufferHeader_ {
28+
@usableFromInline // FIXME(sil-serialize-all)
2829
internal typealias Value = T
2930
@inlinable // FIXME(sil-serialize-all)
3031
internal init(_ value: T) { self.value = value }

stdlib/public/core/KeyPath.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,17 +479,21 @@ internal struct ComputedPropertyID: Hashable {
479479
@usableFromInline // FIXME(sil-serialize-all)
480480
@_fixed_layout // FIXME(sil-serialize-all)
481481
internal struct ComputedArgumentWitnesses {
482+
@usableFromInline // FIXME(sil-serialize-all)
482483
internal typealias Destroy = @convention(thin)
483484
(_ instanceArguments: UnsafeMutableRawPointer, _ size: Int) -> ()
485+
@usableFromInline // FIXME(sil-serialize-all)
484486
internal typealias Copy = @convention(thin)
485487
(_ srcInstanceArguments: UnsafeRawPointer,
486488
_ destInstanceArguments: UnsafeMutableRawPointer,
487489
_ size: Int) -> ()
490+
@usableFromInline // FIXME(sil-serialize-all)
488491
internal typealias Equals = @convention(thin)
489492
(_ xInstanceArguments: UnsafeRawPointer,
490493
_ yInstanceArguments: UnsafeRawPointer,
491494
_ size: Int) -> Bool
492495
// FIXME(hasher) Combine to an inout Hasher instead
496+
@usableFromInline // FIXME(sil-serialize-all)
493497
internal typealias Hash = @convention(thin)
494498
(_ instanceArguments: UnsafeRawPointer,
495499
_ size: Int) -> Int

stdlib/public/core/SmallString.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13+
@usableFromInline // FIXME(sil-serialize-all)
1314
internal
1415
typealias _SmallUTF16StringBuffer = _FixedArray16<UInt16>
1516

stdlib/public/core/StringComparison.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import SwiftShims
1414

1515
// TODO: pick values that give us the best branching pattern
16+
@usableFromInline // FIXME(sil-serialize-all)
1617
internal
1718
enum _GutsClassification: UInt {
1819
case smallUTF8 = 0

stdlib/public/core/UnmanagedOpaqueString.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ extension _UnmanagedOpaqueString : Sequence {
157157
extension _UnmanagedOpaqueString : RandomAccessCollection {
158158
internal typealias IndexDistance = Int
159159
internal typealias Indices = Range<Index>
160+
161+
@usableFromInline // FIXME(sil-serialize-all)
160162
internal typealias SubSequence = _UnmanagedOpaqueString
161163

162164
@_fixed_layout

stdlib/public/core/UnmanagedString.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212

1313
import SwiftShims
1414

15+
@usableFromInline
1516
internal typealias _UnmanagedASCIIString = _UnmanagedString<UInt8>
17+
18+
@usableFromInline
1619
internal typealias _UnmanagedUTF16String = _UnmanagedString<UTF16.CodeUnit>
1720

1821
@inlinable
@@ -142,9 +145,12 @@ extension _UnmanagedString : RandomAccessCollection {
142145
// requires that SubSequence share indices with the original collection.
143146
// Therefore, we use pointers as the index type; however, we also provide
144147
// integer subscripts as a convenience, in a separate extension below.
148+
@usableFromInline // FIXME(sil-serialize-all)
145149
internal typealias Index = UnsafePointer<CodeUnit>
146150
internal typealias IndexDistance = Int
147151
internal typealias Indices = Range<Index>
152+
153+
@usableFromInline // FIXME(sil-serialize-all)
148154
internal typealias SubSequence = _UnmanagedString
149155

150156
@inlinable

0 commit comments

Comments
 (0)