Merge branch 'main' into jgrynspan/attachment-lifetimes-trait

Author: grynspan

.github/workflows/pull_request.yml

@@ -14,9 +14,10 @@ jobs:
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
     with:
       linux_swift_versions: '["nightly-main", "nightly-6.2"]'
+      linux_os_versions: '["amazonlinux2", "jammy"]'
       windows_swift_versions: '["nightly-main", "nightly-6.2"]'
       enable_macos_checks: true
-      macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.2\"}, {\"xcode_version\": \"16.3\"}]"
+      macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.2\"}, {\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
       enable_wasm_sdk_build: true
   soundness:
     name: Soundness

CMakeLists.txt

@@ -19,6 +19,8 @@ if(POLICY CMP0157)
   endif()
 endif()
 
+set(SWT_SOURCE_ROOT_DIR ${CMAKE_SOURCE_DIR})
+
 project(SwiftTesting
   LANGUAGES CXX Swift)
 

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 6.1
+// swift-tools-version: 6.2
 
 //
 // This source file is part of the Swift.org open source project
@@ -164,7 +164,7 @@ let package = Package(
         "Testing",
       ],
       path: "Tests/_MemorySafeTestingTests",
-      swiftSettings: .packageSettings + .strictMemorySafety
+      swiftSettings: .packageSettings + [.strictMemorySafety()]
     ),
 
     .macro(
@@ -369,17 +369,6 @@ extension Array where Element == PackageDescription.SwiftSetting {
       // proposal via Swift Evolution.
       .enableExperimentalFeature("SymbolLinkageMarkers"),
 
-      // This setting is no longer needed when building with a 6.2 or later
-      // toolchain now that SE-0458 has been accepted and implemented, but it is
-      // needed in order to preserve support for building with 6.1 development
-      // snapshot toolchains. (Production 6.1 toolchains can build the testing
-      // library even without this setting since this experimental feature is
-      // _suppressible_.) This setting can be removed once the minimum supported
-      // toolchain for building the testing library is ≥ 6.2. It is not needed
-      // in the CMake settings since that is expected to build using a
-      // new-enough toolchain.
-      .enableExperimentalFeature("AllowUnsafeAttribute"),
-
       .enableUpcomingFeature("InferIsolatedConformances"),
 
       // When building as a package, the macro plugin always builds as an
@@ -394,6 +383,7 @@ extension Array where Element == PackageDescription.SwiftSetting {
       .define("SWT_NO_DYNAMIC_LINKING", .whenEmbedded(or: .when(platforms: [.wasi]))),
       .define("SWT_NO_PIPES", .whenEmbedded(or: .when(platforms: [.wasi]))),
       .define("SWT_NO_FOUNDATION_FILE_COORDINATION", .whenEmbedded(or: .whenApple(false))),
+      .define("SWT_NO_IMAGE_ATTACHMENTS", .whenEmbedded(or: .when(platforms: [.linux, .custom("freebsd"), .openbsd, .wasi, .android]))),
 
       .define("SWT_NO_LEGACY_TEST_DISCOVERY", .whenEmbedded()),
       .define("SWT_NO_LIBDISPATCH", .whenEmbedded()),
@@ -436,18 +426,6 @@ extension Array where Element == PackageDescription.SwiftSetting {
 
     return result
   }
-
-  /// Settings necessary to enable Strict Memory Safety, introduced in
-  /// [SE-0458: Opt-in Strict Memory Safety Checking](https://github.com/swiftlang/swift-evolution/blob/main/proposals/0458-strict-memory-safety.md#swiftpm-integration).
-  static var strictMemorySafety: Self {
-#if compiler(>=6.2)
-    // FIXME: Adopt official `.strictMemorySafety()` condition once the minimum
-    // supported toolchain is 6.2.
-    [.unsafeFlags(["-strict-memory-safety"])]
-#else
-    []
-#endif
-  }
 }
 
 extension Array where Element == PackageDescription.CXXSetting {

Sources/Overlays/_Testing_CoreGraphics/Attachments/AttachableAsCGImage.swift

@@ -39,7 +39,7 @@ private import ImageIO
 ///   @Available(Swift, introduced: 6.3)
 /// }
 @available(_uttypesAPI, *)
-public protocol AttachableAsCGImage: SendableMetatype {
+public protocol AttachableAsCGImage: _AttachableAsImage, SendableMetatype {
   /// An instance of `CGImage` representing this image.
   ///
   /// - Throws: Any error that prevents the creation of an image.
@@ -68,22 +68,6 @@ public protocol AttachableAsCGImage: SendableMetatype {
   /// This property is not part of the public interface of the testing
   /// library. It may be removed in a future update.
   var _attachmentScaleFactor: CGFloat { get }
-
-  /// Make a copy of this instance to pass to an attachment.
-  ///
-  /// - Returns: A copy of `self`, or `self` if no copy is needed.
-  ///
-  /// The testing library uses this function to take ownership of image
-  /// resources that test authors pass to it. If possible, make a copy of or add
-  /// a reference to `self`. If this type does not support making copies, return
-  /// `self` verbatim.
-  ///
-  /// The default implementation of this function when `Self` conforms to
-  /// `Sendable` simply returns `self`.
-  ///
-  /// This function is not part of the public interface of the testing library.
-  /// It may be removed in a future update.
-  func _copyAttachableValue() -> Self
 }
 
 @available(_uttypesAPI, *)
@@ -95,6 +79,8 @@ extension AttachableAsCGImage {
   public var _attachmentScaleFactor: CGFloat {
     1.0
   }
+
+  public func _deinitializeAttachableValue() {}
 }
 
 @available(_uttypesAPI, *)

Sources/Overlays/_Testing_CoreGraphics/CMakeLists.txt

@@ -11,7 +11,6 @@ if(APPLE)
     Attachments/_AttachableImageWrapper+AttachableWrapper.swift
     Attachments/AttachableAsCGImage.swift
     Attachments/AttachableImageFormat+UTType.swift
-    Attachments/Attachment+AttachableAsCGImage.swift
     Attachments/CGImage+AttachableAsCGImage.swift
     ReexportTesting.swift)
 

Sources/Overlays/_Testing_WinSDK/Attachments/AttachableAsIWICBitmapSource.swift

@@ -113,7 +113,7 @@ public protocol _AttachableByAddressAsIWICBitmapSource {
 /// you have an image in another format that needs to be attached to a test,
 /// first convert it to an instance of one of the types above.
 @_spi(Experimental)
-public protocol AttachableAsIWICBitmapSource: SendableMetatype {
+public protocol AttachableAsIWICBitmapSource: _AttachableAsImage, SendableMetatype {
   /// Create a WIC bitmap source representing an instance of this type.
   ///
   /// - Returns: A pointer to a new WIC bitmap source representing this image.
@@ -145,39 +145,6 @@ public protocol AttachableAsIWICBitmapSource: SendableMetatype {
   func _copyAttachableIWICBitmapSource(
     using factory: UnsafeMutablePointer<IWICImagingFactory>
   ) throws -> UnsafeMutablePointer<IWICBitmapSource>
-
-  /// Make a copy of this instance.
-  ///
-  /// - Returns: A copy of `self`, or `self` if this type does not support a
-  ///   copying operation.
-  ///
-  /// The testing library uses this function to take ownership of image
-  /// resources that test authors pass to it. If possible, make a copy of or add
-  /// a reference to `self`. If this type does not support making copies, return
-  /// `self` verbatim.
-  ///
-  /// The default implementation of this function when `Self` conforms to
-  /// `Sendable` simply returns `self`.
-  ///
-  /// This function is not part of the public interface of the testing library.
-  /// It may be removed in a future update.
-  func _copyAttachableValue() -> Self
-
-  /// Manually deinitialize any resources associated with this image.
-  ///
-  /// The implementation of this function cleans up any resources (such as
-  /// handles or COM objects) associated with this image. The testing library
-  /// automatically invokes this function as needed.
-  ///
-  /// This function is not responsible for releasing the image returned from
-  /// `_copyAttachableIWICBitmapSource(using:)`.
-  ///
-  /// The default implementation of this function when `Self` conforms to
-  /// `Sendable` does nothing.
-  ///
-  /// This function is not part of the public interface of the testing library.
-  /// It may be removed in a future update.
-  func _deinitializeAttachableValue()
 }
 
 extension AttachableAsIWICBitmapSource {
@@ -187,12 +154,4 @@ extension AttachableAsIWICBitmapSource {
     try copyAttachableIWICBitmapSource()
   }
 }
-
-extension AttachableAsIWICBitmapSource where Self: Sendable {
-  public func _copyAttachableValue() -> Self {
-    self
-  }
-
-  public func _deinitializeAttachableValue() {}
-}
 #endif

Sources/Overlays/_Testing_WinSDK/Attachments/Attachment+AttachableAsIWICBitmapSource.swift

@@ -13,7 +13,7 @@ private import Testing
 public import WinSDK
 
 @_spi(Experimental)
-extension UnsafeMutablePointer: AttachableAsIWICBitmapSource where Pointee: _AttachableByAddressAsIWICBitmapSource {
+extension UnsafeMutablePointer: _AttachableAsImage, AttachableAsIWICBitmapSource where Pointee: _AttachableByAddressAsIWICBitmapSource {
   public func copyAttachableIWICBitmapSource() throws -> UnsafeMutablePointer<IWICBitmapSource> {
     let factory = try IWICImagingFactory.create()
     defer {
@@ -30,7 +30,7 @@ extension UnsafeMutablePointer: AttachableAsIWICBitmapSource where Pointee: _Att
     Pointee._copyAttachableValue(at: self)
   }
 
-  public consuming func _deinitializeAttachableValue() {
+  public func _deinitializeAttachableValue() {
     Pointee._deinitializeAttachableValue(at: self)
   }
 }

Sources/Overlays/_Testing_WinSDK/Attachments/UnsafeMutablePointer+AttachableAsIWICBitmapSource.swift

@@ -11,7 +11,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     Attachments/_AttachableImageWrapper+AttachableWrapper.swift
     Attachments/AttachableAsIWICBitmapSource.swift
     Attachments/AttachableImageFormat+CLSID.swift
-    Attachments/Attachment+AttachableAsIWICBitmapSource.swift
     Attachments/HBITMAP+AttachableAsIWICBitmapSource.swift
     Attachments/HICON+AttachableAsIWICBitmapSource.swift
     Attachments/IWICBitmapSource+AttachableAsIWICBitmapSource.swift

Sources/Overlays/_Testing_WinSDK/CMakeLists.txt

@@ -31,6 +31,9 @@
 /// @Metadata {
 ///   @Available(Swift, introduced: 6.3)
 /// }
+#if SWT_NO_IMAGE_ATTACHMENTS
+@available(*, unavailable, message: "Image attachments are not available on this platform.")
+#endif
 @available(_uttypesAPI, *)
 public struct AttachableImageFormat: Sendable {
   /// An enumeration describing the various kinds of image format that can be
@@ -77,6 +80,9 @@ public struct AttachableImageFormat: Sendable {
 
 // MARK: -
 
+#if SWT_NO_IMAGE_ATTACHMENTS
+@available(*, unavailable, message: "Image attachments are not available on this platform.")
+#endif
 @available(_uttypesAPI, *)
 extension AttachableImageFormat {
   /// The PNG image format.