Rust: Add more local data flow tests

Author: hvitved

rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected

@@ -1,31 +1,50 @@
 | main.rs:2:9:2:9 | [SSA] s | main.rs:3:33:3:33 | s |
 | main.rs:2:13:2:19 | "Hello" | main.rs:2:9:2:9 | s |
 | main.rs:6:18:6:21 | [SSA] cond | main.rs:9:16:9:19 | cond |
-| main.rs:7:9:7:9 | [SSA] a | main.rs:10:9:10:9 | a |
+| main.rs:7:9:7:9 | [SSA] a | main.rs:9:23:9:23 | a |
 | main.rs:7:13:7:13 | 1 | main.rs:7:9:7:9 | a |
-| main.rs:8:9:8:9 | [SSA] b | main.rs:12:9:12:9 | b |
+| main.rs:8:9:8:9 | [SSA] b | main.rs:9:34:9:34 | b |
 | main.rs:8:13:8:13 | 2 | main.rs:8:9:8:9 | b |
-| main.rs:9:9:9:9 | [SSA] c | main.rs:14:5:14:5 | c |
-| main.rs:9:13:13:5 | IfExpr | main.rs:9:9:9:9 | c |
-| main.rs:9:21:11:5 | BlockExpr | main.rs:9:13:13:5 | IfExpr |
-| main.rs:10:9:10:9 | a | main.rs:9:21:11:5 | BlockExpr |
-| main.rs:11:12:13:5 | BlockExpr | main.rs:9:13:13:5 | IfExpr |
-| main.rs:12:9:12:9 | b | main.rs:11:12:13:5 | BlockExpr |
-| main.rs:14:5:14:5 | c | main.rs:6:37:15:1 | BlockExpr |
-| main.rs:18:9:18:9 | [SSA] a | main.rs:20:15:20:15 | a |
-| main.rs:18:13:18:13 | 1 | main.rs:18:9:18:9 | a |
-| main.rs:19:9:19:9 | [SSA] b | main.rs:22:5:22:5 | b |
-| main.rs:19:13:21:5 | LoopExpr | main.rs:19:9:19:9 | b |
-| main.rs:20:9:20:15 | BreakExpr | main.rs:19:13:21:5 | LoopExpr |
-| main.rs:20:15:20:15 | a | main.rs:20:9:20:15 | BreakExpr |
-| main.rs:22:5:22:5 | b | main.rs:17:29:23:1 | BlockExpr |
-| main.rs:26:17:26:17 | 1 | main.rs:26:9:26:13 | i |
-| main.rs:27:5:27:5 | [SSA] i | main.rs:28:5:28:5 | i |
-| main.rs:27:5:27:5 | i | main.rs:27:5:27:5 | [SSA] i |
-| main.rs:28:5:28:5 | i | main.rs:25:24:29:1 | BlockExpr |
-| main.rs:31:21:31:21 | [SSA] a | main.rs:33:20:33:20 | a |
-| main.rs:31:29:31:29 | [SSA] b | main.rs:34:17:34:17 | b |
-| main.rs:31:37:31:37 | [SSA] c | main.rs:32:11:32:11 | c |
-| main.rs:32:5:35:5 | MatchExpr | main.rs:31:60:36:1 | BlockExpr |
-| main.rs:33:20:33:20 | a | main.rs:32:5:35:5 | MatchExpr |
-| main.rs:34:17:34:17 | b | main.rs:32:5:35:5 | MatchExpr |
+| main.rs:9:9:9:9 | [SSA] c | main.rs:10:5:10:5 | c |
+| main.rs:9:13:9:36 | IfExpr | main.rs:9:9:9:9 | c |
+| main.rs:9:21:9:25 | BlockExpr | main.rs:9:13:9:36 | IfExpr |
+| main.rs:9:23:9:23 | a | main.rs:9:21:9:25 | BlockExpr |
+| main.rs:9:32:9:36 | BlockExpr | main.rs:9:13:9:36 | IfExpr |
+| main.rs:9:34:9:34 | b | main.rs:9:32:9:36 | BlockExpr |
+| main.rs:10:5:10:5 | c | main.rs:6:37:11:1 | BlockExpr |
+| main.rs:14:9:14:9 | [SSA] a | main.rs:16:15:16:15 | a |
+| main.rs:14:13:14:13 | 1 | main.rs:14:9:14:9 | a |
+| main.rs:15:9:15:9 | [SSA] b | main.rs:18:5:18:5 | b |
+| main.rs:15:13:17:5 | LoopExpr | main.rs:15:9:15:9 | b |
+| main.rs:16:9:16:15 | BreakExpr | main.rs:15:13:17:5 | LoopExpr |
+| main.rs:16:15:16:15 | a | main.rs:16:9:16:15 | BreakExpr |
+| main.rs:18:5:18:5 | b | main.rs:13:29:19:1 | BlockExpr |
+| main.rs:22:17:22:17 | 1 | main.rs:22:9:22:13 | i |
+| main.rs:23:5:23:5 | [SSA] i | main.rs:24:5:24:5 | i |
+| main.rs:23:5:23:5 | i | main.rs:23:5:23:5 | [SSA] i |
+| main.rs:24:5:24:5 | i | main.rs:21:24:25:1 | BlockExpr |
+| main.rs:27:21:27:21 | [SSA] a | main.rs:29:20:29:20 | a |
+| main.rs:27:29:27:29 | [SSA] b | main.rs:30:17:30:17 | b |
+| main.rs:27:37:27:37 | [SSA] c | main.rs:28:11:28:11 | c |
+| main.rs:28:5:31:5 | MatchExpr | main.rs:27:60:32:1 | BlockExpr |
+| main.rs:29:20:29:20 | a | main.rs:28:5:31:5 | MatchExpr |
+| main.rs:30:17:30:17 | b | main.rs:28:5:31:5 | MatchExpr |
+| main.rs:35:9:35:9 | [SSA] a | main.rs:36:5:36:5 | a |
+| main.rs:35:13:35:17 | BlockExpr | main.rs:35:9:35:9 | a |
+| main.rs:35:15:35:15 | 0 | main.rs:35:13:35:17 | BlockExpr |
+| main.rs:36:5:36:5 | a | main.rs:34:31:37:1 | BlockExpr |
+| main.rs:39:22:39:22 | [SSA] b | main.rs:41:12:41:12 | b |
+| main.rs:40:9:40:9 | [SSA] a | main.rs:46:5:46:5 | a |
+| main.rs:40:13:45:5 | BlockExpr | main.rs:40:9:40:9 | a |
+| main.rs:41:12:41:12 | b | main.rs:41:9:43:9 | IfExpr |
+| main.rs:42:13:42:26 | BreakExpr | main.rs:40:13:45:5 | BlockExpr |
+| main.rs:42:26:42:26 | 1 | main.rs:42:13:42:26 | BreakExpr |
+| main.rs:44:9:44:9 | 2 | main.rs:40:13:45:5 | BlockExpr |
+| main.rs:46:5:46:5 | a | main.rs:39:38:47:1 | BlockExpr |
+| main.rs:49:22:49:22 | [SSA] b | main.rs:51:12:51:12 | b |
+| main.rs:50:9:50:9 | [SSA] a | main.rs:56:5:56:5 | a |
+| main.rs:50:13:55:5 | BlockExpr | main.rs:50:9:50:9 | a |
+| main.rs:51:12:51:12 | b | main.rs:51:9:53:9 | IfExpr |
+| main.rs:52:26:52:26 | 1 | main.rs:52:13:52:26 | BreakExpr |
+| main.rs:54:22:54:22 | 2 | main.rs:54:9:54:22 | BreakExpr |
+| main.rs:56:5:56:5 | a | main.rs:49:38:57:1 | BlockExpr |

rust/ql/test/library-tests/dataflow/local/main.rs

@@ -6,11 +6,7 @@ fn variable() {
 fn if_expression(cond: bool) -> i64 {
     let a = 1;
     let b = 2;
-    let c = if cond {
-        a
-    } else {
-        b
-    };
+    let c = if cond { a } else { b };
     c
 }
 
@@ -35,7 +31,35 @@ fn match_expression(a: i64, b: i64, c: Option<i64>) -> i64 {
     }
 }
 
+fn block_expression1() -> i64 {
+    let a = { 0 };
+    a
+}
+
+fn block_expression2(b: bool) -> i64 {
+    let a = 'block: {
+        if b {
+            break 'block 1;
+        };
+        2
+    };
+    a
+}
+
+fn block_expression3(b: bool) -> i64 {
+    let a = 'block: {
+        if b {
+            break 'block 1;
+        }
+        break 'block 2;
+    };
+    a
+}
+
 fn main() {
     variable();
     if_expression(true);
+    block_expression1();
+    block_expression2(true);
+    block_expression3(true);
 }