Skip to content

Commit cdc22da

Browse files
authored
Fix crash related to build conditionals (#2941)
This fixes a crash related to build conditionals which looks like a longer standing bug that was triggered by swiftlang/swift-llbuild#681 Unforunately, llbuild CI doesn't test the package, so it slipped through and now causes SwiftPM to crash when building itself rdar://problem/67432513
1 parent aa589c7 commit cdc22da

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Sources/PackageLoading/PackageBuilder.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -829,12 +829,12 @@ public final class PackageBuilder {
829829
func buildConditions(from condition: PackageConditionDescription?) -> [PackageConditionProtocol] {
830830
var conditions: [PackageConditionProtocol] = []
831831

832-
if let config = condition?.config.map({ BuildConfiguration(rawValue: $0)! }) {
832+
if let config = condition?.config.flatMap({ BuildConfiguration(rawValue: $0) }) {
833833
let condition = ConfigurationCondition(configuration: config)
834834
conditions.append(condition)
835835
}
836836

837-
if let platforms = condition?.platformNames.map({ platformRegistry.platformByName[$0]! }), !platforms.isEmpty {
837+
if let platforms = condition?.platformNames.flatMap({ platformRegistry.platformByName[$0] }), !platforms.isEmpty {
838838
let condition = PlatformsCondition(platforms: platforms)
839839
conditions.append(condition)
840840
}

0 commit comments

Comments
 (0)