Swift: Effect of merging with main to get the AnyTryExpr fix.

Author: geoffw0

swift/ql/test/library-tests/dataflow/taint/Taint.expected

@@ -10,6 +10,8 @@ edges
 | string.swift:28:17:28:25 | call to source2() :  | string.swift:36:13:36:23 | ... call to +(_:_:) ... |
 | string.swift:28:17:28:25 | call to source2() :  | string.swift:39:13:39:29 | ... call to +(_:_:) ... |
 | try.swift:9:17:9:24 | call to source() :  | try.swift:9:13:9:24 | try ... |
+| try.swift:15:17:15:24 | call to source() :  | try.swift:15:12:15:24 | try! ... |
+| try.swift:18:18:18:25 | call to source() :  | try.swift:18:12:18:27 | ...! |
 | url.swift:13:16:13:23 | call to source() :  | url.swift:18:12:18:12 | urlTainted |
 | url.swift:13:16:13:23 | call to source() :  | url.swift:21:12:21:49 | ...! |
 | url.swift:13:16:13:23 | call to source() :  | url.swift:23:12:23:54 | ...! |
@@ -29,6 +31,10 @@ nodes
 | string.swift:39:13:39:29 | ... call to +(_:_:) ... | semmle.label | ... call to +(_:_:) ... |
 | try.swift:9:13:9:24 | try ... | semmle.label | try ... |
 | try.swift:9:17:9:24 | call to source() :  | semmle.label | call to source() :  |
+| try.swift:15:12:15:24 | try! ... | semmle.label | try! ... |
+| try.swift:15:17:15:24 | call to source() :  | semmle.label | call to source() :  |
+| try.swift:18:12:18:27 | ...! | semmle.label | ...! |
+| try.swift:18:18:18:25 | call to source() :  | semmle.label | call to source() :  |
 | url.swift:13:16:13:23 | call to source() :  | semmle.label | call to source() :  |
 | url.swift:18:12:18:12 | urlTainted | semmle.label | urlTainted |
 | url.swift:21:12:21:49 | ...! | semmle.label | ...! |
@@ -47,6 +53,8 @@ subpaths
 | string.swift:36:13:36:23 | ... call to +(_:_:) ... | string.swift:28:17:28:25 | call to source2() :  | string.swift:36:13:36:23 | ... call to +(_:_:) ... | result |
 | string.swift:39:13:39:29 | ... call to +(_:_:) ... | string.swift:28:17:28:25 | call to source2() :  | string.swift:39:13:39:29 | ... call to +(_:_:) ... | result |
 | try.swift:9:13:9:24 | try ... | try.swift:9:17:9:24 | call to source() :  | try.swift:9:13:9:24 | try ... | result |
+| try.swift:15:12:15:24 | try! ... | try.swift:15:17:15:24 | call to source() :  | try.swift:15:12:15:24 | try! ... | result |
+| try.swift:18:12:18:27 | ...! | try.swift:18:18:18:25 | call to source() :  | try.swift:18:12:18:27 | ...! | result |
 | url.swift:18:12:18:12 | urlTainted | url.swift:13:16:13:23 | call to source() :  | url.swift:18:12:18:12 | urlTainted | result |
 | url.swift:21:12:21:49 | ...! | url.swift:13:16:13:23 | call to source() :  | url.swift:21:12:21:49 | ...! | result |
 | url.swift:23:12:23:54 | ...! | url.swift:13:16:13:23 | call to source() :  | url.swift:23:12:23:54 | ...! | result |

swift/ql/test/library-tests/dataflow/taint/try.swift

@@ -12,8 +12,8 @@ func taintThroughTry() {
 	}
 
 	sink(arg: try! clean())
-	sink(arg: try! source()) // tainted [NOT DETECTED]
+	sink(arg: try! source()) // tainted
 
 	sink(arg: (try? clean())!)
-	sink(arg: (try? source())!) // tainted [NOT DETECTED]
+	sink(arg: (try? source())!) // tainted
 }