Merge pull request #41247 from slavapestov/fix-abi-stability-test

Move a few lines from stability-stdlib-abi-with-asserts.test to stability-stdlib-abi-without-asserts.test

Author: slavapestov

test/api-digester/stability-stdlib-abi-with-asserts.test

@@ -64,14 +64,4 @@ Struct _GlobalRuntimeFunctionCountersState is a new API without @available attri
 Struct _ObjectRuntimeFunctionCountersState is a new API without @available attribute
 Struct _RuntimeFunctionCounters is a new API without @available attribute
 
-// These haven't actually been removed; they were replaced with @_alwaysEmitIntoClient
-// alternatives. The old silgen-name entry point was preserved under an alternative
-// source-level name. This causes a false positive with the ABI checker.
-// The symbols are still present at the ABI level. The symbols are also still present
-// at the source level. The association between them is simply no longer straightforward.
-Func UnsafeBufferPointer.withMemoryRebound(to:_:) has been removed
-Func UnsafeMutableBufferPointer.withMemoryRebound(to:_:) has been removed
-Func UnsafeMutablePointer.withMemoryRebound(to:capacity:_:) has been removed
-Func UnsafePointer.withMemoryRebound(to:capacity:_:) has been removed
-
 // *** DO NOT DISABLE OR XFAIL THIS TEST. *** (See comment above.)

test/api-digester/stability-stdlib-abi-without-asserts.test

@@ -80,4 +80,14 @@ Protocol Collection has generic signature change from <Self : Swift.Sequence, Se
 
 Protocol StringProtocol has generic signature change from <Self : Swift.BidirectionalCollection, Self : Swift.Comparable, Self : Swift.ExpressibleByStringInterpolation, Self : Swift.Hashable, Self : Swift.LosslessStringConvertible, Self : Swift.TextOutputStream, Self : Swift.TextOutputStreamable, Self.Element == Swift.Character, Self.Index == Swift.String.Index, Self.StringInterpolation == Swift.DefaultStringInterpolation, Self.SubSequence : Swift.StringProtocol, Self.UTF16View : Swift.BidirectionalCollection, Self.UTF8View : Swift.Collection, Self.UnicodeScalarView : Swift.BidirectionalCollection, Self.UTF16View.Element == Swift.UInt16, Self.UTF16View.Index == Swift.String.Index, Self.UTF8View.Element == Swift.UInt8, Self.UTF8View.Index == Swift.String.Index, Self.UnicodeScalarView.Element == Swift.Unicode.Scalar, Self.UnicodeScalarView.Index == Swift.String.Index, Self.SubSequence.UTF16View.Index == Swift.String.Index, Self.SubSequence.UTF8View.Index == Swift.String.Index, Self.SubSequence.UnicodeScalarView.Index == Swift.String.Index> to <Self : Swift.BidirectionalCollection, Self : Swift.Comparable, Self : Swift.ExpressibleByStringInterpolation, Self : Swift.Hashable, Self : Swift.LosslessStringConvertible, Self : Swift.TextOutputStream, Self : Swift.TextOutputStreamable, Self.Element == Swift.Character, Self.Index == Swift.String.Index, Self.StringInterpolation == Swift.DefaultStringInterpolation, Self.SubSequence : Swift.StringProtocol, Self.UTF16View : Swift.BidirectionalCollection, Self.UTF8View : Swift.Collection, Self.UnicodeScalarView : Swift.BidirectionalCollection, Self.UTF16View.Element == Swift.UInt16, Self.UTF16View.Index == Swift.String.Index, Self.UTF8View.Element == Swift.UInt8, Self.UTF8View.Index == Swift.String.Index, Self.UnicodeScalarView.Element == Swift.Unicode.Scalar, Self.UnicodeScalarView.Index == Swift.String.Index>
 
+// These haven't actually been removed; they were replaced with @_alwaysEmitIntoClient
+// alternatives. The old silgen-name entry point was preserved under an alternative
+// source-level name. This causes a false positive with the ABI checker.
+// The symbols are still present at the ABI level. The symbols are also still present
+// at the source level. The association between them is simply no longer straightforward.
+Func UnsafeBufferPointer.withMemoryRebound(to:_:) has been removed
+Func UnsafeMutableBufferPointer.withMemoryRebound(to:_:) has been removed
+Func UnsafeMutablePointer.withMemoryRebound(to:capacity:_:) has been removed
+Func UnsafePointer.withMemoryRebound(to:capacity:_:) has been removed
+
 // *** DO NOT DISABLE OR XFAIL THIS TEST. *** (See comment above.)