Skip to content

Commit dc28065

Browse files
committed
Pull in upstream trunk Testing fix for Android on the CI
1 parent f20e148 commit dc28065

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

swift-android-trunk-libdispatch.patch

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,24 @@ index 016bf294..5c42986a 100644
1313
endif()
1414

1515
if(dispatch_FOUND)
16+
commit 5ac9500a5d858868e518a56fa0197be65b759ef4
17+
Author: Jonathan Grynspan <[email protected]>
18+
Date: Thu Oct 16 18:57:31 2025 -0400
19+
20+
Fix backtrace() call on Android being optional
21+
22+
diff --git a/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift b/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
23+
index 6f6fcaab..552e16d6 100644
24+
--- a/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
25+
+++ b/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
26+
@@ -77,7 +77,9 @@ public struct Backtrace: Sendable {
27+
}
28+
#elseif os(Android)
29+
#if !SWT_NO_DYNAMIC_LINKING
30+
- initializedCount = .init(clamping: _backtrace?(addresses.baseAddress!, .init(clamping: addresses.count)))
31+
+ if let _backtrace {
32+
+ initializedCount = .init(clamping: _backtrace(addresses.baseAddress!, .init(clamping: addresses.count)))
33+
+ }
34+
#endif
35+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD)
36+
initializedCount = .init(clamping: backtrace(addresses.baseAddress!, .init(clamping: addresses.count)))

0 commit comments

Comments
 (0)