Skip to content

Commit 748a93a

Browse files
committed
Remove more recently added fixed-layouts
1 parent cad4fe0 commit 748a93a

File tree

1 file changed

+1
-17
lines changed

1 file changed

+1
-17
lines changed

stdlib/public/core/Hasher.swift

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616

1717
import SwiftShims
1818

19-
// FIXME: Remove @usableFromInline once Hasher is resilient.
20-
// rdar://problem/38549901
21-
@usableFromInline
2219
internal protocol _HasherCore {
2320
init(rawSeed: (UInt64, UInt64))
2421
mutating func compress(_ value: UInt64)
@@ -84,9 +81,6 @@ internal func _loadPartialUnalignedUInt64LE(
8481
/// trailing bytes, while the most significant 8 bits hold the count of bytes
8582
/// appended so far, modulo 256. The count of bytes currently stored in the
8683
/// buffer is in the lower three bits of the byte count.)
87-
// FIXME: Remove @usableFromInline and @_fixed_layout once Hasher is resilient.
88-
// rdar://problem/38549901
89-
@usableFromInline @_fixed_layout
9084
internal struct _HasherTailBuffer {
9185
// msb lsb
9286
// +---------+-------+-------+-------+-------+-------+-------+-------+
@@ -140,8 +134,7 @@ internal struct _HasherTailBuffer {
140134
}
141135

142136
@inline(__always)
143-
internal
144-
mutating func append(_ bytes: UInt64, count: UInt64) -> UInt64? {
137+
internal mutating func append(_ bytes: UInt64, count: UInt64) -> UInt64? {
145138
_sanityCheck(count >= 0 && count < 8)
146139
_sanityCheck(bytes & ~((1 &<< (count &<< 3)) &- 1) == 0)
147140
let c = byteCount & 7
@@ -159,9 +152,6 @@ internal struct _HasherTailBuffer {
159152
}
160153
}
161154

162-
// FIXME: Remove @usableFromInline and @_fixed_layout once Hasher is resilient.
163-
// rdar://problem/38549901
164-
@usableFromInline @_fixed_layout
165155
internal struct _BufferingHasher<RawCore: _HasherCore> {
166156
private var _buffer: _HasherTailBuffer
167157
private var _core: RawCore
@@ -296,13 +286,7 @@ internal struct _BufferingHasher<RawCore: _HasherCore> {
296286
/// algorithm implemented by `Hasher` may itself change between any two
297287
/// versions of the standard library.
298288
public struct Hasher {
299-
// FIXME: Remove @usableFromInline once Hasher is resilient.
300-
// rdar://problem/38549901
301-
@usableFromInline
302289
internal typealias RawCore = _SipHash13Core
303-
// FIXME: Remove @usableFromInline once Hasher is resilient.
304-
// rdar://problem/38549901
305-
@usableFromInline
306290
internal typealias Core = _BufferingHasher<RawCore>
307291

308292
internal var _core: Core

0 commit comments

Comments
 (0)