Skip to content

Commit cec6d69

Browse files
authored
Merge pull request #20410 from airspeedswift/me-me-fix-me
2 parents a952514 + 35f5ad1 commit cec6d69

File tree

6 files changed

+14
-33
lines changed

6 files changed

+14
-33
lines changed

stdlib/public/core/AssertCommon.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ func _unimplementedInitializer(className: StaticString,
248248
Builtin.int_trap()
249249
}
250250

251-
@inlinable // FIXME(sil-serialize-all)
252251
public // COMPILER_INTRINSIC
253252
func _undefined<T>(
254253
_ message: @autoclosure () -> String = String(),

stdlib/public/core/Misc.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public func _autorelease(_ x: AnyObject) {
5151
///
5252
/// This function is primarily useful to call various runtime functions
5353
/// written in C++.
54-
@inlinable // FIXME(sil-serialize-all)
5554
internal func _withUninitializedString<R>(
5655
_ body: (UnsafeMutablePointer<String>) -> R
5756
) -> (R, String) {
@@ -67,13 +66,11 @@ internal func _withUninitializedString<R>(
6766
// with type names that we are nested in.
6867
// But we can place it behind #if _runtime(_Native) and remove it from ABI on
6968
// Apple platforms, deferring discussions mentioned above.
70-
@inlinable // FIXME(sil-serialize-all)
7169
@_silgen_name("swift_getTypeName")
7270
public func _getTypeName(_ type: Any.Type, qualified: Bool)
7371
-> (UnsafePointer<UInt8>, Int)
7472

7573
/// Returns the demangled qualified name of a metatype.
76-
@inlinable // FIXME(sil-serialize-all)
7774
public // @testable
7875
func _typeName(_ type: Any.Type, qualified: Bool = true) -> String {
7976
let (stringPtr, count) = _getTypeName(type, qualified: qualified)

stdlib/public/core/Pointer.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,6 @@ func _convertMutableArrayToPointerArgument<
387387
}
388388

389389
/// Derive a UTF-8 pointer argument from a value string parameter.
390-
@inlinable // FIXME(sil-serialize-all)
391390
public // COMPILER_INTRINSIC
392391
func _convertConstStringToUTF8PointerArgument<
393392
ToPointer : _Pointer

stdlib/public/core/REPL.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
/// Print a string as is to stdout.
14-
@inlinable // FIXME(sil-serialize-all)
1514
public // COMPILER_INTRINSIC
1615
func _replPrintLiteralString(_ text: String) {
1716
print(text, terminator: "")

stdlib/public/core/Runtime.swift.gyb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ internal struct _Buffer32 {
175175

176176
internal mutating func withBytes<Result>(
177177
_ body: (UnsafeMutablePointer<UInt8>) throws -> Result
178-
) rethrows -> Result
179-
{
178+
) rethrows -> Result {
180179
return try withUnsafeMutablePointer(to: &self) {
181180
try body(UnsafeMutableRawPointer($0).assumingMemoryBound(to: UInt8.self))
182181
}
@@ -192,8 +191,7 @@ internal struct _Buffer72 {
192191

193192
internal mutating func withBytes<Result>(
194193
_ body: (UnsafeMutablePointer<UInt8>) throws -> Result
195-
) rethrows -> Result
196-
{
194+
) rethrows -> Result {
197195
return try withUnsafeMutablePointer(to: &self) {
198196
try body(UnsafeMutableRawPointer($0).assumingMemoryBound(to: UInt8.self))
199197
}

test/api-digester/Outputs/stability-stdlib-abi.swift.expected

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
2-
/* Generic Signature Changes */
31
Func MutableCollection._partition(within:by:) has generic signature change from <τ_0_0 where τ_0_0 : MutableCollection, τ_0_0 : RandomAccessCollection> to <τ_0_0 where τ_0_0 : BidirectionalCollection, τ_0_0 : MutableCollection>
4-
5-
/* RawRepresentable Changes */
6-
7-
/* Removed Decls */
8-
Class _stdlib_AtomicInt has been removed
9-
Func BinaryInteger._description(radix:uppercase:) has been removed
2+
Func MutableCollection._partition(within:by:) has been renamed to Func MutableCollection._partitionImpl(by:)
103
Func MutableCollection._heapSort(within:by:) has been removed
114
Func MutableCollection._heapify(within:by:) has been removed
125
Func MutableCollection._introSort(within:by:) has been removed
136
Func MutableCollection._introSortImpl(within:by:depthLimit:) has been removed
147
Func MutableCollection._siftDown(_:within:by:) has been removed
158
Func MutableCollection._sort3(_:_:_:by:) has been removed
9+
Func MutableCollection._partition(within:by:) has parameter 0 type change from Range<τ_0_0.Index> to (τ_0_0.Element) throws -> Bool
10+
11+
Func BinaryInteger._description(radix:uppercase:) has been removed
12+
Struct _Buffer32 has been removed
13+
Struct _Buffer72 has been removed
1614
Func _int64ToString(_:radix:uppercase:) has been removed
1715
Func _int64ToStringImpl(_:_:_:_:_:) has been removed
16+
Func _uint64ToStringImpl(_:_:_:_:_:) has been removed
17+
Func _withUninitializedString(_:) has been removed
18+
19+
Class _stdlib_AtomicInt has been removed
1820
Func _stdlib_atomicCompareExchangeStrongInt(object:expected:desired:) has been removed
1921
Func _stdlib_atomicCompareExchangeStrongInt32(object:expected:desired:) has been removed
2022
Func _stdlib_atomicCompareExchangeStrongInt64(object:expected:desired:) has been removed
@@ -50,25 +52,12 @@ Func _swift_stdlib_atomicStoreInt32(object:desired:) has been removed
5052
Func _swift_stdlib_atomicStoreInt64(object:desired:) has been removed
5153
Func _swift_stdlib_atomicStoreUInt32(object:desired:) has been removed
5254
Func _swift_stdlib_atomicStoreUInt64(object:desired:) has been removed
53-
Func _uint64ToStringImpl(_:_:_:_:_:) has been removed
55+
56+
Struct Hasher._Core has removed conformance to _HasherCore
5457
Protocol _HasherCore has been removed
55-
Struct _Buffer32 has been removed
56-
Struct _Buffer72 has been removed
5758
Struct _BufferingHasher has been removed
5859
Struct _HasherTailBuffer has been removed
59-
60-
/* Moved Decls */
61-
62-
/* Renamed Decls */
63-
Func MutableCollection._partition(within:by:) has been renamed to Func MutableCollection._partitionImpl(by:)
64-
65-
/* Type Changes */
66-
Func MutableCollection._partition(within:by:) has parameter 0 type change from Range<τ_0_0.Index> to (τ_0_0.Element) throws -> Bool
6760
Var Hasher._core has declared type change from _BufferingHasher<Hasher._Core> to Hasher._Core
6861
Var Hasher._Core._buffer is added to a non-resilient type
6962
Var Hasher._Core._state in a non-resilient type changes position from 0 to 1
70-
Struct Hasher._Core has removed conformance to _HasherCore
71-
72-
/* Decl Attribute changes */
7363

74-
/* Protocol Requirement Changes */

0 commit comments

Comments
 (0)