@@ -69,11 +69,9 @@ import Foundation
69
69
while !placeholderModules. isEmpty {
70
70
let moduleId = placeholderModules. first!
71
71
let swiftModuleId = ModuleDependencyId . swift ( moduleId. moduleName)
72
-
73
- guard dependencyOracle. getModuleInfo ( of: swiftModuleId) != nil else {
72
+ guard let moduleInfo = dependencyOracle. getModuleInfo ( of: swiftModuleId) else {
74
73
throw Driver . Error. missingExternalDependency ( moduleId. moduleName)
75
74
}
76
- let moduleInfo = dependencyOracle. getModuleInfo ( of: swiftModuleId) !
77
75
78
76
// Insert the resolved module, replacing the placeholder.
79
77
try Self . mergeModule ( swiftModuleId, moduleInfo, into: & modules)
@@ -111,17 +109,18 @@ fileprivate extension InterModuleDependencyGraph {
111
109
// in the multi-module build planning context.
112
110
let swiftModuleId = ModuleDependencyId . swift ( placeholderId. moduleName)
113
111
let swiftPrebuiltModuleId = ModuleDependencyId . swiftPrebuiltExternal ( placeholderId. moduleName)
114
-
115
112
let externalModuleId : ModuleDependencyId
116
- if dependencyOracle. getModuleInfo ( of: swiftModuleId) != nil {
113
+ let externalModuleInfo : ModuleInfo
114
+ if let moduleInfo = dependencyOracle. getModuleInfo ( of: swiftModuleId) {
117
115
externalModuleId = swiftModuleId
118
- } else if dependencyOracle. getModuleInfo ( of: swiftPrebuiltModuleId) != nil {
116
+ externalModuleInfo = moduleInfo
117
+ } else if let prebuiltModuleInfo = dependencyOracle. getModuleInfo ( of: swiftPrebuiltModuleId) {
119
118
externalModuleId = swiftPrebuiltModuleId
119
+ externalModuleInfo = prebuiltModuleInfo
120
120
} else {
121
121
throw Driver . Error. missingExternalDependency ( placeholderId. moduleName)
122
122
}
123
123
124
- let externalModuleInfo = dependencyOracle. getModuleInfo ( of: externalModuleId) !
125
124
let newExternalModuleDetails =
126
125
SwiftPrebuiltExternalModuleDetails ( compiledModulePath: placeholderPath. description)
127
126
let newInfo = ModuleInfo ( modulePath: placeholderPath. description,
0 commit comments