[stdlib] remove bulk-update from MutableRawSpan per SE-0485

Author: glessard

stdlib/public/core/Span/MutableRawSpan.swift

@@ -360,108 +360,6 @@ extension MutableRawSpan {
   }
 }
 
-// FIXME: The functions in this extension crash the SIL optimizer when built inside
-// the stub. But these declarations don't generate a public symbol anyway.
-#if !SPAN_COMPATIBILITY_STUB
-
-//MARK: copyMemory
-@available(SwiftCompatibilitySpan 5.0, *)
-@_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)
-extension MutableRawSpan {
-
-  @_alwaysEmitIntoClient
-  @lifetime(self: copy self)
-  public mutating func update<S: Sequence>(
-    from source: S
-  ) -> (unwritten: S.Iterator, byteOffset: Int) where S.Element: BitwiseCopyable {
-    var iterator = source.makeIterator()
-    let offset = update(from: &iterator)
-    return (iterator, offset)
-  }
-
-  @_alwaysEmitIntoClient
-  @lifetime(self: copy self)
-  public mutating func update<Element: BitwiseCopyable>(
-    from elements: inout some IteratorProtocol<Element>
-  ) -> Int {
-    var offset = 0
-    while offset + MemoryLayout<Element>.stride <= _count {
-      guard let element = elements.next() else { break }
-      unsafe storeBytes(
-        of: element, toUncheckedByteOffset: offset, as: Element.self
-      )
-      offset &+= MemoryLayout<Element>.stride
-    }
-    return offset
-  }
-
-  @_alwaysEmitIntoClient
-  @lifetime(self: copy self)
-  public mutating func update<C: Collection>(
-    fromContentsOf source: C
-  ) -> Int where C.Element: BitwiseCopyable {
-    let newOffset = source.withContiguousStorageIfAvailable {
-      self.update(fromContentsOf: unsafe RawSpan(_unsafeElements: $0))
-    }
-    if let newOffset { return newOffset }
-
-    var elements = source.makeIterator()
-    let lastOffset = update(from: &elements)
-    _precondition(
-      elements.next() == nil,
-      "destination span cannot contain every element from source."
-    )
-    return lastOffset
-  }
-
-  @_alwaysEmitIntoClient
-  @lifetime(self: copy self)
-  public mutating func update<Element: BitwiseCopyable>(
-    fromContentsOf source: Span<Element>
-  ) -> Int {
-//    update(from: source.bytes)
-    unsafe source.withUnsafeBytes {
-      unsafe update(fromContentsOf: $0)
-    }
-  }
-
-  @_alwaysEmitIntoClient
-  @lifetime(self: copy self)
-  public mutating func update<Element: BitwiseCopyable>(
-    fromContentsOf source: borrowing MutableSpan<Element>
-  ) -> Int {
-//    update(from: source.span.bytes)
-    unsafe source.withUnsafeBytes {
-      unsafe update(fromContentsOf: $0)
-    }
-  }
-
-  @_alwaysEmitIntoClient
-  @lifetime(self: copy self)
-  public mutating func update(
-    fromContentsOf source: RawSpan
-  ) -> Int {
-    _precondition(
-      source.byteCount <= self.byteCount,
-      "destination span cannot contain every byte from source."
-    )
-    if source.byteCount == 0 { return 0 }
-    unsafe source.withUnsafeBytes {
-      unsafe _start().copyMemory(from: $0.baseAddress!, byteCount: $0.count)
-    }
-    return source.byteCount
-  }
-
-  @_alwaysEmitIntoClient
-  @lifetime(self: copy self)
-  public mutating func update(
-    fromContentsOf source: borrowing MutableRawSpan
-  ) -> Int {
-    update(fromContentsOf: source.bytes)
-  }
-}
-#endif
-
 // MARK: sub-spans
 @available(SwiftCompatibilitySpan 5.0, *)
 @_originallyDefinedIn(module: "Swift;CompatibilitySpan", SwiftCompatibilitySpan 6.2)

test/stdlib/Span/MutableRawSpanTests.swift

@@ -281,110 +281,6 @@ suite.test("storeBytes(of:as:)")
   expectEqual(a[0].bigEndian & 0xffff, 0xffff)
 }
 
-suite.test("update(from: some Sequence<some BitwiseCopyable>)")
-.skip(.custom(
-  { if #available(SwiftStdlib 6.2, *) { false } else { true } },
-  reason: "Requires Swift 6.2's standard library"
-))
-.code {
-  guard #available(SwiftStdlib 6.2, *) else { return }
-
-  let capacity = 8
-  var a = Array(repeating: Int.max, count: capacity)
-  expectEqual(a.allSatisfy({ $0 == .max }), true)
-  a.withUnsafeMutableBufferPointer {
-    let empty = UnsafeMutableBufferPointer<Int>(start: nil, count: 0)
-    var span = MutableRawSpan(_unsafeElements: empty)
-    var (iterator, updated) = span.update(from: 0..<0)
-    expectNil(iterator.next())
-    expectEqual(updated, 0)
-
-    span = MutableRawSpan(_unsafeElements: $0)
-    (iterator, updated) = span.update(from: 0..<0)
-    expectNil(iterator.next())
-    expectEqual(updated, 0)
-
-    (iterator, updated) = span.update(from: 0..<10000)
-    expectNotNil(iterator.next())
-    expectEqual(updated, capacity*MemoryLayout<Int>.stride)
-  }
-  expectEqual(a.elementsEqual(0..<capacity), true)
-}
-
-suite.test("update(from: some Collection<some BitwiseCopyable>)")
-.skip(.custom(
-  { if #available(SwiftStdlib 6.2, *) { false } else { true } },
-  reason: "Requires Swift 6.2's standard library"
-))
-.code {
-  guard #available(SwiftStdlib 6.2, *) else { return }
-
-  let capacity = 8
-  var a = Array(repeating: Int.max, count: capacity)
-  let e = Array(EmptyCollection<UInt>())
-  expectEqual(a.allSatisfy({ $0 == .max }), true)
-  a.withUnsafeMutableBytes {
-    let emptyPrefix = $0.prefix(0)
-    var span = MutableRawSpan(_unsafeBytes: emptyPrefix)
-    var updated = span.update(fromContentsOf: e)
-    expectEqual(updated, 0)
-
-
-    updated = span.update(fromContentsOf: AnyCollection(e))
-    expectEqual(updated, 0)
-
-    span = MutableRawSpan(_unsafeBytes: $0)
-    updated = span.update(fromContentsOf: 0..<capacity)
-    expectEqual(updated, capacity*MemoryLayout<Int>.stride)
-  }
-  expectEqual(a.elementsEqual(0..<capacity), true)
-}
-
-suite.test("update(fromContentsOf:) (contiguous memory)")
-.skip(.custom(
-  { if #available(SwiftStdlib 6.2, *) { false } else { true } },
-  reason: "Requires Swift 6.2's standard library"
-))
-.code {
-  guard #available(SwiftStdlib 6.2, *) else { return }
-
-  let capacity = 8
-  var a = Array(repeating: Int.max, count: capacity)
-  expectEqual(a.allSatisfy({ $0 == .max }), true)
-  a.withUnsafeMutableBytes {
-    var span = MutableRawSpan(_unsafeBytes: $0)
-    let array = Array(0..<capacity)
-    var updated = span.update(fromContentsOf: array.prefix(0))
-    expectEqual(updated, 0)
-
-    updated = span.update(fromContentsOf: array)
-    expectEqual(updated, capacity*MemoryLayout<Int>.stride)
-  }
-  expectEqual(a.elementsEqual(0..<capacity), true)
-
-  a.withUnsafeMutableBytes {
-    var span = MutableRawSpan(_unsafeBytes: $0)
-    var array = Array(repeating: Int.min, count: capacity)
-    array.withUnsafeMutableBytes {
-      let source = MutableRawSpan(_unsafeBytes: $0)
-      let updated = span.update(fromContentsOf: source)
-      expectEqual(updated, capacity*MemoryLayout<Int>.stride)
-    }
-  }
-  expectEqual(a.allSatisfy({ $0 == Int.min }), true)
-
-  a.withUnsafeMutableBytes {
-    var span = MutableRawSpan(_unsafeBytes: $0)
-    let array = Array(0..<capacity)
-    array.withUnsafeBufferPointer {
-      let source = Span(_unsafeElements: $0)
-      let updated = span.update(fromContentsOf: source)
-      expectEqual(updated, capacity*MemoryLayout<Int>.stride)
-    }
-  }
-  expectEqual(a.elementsEqual(0..<capacity), true)
-}
-
 suite.test("_mutatingExtracting()")
 .skip(.custom(
   { if #available(SwiftStdlib 6.2, *) { false } else { true } },