Skip to content

stdlib: Update for stricter enforcement of @usableFromInline #17489

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
Jun 26, 2018
Merged

stdlib: Update for stricter enforcement of @usableFromInline #17489

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
1 change: 1 addition & 0 deletions stdlib/public/core/Character.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ public struct Character {
return UInt64(Builtin.zext_Int63_Int64(value))
}

@usableFromInline // FIXME(sil-serialize-all)
typealias UTF16View = String.UTF16View
@inlinable // FIXME(sil-serialize-all)
internal var utf16: UTF16View {
Expand Down
1 change: 1 addition & 0 deletions stdlib/public/core/HeapBuffer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ internal protocol _HeapBufferHeader_ {
@_fixed_layout // FIXME(sil-serialize-all)
@usableFromInline
internal struct _HeapBufferHeader<T> : _HeapBufferHeader_ {
@usableFromInline // FIXME(sil-serialize-all)
internal typealias Value = T
@inlinable // FIXME(sil-serialize-all)
internal init(_ value: T) { self.value = value }
Expand Down
4 changes: 4 additions & 0 deletions stdlib/public/core/KeyPath.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,17 +479,21 @@ internal struct ComputedPropertyID: Hashable {
@usableFromInline // FIXME(sil-serialize-all)
@_fixed_layout // FIXME(sil-serialize-all)
internal struct ComputedArgumentWitnesses {
@usableFromInline // FIXME(sil-serialize-all)
internal typealias Destroy = @convention(thin)
(_ instanceArguments: UnsafeMutableRawPointer, _ size: Int) -> ()
@usableFromInline // FIXME(sil-serialize-all)
internal typealias Copy = @convention(thin)
(_ srcInstanceArguments: UnsafeRawPointer,
_ destInstanceArguments: UnsafeMutableRawPointer,
_ size: Int) -> ()
@usableFromInline // FIXME(sil-serialize-all)
internal typealias Equals = @convention(thin)
(_ xInstanceArguments: UnsafeRawPointer,
_ yInstanceArguments: UnsafeRawPointer,
_ size: Int) -> Bool
// FIXME(hasher) Combine to an inout Hasher instead
@usableFromInline // FIXME(sil-serialize-all)
internal typealias Hash = @convention(thin)
(_ instanceArguments: UnsafeRawPointer,
_ size: Int) -> Int
Expand Down
1 change: 1 addition & 0 deletions stdlib/public/core/SmallString.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
//
//===----------------------------------------------------------------------===//

@usableFromInline // FIXME(sil-serialize-all)
internal
typealias _SmallUTF16StringBuffer = _FixedArray16<UInt16>

Expand Down
1 change: 1 addition & 0 deletions stdlib/public/core/StringComparison.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import SwiftShims

// TODO: pick values that give us the best branching pattern
@usableFromInline // FIXME(sil-serialize-all)
internal
enum _GutsClassification: UInt {
case smallUTF8 = 0
Expand Down
2 changes: 2 additions & 0 deletions stdlib/public/core/UnmanagedOpaqueString.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@ extension _UnmanagedOpaqueString : Sequence {
extension _UnmanagedOpaqueString : RandomAccessCollection {
internal typealias IndexDistance = Int
internal typealias Indices = Range<Index>

@usableFromInline // FIXME(sil-serialize-all)
internal typealias SubSequence = _UnmanagedOpaqueString

@_fixed_layout
Expand Down
6 changes: 6 additions & 0 deletions stdlib/public/core/UnmanagedString.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@

import SwiftShims

@usableFromInline
internal typealias _UnmanagedASCIIString = _UnmanagedString<UInt8>

@usableFromInline
internal typealias _UnmanagedUTF16String = _UnmanagedString<UTF16.CodeUnit>

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

@usableFromInline // FIXME(sil-serialize-all)
internal typealias SubSequence = _UnmanagedString

@inlinable
Expand Down