one more thing

pointfreeco · Jun 13, 2024 · e8dfd3e · e8dfd3e
1 parent b2cc29c
commit e8dfd3e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/Sources/Perception/Internal/RuntimeWarning.swift b/Sources/Perception/Internal/RuntimeWarning.swift
@@ -16,7 +16,7 @@ func runtimeWarn(
       #if canImport(os)
         os_log(
           .fault,
-          dso: dso.value,
+          dso: dso,
           log: OSLog(subsystem: "com.apple.runtime-issues", category: category),
           "%@",
           message
@@ -28,7 +28,8 @@ func runtimeWarn(
   #endif
 }
 
-#if DEBUG
+#if !DEBUG
+#else
   import XCTestDynamicOverlay
 
   #if canImport(os)
@@ -39,8 +40,15 @@ func runtimeWarn(
     //     To work around this, we hook into SwiftUI's runtime issue delivery mechanism, instead.
     //
     // Feedback filed: https://gist.github.com/stephencelis/a8d06383ed6ccde3e5ef5d1b3ad52bbc
-    @usableFromInline
-    let dso = UncheckedSendable<UnsafeMutableRawPointer>({
+    #if swift(>=5.10)
+      @usableFromInline
+      nonisolated(unsafe) let dso = getSwiftUIDSO()
+    #else
+      @usableFromInline
+      let dso = getSwiftUIDSO()
+    #endif
+
+    private func getSwiftUIDSO() -> UnsafeMutableRawPointer {
       let count = _dyld_image_count()
       for i in 0..<count {
         if let name = _dyld_get_image_name(i) {
@@ -53,7 +61,7 @@ func runtimeWarn(
         }
       }
       return UnsafeMutableRawPointer(mutating: #dsohandle)
-    }())
+    }
   #else
     import Foundation
 

diff --git a/Sources/Perception/Internal/UncheckedSendable.swift b/Sources/Perception/Internal/UncheckedSendable.swift
@@ -1,6 +1,6 @@
-@usableFromInline struct UncheckedSendable<Value>: @unchecked Sendable {
-  @usableFromInline let value: Value
-  @usableFromInline init(_ value: Value) {
+struct UncheckedSendable<Value>: @unchecked Sendable {
+  let value: Value
+  init(_ value: Value) {
     self.value = value
   }
 }