Swift: more inout dataflow tests

Author: rdmarsh2

swift/ql/test/library-tests/dataflow/dataflow/DataFlow.expected

@@ -22,6 +22,9 @@ edges
 | test.swift:75:21:75:22 | &... :  | test.swift:65:16:65:28 | WriteDef :  |
 | test.swift:75:21:75:22 | &... :  | test.swift:65:16:65:28 | arg1 :  |
 | test.swift:75:21:75:22 | &... :  | test.swift:75:5:75:33 | arg2 :  |
+| test.swift:86:15:86:22 | call to source :  | test.swift:87:9:87:9 | arg[return] :  |
+| test.swift:87:9:87:9 | arg[return] :  | test.swift:104:9:104:54 | arg :  |
+| test.swift:104:9:104:54 | arg :  | test.swift:105:19:105:19 | x |
 nodes
 | test.swift:6:19:6:26 | call to source :  | semmle.label | call to source :  |
 | test.swift:7:15:7:15 | t1 | semmle.label | t1 |
@@ -56,6 +59,10 @@ nodes
 | test.swift:75:5:75:33 | arg2 :  | semmle.label | arg2 :  |
 | test.swift:75:21:75:22 | &... :  | semmle.label | &... :  |
 | test.swift:77:15:77:15 | y | semmle.label | y |
+| test.swift:86:15:86:22 | call to source :  | semmle.label | call to source :  |
+| test.swift:87:9:87:9 | arg[return] :  | semmle.label | arg[return] :  |
+| test.swift:104:9:104:54 | arg :  | semmle.label | arg :  |
+| test.swift:105:19:105:19 | x | semmle.label | x |
 subpaths
 | test.swift:75:21:75:22 | &... :  | test.swift:65:16:65:28 | WriteDef :  | test.swift:69:5:69:5 | arg2[return] :  | test.swift:75:5:75:33 | arg2 :  |
 | test.swift:75:21:75:22 | &... :  | test.swift:65:16:65:28 | arg1 :  | test.swift:69:5:69:5 | arg2[return] :  | test.swift:75:5:75:33 | arg2 :  |
@@ -69,3 +76,4 @@ subpaths
 | test.swift:50:15:50:15 | t | test.swift:43:19:43:26 | call to source :  | test.swift:50:15:50:15 | t | result |
 | test.swift:62:15:62:15 | x | test.swift:54:11:54:18 | call to source :  | test.swift:62:15:62:15 | x | result |
 | test.swift:77:15:77:15 | y | test.swift:73:18:73:25 | call to source :  | test.swift:77:15:77:15 | y | result |
+| test.swift:105:19:105:19 | x | test.swift:86:15:86:22 | call to source :  | test.swift:105:19:105:19 | x | result |

swift/ql/test/library-tests/dataflow/dataflow/LocalFlow.expected

@@ -51,3 +51,21 @@
 | test.swift:75:5:75:33 | arg2 | test.swift:75:5:75:33 | WriteDef |
 | test.swift:75:22:75:22 | x | test.swift:75:21:75:22 | &... |
 | test.swift:75:32:75:32 | y | test.swift:75:31:75:32 | &... |
+| test.swift:84:48:84:54 | WriteDef | test.swift:85:8:85:8 | bool |
+| test.swift:84:48:84:54 | bool | test.swift:85:8:85:8 | bool |
+| test.swift:86:9:86:22 | WriteDef | test.swift:87:9:87:9 | arg[return] |
+| test.swift:86:15:86:22 | call to source | test.swift:86:9:86:22 | WriteDef |
+| test.swift:93:17:93:23 | WriteDef | test.swift:104:50:104:50 | bool |
+| test.swift:93:17:93:23 | bool | test.swift:104:50:104:50 | bool |
+| test.swift:95:13:95:16 | WriteDef | test.swift:96:19:96:19 | x |
+| test.swift:95:22:95:22 | 0 | test.swift:95:13:95:16 | WriteDef |
+| test.swift:96:19:96:19 | x | test.swift:97:40:97:40 | x |
+| test.swift:97:9:97:41 | WriteDef | test.swift:98:19:98:19 | x |
+| test.swift:97:9:97:41 | arg | test.swift:97:9:97:41 | WriteDef |
+| test.swift:97:40:97:40 | x | test.swift:97:39:97:40 | &... |
+| test.swift:102:13:102:16 | WriteDef | test.swift:103:19:103:19 | x |
+| test.swift:102:22:102:22 | 0 | test.swift:102:13:102:16 | WriteDef |
+| test.swift:103:19:103:19 | x | test.swift:104:41:104:41 | x |
+| test.swift:104:9:104:54 | WriteDef | test.swift:105:19:105:19 | x |
+| test.swift:104:9:104:54 | arg | test.swift:104:9:104:54 | WriteDef |
+| test.swift:104:41:104:41 | x | test.swift:104:40:104:41 | &... |

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

@@ -75,4 +75,33 @@ func swapUser() {
     inoutSwap(arg1: &x, arg2: &y)
     sink(arg: x)
     sink(arg: y)
-}
+}
+
+func inoutSourceWithoutReturn(arg: inout Int) {
+    arg = source()
+}
+
+func inoutSourceMultipleReturn(arg: inout Int, bool: Bool) {
+    if(bool) {
+        arg = source()
+        return
+    } else {
+        arg = source()
+    }
+}
+
+func inoutUser2(bool: Bool) {
+    do {
+        var x: Int = 0
+        sink(arg: x) // clean
+        inoutSourceWithoutReturn(arg: &x)
+        sink(arg: x) // tainted
+    }
+
+    do {
+        var x: Int = 0
+        sink(arg: x) // clean
+        inoutSourceMultipleReturn(arg: &x, bool: bool)
+        sink(arg: x) // tainted by two sources
+    }
+}