Fix test failures related to Optional: KeyPathIterable conformance (#1112)

texasmichelle · web-flow · commit 28879648a8ea · 2020-10-30T12:17:34.000-07:00
* Apply fix from #1090
diff --git a/Sources/x10/swift_bindings/apis/CrossReplicaSum.swift b/Sources/x10/swift_bindings/apis/CrossReplicaSum.swift
@@ -49,7 +49,7 @@ extension _KeyPathIterableBase {
       let joinedkp = kp.appending(path: nkp)!
       if let valueType = type(of: joinedkp).valueType as? CrossReplicaSummable.Type {
         valueType._doCrossReplicaSum(&root, joinedkp, scale)
-      } else if let nested = self[keyPath: nkp] as? _KeyPathIterableBase {
+      } else if let value = self[keyPath: nkp], let nested = value as? _KeyPathIterableBase {
         nested.crossReplicaSumChild(&root, joinedkp, scale)
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ extension _KeyPathIterableBase {`
`49`	`49`	`let joinedkp = kp.appending(path: nkp)!`
`50`	`50`	`if let valueType = type(of: joinedkp).valueType as? CrossReplicaSummable.Type {`
`51`	`51`	`valueType._doCrossReplicaSum(&root, joinedkp, scale)`
`52`		`- } else if let nested = self[keyPath: nkp] as? _KeyPathIterableBase {`
	`52`	`+ } else if let value = self[keyPath: nkp], let nested = value as? _KeyPathIterableBase {`
`53`	`53`	`nested.crossReplicaSumChild(&root, joinedkp, scale)`
`54`	`54`	`}`
`55`	`55`	`}`