diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStmts.expected b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStmts.expected
index 69581c248ad3c..8fe0abd91c0e3 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStmts.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStmts.expected
@@ -1,81 +1,81 @@
-| Test.kt:3:1:80:1 | { ... } | 0 | Test.kt:3:1:80:1 | { ... } |
-| Test.kt:3:1:80:1 | { ... } | 1 | Test.kt:3:1:80:1 | super(...) |
-| Test.kt:3:1:80:1 | { ... } | 2 | Test.kt:3:1:80:1 | { ... } |
-| Test.kt:3:1:80:1 | { ... } | 3 | Test.kt:3:1:80:1 | Test |
-| Test.kt:4:2:79:2 | test | 0 | Test.kt:4:2:79:2 | test |
+| Test.kt:3:8:80:1 | { ... } | 0 | Test.kt:3:8:80:1 | { ... } |
+| Test.kt:3:8:80:1 | { ... } | 1 | Test.kt:3:1:80:1 | super(...) |
+| Test.kt:3:8:80:1 | { ... } | 2 | Test.kt:3:8:80:1 | { ... } |
+| Test.kt:3:8:80:1 | { ... } | 3 | Test.kt:3:8:80:1 | Exit |
+| Test.kt:4:2:79:2 | Exit | 0 | Test.kt:4:2:79:2 | Exit |
 | Test.kt:4:13:79:2 | { ... } | 0 | Test.kt:4:13:79:2 | { ... } |
-| Test.kt:4:13:79:2 | { ... } | 1 | Test.kt:5:3:5:16 | var ...; |
+| Test.kt:4:13:79:2 | { ... } | 1 | Test.kt:5:7:5:7 | var ...; |
 | Test.kt:4:13:79:2 | { ... } | 2 | Test.kt:5:16:5:16 | 0 |
-| Test.kt:4:13:79:2 | { ... } | 3 | Test.kt:5:3:5:16 | x |
-| Test.kt:4:13:79:2 | { ... } | 4 | Test.kt:6:3:6:18 | var ...; |
+| Test.kt:4:13:79:2 | { ... } | 3 | Test.kt:5:7:5:7 | x |
+| Test.kt:4:13:79:2 | { ... } | 4 | Test.kt:6:7:6:7 | var ...; |
 | Test.kt:4:13:79:2 | { ... } | 5 | Test.kt:6:17:6:18 | 50 |
-| Test.kt:4:13:79:2 | { ... } | 6 | Test.kt:6:3:6:18 | y |
-| Test.kt:4:13:79:2 | { ... } | 7 | Test.kt:7:3:7:16 | var ...; |
+| Test.kt:4:13:79:2 | { ... } | 6 | Test.kt:6:7:6:7 | y |
+| Test.kt:4:13:79:2 | { ... } | 7 | Test.kt:7:7:7:7 | var ...; |
 | Test.kt:4:13:79:2 | { ... } | 8 | Test.kt:7:16:7:16 | 0 |
-| Test.kt:4:13:79:2 | { ... } | 9 | Test.kt:7:3:7:16 | z |
-| Test.kt:4:13:79:2 | { ... } | 10 | Test.kt:8:3:8:16 | var ...; |
+| Test.kt:4:13:79:2 | { ... } | 9 | Test.kt:7:7:7:7 | z |
+| Test.kt:4:13:79:2 | { ... } | 10 | Test.kt:8:7:8:7 | var ...; |
 | Test.kt:4:13:79:2 | { ... } | 11 | Test.kt:8:16:8:16 | 0 |
-| Test.kt:4:13:79:2 | { ... } | 12 | Test.kt:8:3:8:16 | w |
+| Test.kt:4:13:79:2 | { ... } | 12 | Test.kt:8:7:8:7 | w |
 | Test.kt:4:13:79:2 | { ... } | 13 | Test.kt:11:3:16:3 | <Expr>; |
 | Test.kt:4:13:79:2 | { ... } | 14 | Test.kt:11:3:16:3 | when ... |
-| Test.kt:4:13:79:2 | { ... } | 15 | Test.kt:11:7:14:3 | ... -> ... |
+| Test.kt:4:13:79:2 | { ... } | 15 | Test.kt:11:3:16:3 | ... -> ... |
 | Test.kt:4:13:79:2 | { ... } | 16 | Test.kt:11:7:11:7 | x |
 | Test.kt:4:13:79:2 | { ... } | 17 | Test.kt:11:11:11:11 | 0 |
 | Test.kt:4:13:79:2 | { ... } | 18 | Test.kt:11:7:11:11 | ... > ... |
+| Test.kt:11:3:16:3 | ... -> ... | 0 | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:11:3:16:3 | ... -> ... | 1 | Test.kt:11:3:16:3 | true |
+| Test.kt:11:3:16:3 | ... -> ... | 2 | Test.kt:14:10:16:3 | { ... } |
+| Test.kt:11:3:16:3 | ... -> ... | 3 | Test.kt:15:4:15:4 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | 4 | Test.kt:15:8:15:9 | 30 |
+| Test.kt:11:3:16:3 | ... -> ... | 5 | Test.kt:15:4:15:9 | ...=... |
 | Test.kt:11:14:14:3 | { ... } | 0 | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:11:14:14:3 | { ... } | 1 | Test.kt:12:4:12:9 | <Expr>; |
+| Test.kt:11:14:14:3 | { ... } | 1 | Test.kt:12:4:12:4 | <Expr>; |
 | Test.kt:11:14:14:3 | { ... } | 2 | Test.kt:12:8:12:9 | 20 |
 | Test.kt:11:14:14:3 | { ... } | 3 | Test.kt:12:4:12:9 | ...=... |
-| Test.kt:11:14:14:3 | { ... } | 4 | Test.kt:13:4:13:9 | <Expr>; |
+| Test.kt:11:14:14:3 | { ... } | 4 | Test.kt:13:4:13:4 | <Expr>; |
 | Test.kt:11:14:14:3 | { ... } | 5 | Test.kt:13:8:13:9 | 10 |
 | Test.kt:11:14:14:3 | { ... } | 6 | Test.kt:13:4:13:9 | ...=... |
-| Test.kt:14:10:16:3 | ... -> ... | 0 | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:14:10:16:3 | ... -> ... | 1 | Test.kt:14:10:16:3 | true |
-| Test.kt:14:10:16:3 | ... -> ... | 2 | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:14:10:16:3 | ... -> ... | 3 | Test.kt:15:4:15:9 | <Expr>; |
-| Test.kt:14:10:16:3 | ... -> ... | 4 | Test.kt:15:8:15:9 | 30 |
-| Test.kt:14:10:16:3 | ... -> ... | 5 | Test.kt:15:4:15:9 | ...=... |
-| Test.kt:18:3:18:7 | <Expr>; | 0 | Test.kt:18:3:18:7 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | 1 | Test.kt:18:7:18:7 | 0 |
-| Test.kt:18:3:18:7 | <Expr>; | 2 | Test.kt:18:3:18:7 | ...=... |
-| Test.kt:18:3:18:7 | <Expr>; | 3 | Test.kt:21:3:24:9 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | 4 | Test.kt:21:3:24:9 | when ... |
-| Test.kt:18:3:18:7 | <Expr>; | 5 | Test.kt:21:6:22:9 | ... -> ... |
-| Test.kt:18:3:18:7 | <Expr>; | 6 | Test.kt:21:6:21:6 | x |
-| Test.kt:18:3:18:7 | <Expr>; | 7 | Test.kt:21:10:21:10 | 0 |
-| Test.kt:18:3:18:7 | <Expr>; | 8 | Test.kt:21:6:21:10 | ... < ... |
-| Test.kt:22:4:22:9 | <Expr>; | 0 | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | 1 | Test.kt:22:8:22:9 | 40 |
-| Test.kt:22:4:22:9 | <Expr>; | 2 | Test.kt:22:4:22:9 | ...=... |
-| Test.kt:22:4:22:9 | <Expr>; | 3 | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | 4 | Test.kt:27:7:27:8 | 10 |
-| Test.kt:22:4:22:9 | <Expr>; | 5 | Test.kt:27:3:27:8 | ...=... |
-| Test.kt:22:4:22:9 | <Expr>; | 6 | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | 7 | Test.kt:30:3:33:3 | when ... |
-| Test.kt:22:4:22:9 | <Expr>; | 8 | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:22:4:22:9 | <Expr>; | 9 | Test.kt:30:7:30:7 | x |
-| Test.kt:22:4:22:9 | <Expr>; | 10 | Test.kt:30:12:30:12 | 0 |
-| Test.kt:22:4:22:9 | <Expr>; | 11 | Test.kt:30:7:30:12 | ... (value equals) ... |
-| Test.kt:24:4:24:9 | ... -> ... | 0 | Test.kt:24:4:24:9 | ... -> ... |
-| Test.kt:24:4:24:9 | ... -> ... | 1 | Test.kt:24:4:24:9 | true |
-| Test.kt:24:4:24:9 | ... -> ... | 2 | Test.kt:24:10:24:10 | INSTANCE |
-| Test.kt:24:4:24:9 | ... -> ... | 3 | Test.kt:24:4:24:9 | return ... |
+| Test.kt:18:3:18:3 | <Expr>; | 0 | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | 1 | Test.kt:18:7:18:7 | 0 |
+| Test.kt:18:3:18:3 | <Expr>; | 2 | Test.kt:18:3:18:7 | ...=... |
+| Test.kt:18:3:18:3 | <Expr>; | 3 | Test.kt:21:3:24:9 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | 4 | Test.kt:21:3:24:9 | when ... |
+| Test.kt:18:3:18:3 | <Expr>; | 5 | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:18:3:18:3 | <Expr>; | 6 | Test.kt:21:6:21:6 | x |
+| Test.kt:18:3:18:3 | <Expr>; | 7 | Test.kt:21:10:21:10 | 0 |
+| Test.kt:18:3:18:3 | <Expr>; | 8 | Test.kt:21:6:21:10 | ... < ... |
+| Test.kt:21:3:24:9 | ... -> ... | 0 | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:21:3:24:9 | ... -> ... | 1 | Test.kt:21:3:24:9 | true |
+| Test.kt:21:3:24:9 | ... -> ... | 2 | Test.kt:24:4:24:9 | INSTANCE |
+| Test.kt:21:3:24:9 | ... -> ... | 3 | Test.kt:24:4:24:9 | return ... |
+| Test.kt:22:4:22:4 | <Expr>; | 0 | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | 1 | Test.kt:22:8:22:9 | 40 |
+| Test.kt:22:4:22:4 | <Expr>; | 2 | Test.kt:22:4:22:9 | ...=... |
+| Test.kt:22:4:22:4 | <Expr>; | 3 | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | 4 | Test.kt:27:7:27:8 | 10 |
+| Test.kt:22:4:22:4 | <Expr>; | 5 | Test.kt:27:3:27:8 | ...=... |
+| Test.kt:22:4:22:4 | <Expr>; | 6 | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | 7 | Test.kt:30:3:33:3 | when ... |
+| Test.kt:22:4:22:4 | <Expr>; | 8 | Test.kt:30:3:33:3 | ... -> ... |
+| Test.kt:22:4:22:4 | <Expr>; | 9 | Test.kt:30:7:30:7 | x |
+| Test.kt:22:4:22:4 | <Expr>; | 10 | Test.kt:30:12:30:12 | 0 |
+| Test.kt:22:4:22:4 | <Expr>; | 11 | Test.kt:30:7:30:12 | ... (value equals) ... |
 | Test.kt:30:15:33:3 | { ... } | 0 | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:30:15:33:3 | { ... } | 1 | Test.kt:31:4:31:9 | <Expr>; |
+| Test.kt:30:15:33:3 | { ... } | 1 | Test.kt:31:4:31:4 | <Expr>; |
 | Test.kt:30:15:33:3 | { ... } | 2 | Test.kt:31:8:31:9 | 60 |
 | Test.kt:30:15:33:3 | { ... } | 3 | Test.kt:31:4:31:9 | ...=... |
-| Test.kt:30:15:33:3 | { ... } | 4 | Test.kt:32:4:32:9 | <Expr>; |
+| Test.kt:30:15:33:3 | { ... } | 4 | Test.kt:32:4:32:4 | <Expr>; |
 | Test.kt:30:15:33:3 | { ... } | 5 | Test.kt:32:8:32:9 | 10 |
 | Test.kt:30:15:33:3 | { ... } | 6 | Test.kt:32:4:32:9 | ...=... |
-| Test.kt:35:3:35:8 | <Expr>; | 0 | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | 1 | Test.kt:35:7:35:8 | 20 |
-| Test.kt:35:3:35:8 | <Expr>; | 2 | Test.kt:35:3:35:8 | ...=... |
-| Test.kt:35:3:35:8 | <Expr>; | 3 | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:35:3:35:3 | <Expr>; | 0 | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | 1 | Test.kt:35:7:35:8 | 20 |
+| Test.kt:35:3:35:3 | <Expr>; | 2 | Test.kt:35:3:35:8 | ...=... |
+| Test.kt:35:3:35:3 | <Expr>; | 3 | Test.kt:38:3:41:3 | while (...) |
 | Test.kt:38:9:38:9 | x | 0 | Test.kt:38:9:38:9 | x |
 | Test.kt:38:9:38:9 | x | 1 | Test.kt:38:13:38:13 | 0 |
 | Test.kt:38:9:38:9 | x | 2 | Test.kt:38:9:38:13 | ... > ... |
 | Test.kt:38:16:41:3 | { ... } | 0 | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:38:16:41:3 | { ... } | 1 | Test.kt:39:4:39:9 | <Expr>; |
+| Test.kt:38:16:41:3 | { ... } | 1 | Test.kt:39:4:39:4 | <Expr>; |
 | Test.kt:38:16:41:3 | { ... } | 2 | Test.kt:39:8:39:9 | 10 |
 | Test.kt:38:16:41:3 | { ... } | 3 | Test.kt:39:4:39:9 | ...=... |
 | Test.kt:38:16:41:3 | { ... } | 4 | Test.kt:40:4:40:6 | <Expr>; |
@@ -83,60 +83,60 @@
 | Test.kt:38:16:41:3 | { ... } | 6 | Test.kt:40:4:40:6 | { ... } |
 | Test.kt:38:16:41:3 | { ... } | 7 | Test.kt:40:4:40:6 | var ...; |
 | Test.kt:38:16:41:3 | { ... } | 8 | Test.kt:40:4:40:4 | x |
-| Test.kt:38:16:41:3 | { ... } | 9 | Test.kt:40:4:40:6 | <unary> |
-| Test.kt:38:16:41:3 | { ... } | 10 | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:38:16:41:3 | { ... } | 11 | Test.kt:40:4:40:6 | <unary> |
+| Test.kt:38:16:41:3 | { ... } | 9 | Test.kt:40:4:40:6 | tmp0 |
+| Test.kt:38:16:41:3 | { ... } | 10 | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:38:16:41:3 | { ... } | 11 | Test.kt:40:4:40:6 | tmp0 |
 | Test.kt:38:16:41:3 | { ... } | 12 | Test.kt:40:4:40:6 | dec(...) |
 | Test.kt:38:16:41:3 | { ... } | 13 | Test.kt:40:4:40:6 | ...=... |
 | Test.kt:38:16:41:3 | { ... } | 14 | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:38:16:41:3 | { ... } | 15 | Test.kt:40:4:40:6 | <unary> |
+| Test.kt:38:16:41:3 | { ... } | 15 | Test.kt:40:4:40:6 | tmp0 |
 | Test.kt:38:16:41:3 | { ... } | 16 | Test.kt:40:4:40:6 | <implicit coercion to unit> |
-| Test.kt:43:3:43:8 | <Expr>; | 0 | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | 1 | Test.kt:43:7:43:8 | 30 |
-| Test.kt:43:3:43:8 | <Expr>; | 2 | Test.kt:43:3:43:8 | ...=... |
-| Test.kt:43:3:43:8 | <Expr>; | 3 | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | 4 | Test.kt:73:7:73:8 | 50 |
-| Test.kt:43:3:43:8 | <Expr>; | 5 | Test.kt:73:3:73:8 | ...=... |
-| Test.kt:43:3:43:8 | <Expr>; | 6 | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | 7 | Test.kt:77:7:77:8 | 40 |
-| Test.kt:43:3:43:8 | <Expr>; | 8 | Test.kt:77:3:77:8 | ...=... |
-| Test.kt:43:3:43:8 | <Expr>; | 9 | Test.kt:78:9:78:9 | INSTANCE |
-| Test.kt:43:3:43:8 | <Expr>; | 10 | Test.kt:78:3:78:8 | return ... |
-| Test.kt:82:1:89:1 | t1 | 0 | Test.kt:82:1:89:1 | t1 |
+| Test.kt:43:3:43:3 | <Expr>; | 0 | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | 1 | Test.kt:43:7:43:8 | 30 |
+| Test.kt:43:3:43:3 | <Expr>; | 2 | Test.kt:43:3:43:8 | ...=... |
+| Test.kt:43:3:43:3 | <Expr>; | 3 | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | 4 | Test.kt:73:7:73:8 | 50 |
+| Test.kt:43:3:43:3 | <Expr>; | 5 | Test.kt:73:3:73:8 | ...=... |
+| Test.kt:43:3:43:3 | <Expr>; | 6 | Test.kt:77:3:77:3 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | 7 | Test.kt:77:7:77:8 | 40 |
+| Test.kt:43:3:43:3 | <Expr>; | 8 | Test.kt:77:3:77:8 | ...=... |
+| Test.kt:43:3:43:3 | <Expr>; | 9 | Test.kt:78:3:78:8 | INSTANCE |
+| Test.kt:43:3:43:3 | <Expr>; | 10 | Test.kt:78:3:78:8 | return ... |
+| Test.kt:82:1:89:1 | Exit | 0 | Test.kt:82:1:89:1 | Exit |
 | Test.kt:82:21:89:1 | { ... } | 0 | Test.kt:82:21:89:1 | { ... } |
 | Test.kt:82:21:89:1 | { ... } | 1 | Test.kt:83:2:88:2 | try ... |
 | Test.kt:82:21:89:1 | { ... } | 2 | Test.kt:83:6:86:2 | { ... } |
-| Test.kt:82:21:89:1 | { ... } | 3 | Test.kt:84:3:84:18 | var ...; |
+| Test.kt:82:21:89:1 | { ... } | 3 | Test.kt:84:7:84:7 | var ...; |
 | Test.kt:82:21:89:1 | { ... } | 4 | Test.kt:84:11:84:11 | o |
 | Test.kt:82:21:89:1 | { ... } | 5 | Test.kt:84:11:84:18 | (...)... |
-| Test.kt:84:3:84:18 | x | 0 | Test.kt:84:3:84:18 | x |
-| Test.kt:84:3:84:18 | x | 1 | Test.kt:85:10:85:10 | 1 |
-| Test.kt:84:3:84:18 | x | 2 | Test.kt:85:3:85:10 | return ... |
+| Test.kt:84:7:84:7 | x | 0 | Test.kt:84:7:84:7 | x |
+| Test.kt:84:7:84:7 | x | 1 | Test.kt:85:10:85:10 | 1 |
+| Test.kt:84:7:84:7 | x | 2 | Test.kt:85:3:85:10 | return ... |
 | Test.kt:86:4:88:2 | catch (...) | 0 | Test.kt:86:4:88:2 | catch (...) |
 | Test.kt:86:4:88:2 | catch (...) | 1 | Test.kt:86:11:86:31 | e |
 | Test.kt:86:4:88:2 | catch (...) | 2 | Test.kt:86:34:88:2 | { ... } |
 | Test.kt:86:4:88:2 | catch (...) | 3 | Test.kt:87:10:87:10 | 2 |
 | Test.kt:86:4:88:2 | catch (...) | 4 | Test.kt:87:3:87:10 | return ... |
-| Test.kt:91:1:98:1 | t2 | 0 | Test.kt:91:1:98:1 | t2 |
+| Test.kt:91:1:98:1 | Exit | 0 | Test.kt:91:1:98:1 | Exit |
 | Test.kt:91:22:98:1 | { ... } | 0 | Test.kt:91:22:98:1 | { ... } |
 | Test.kt:91:22:98:1 | { ... } | 1 | Test.kt:92:2:97:2 | try ... |
 | Test.kt:91:22:98:1 | { ... } | 2 | Test.kt:92:6:95:2 | { ... } |
-| Test.kt:91:22:98:1 | { ... } | 3 | Test.kt:93:3:93:13 | var ...; |
+| Test.kt:91:22:98:1 | { ... } | 3 | Test.kt:93:7:93:7 | var ...; |
 | Test.kt:91:22:98:1 | { ... } | 4 | Test.kt:93:11:93:11 | o |
-| Test.kt:91:22:98:1 | { ... } | 5 | Test.kt:93:11:93:13 | ...!! |
-| Test.kt:93:3:93:13 | x | 0 | Test.kt:93:3:93:13 | x |
-| Test.kt:93:3:93:13 | x | 1 | Test.kt:94:10:94:10 | 1 |
-| Test.kt:93:3:93:13 | x | 2 | Test.kt:94:3:94:10 | return ... |
+| Test.kt:91:22:98:1 | { ... } | 5 | Test.kt:93:12:93:13 | ...!! |
+| Test.kt:93:7:93:7 | x | 0 | Test.kt:93:7:93:7 | x |
+| Test.kt:93:7:93:7 | x | 1 | Test.kt:94:10:94:10 | 1 |
+| Test.kt:93:7:93:7 | x | 2 | Test.kt:94:3:94:10 | return ... |
 | Test.kt:95:4:97:2 | catch (...) | 0 | Test.kt:95:4:97:2 | catch (...) |
 | Test.kt:95:4:97:2 | catch (...) | 1 | Test.kt:95:11:95:33 | e |
 | Test.kt:95:4:97:2 | catch (...) | 2 | Test.kt:95:36:97:2 | { ... } |
 | Test.kt:95:4:97:2 | catch (...) | 3 | Test.kt:96:10:96:10 | 2 |
 | Test.kt:95:4:97:2 | catch (...) | 4 | Test.kt:96:3:96:10 | return ... |
-| Test.kt:100:1:110:1 | fn | 0 | Test.kt:100:1:110:1 | fn |
+| Test.kt:100:1:110:1 | Exit | 0 | Test.kt:100:1:110:1 | Exit |
 | Test.kt:100:25:110:1 | { ... } | 0 | Test.kt:100:25:110:1 | { ... } |
 | Test.kt:100:25:110:1 | { ... } | 1 | Test.kt:101:5:103:5 | <Expr>; |
 | Test.kt:100:25:110:1 | { ... } | 2 | Test.kt:101:5:103:5 | when ... |
-| Test.kt:100:25:110:1 | { ... } | 3 | Test.kt:101:9:103:5 | ... -> ... |
+| Test.kt:100:25:110:1 | { ... } | 3 | Test.kt:101:5:103:5 | ... -> ... |
 | Test.kt:100:25:110:1 | { ... } | 4 | Test.kt:101:9:101:30 | ... && ... |
 | Test.kt:100:25:110:1 | { ... } | 5 | Test.kt:101:9:101:9 | x |
 | Test.kt:100:25:110:1 | { ... } | 6 | Test.kt:101:14:101:17 | null |
@@ -165,16 +165,16 @@
 | Test.kt:107:27:109:5 | { ... } | 1 | Test.kt:108:9:108:29 | <Expr>; |
 | Test.kt:107:27:109:5 | { ... } | 2 | Test.kt:108:17:108:28 | "y not null" |
 | Test.kt:107:27:109:5 | { ... } | 3 | Test.kt:108:9:108:29 | println(...) |
-| Test.kt:112:1:116:1 | fn | 0 | Test.kt:112:1:116:1 | fn |
+| Test.kt:112:1:116:1 | Exit | 0 | Test.kt:112:1:116:1 | Exit |
 | Test.kt:112:32:116:1 | { ... } | 0 | Test.kt:112:32:116:1 | { ... } |
 | Test.kt:112:32:116:1 | { ... } | 1 | Test.kt:113:5:115:5 | <Expr>; |
 | Test.kt:112:32:116:1 | { ... } | 2 | Test.kt:113:5:115:5 | when ... |
-| Test.kt:112:32:116:1 | { ... } | 3 | Test.kt:113:9:115:5 | ... -> ... |
+| Test.kt:112:32:116:1 | { ... } | 3 | Test.kt:113:5:115:5 | ... -> ... |
 | Test.kt:112:32:116:1 | { ... } | 4 | Test.kt:113:9:113:14 | ... && ... |
 | Test.kt:112:32:116:1 | { ... } | 5 | Test.kt:113:9:113:9 | x |
 | Test.kt:113:14:113:14 | y | 0 | Test.kt:113:14:113:14 | y |
 | Test.kt:113:17:115:5 | { ... } | 0 | Test.kt:113:17:115:5 | { ... } |
-| Test.kt:118:1:124:1 | fn_when | 0 | Test.kt:118:1:124:1 | fn_when |
+| Test.kt:118:1:124:1 | Exit | 0 | Test.kt:118:1:124:1 | Exit |
 | Test.kt:118:37:124:1 | { ... } | 0 | Test.kt:118:37:124:1 | { ... } |
 | Test.kt:118:37:124:1 | { ... } | 1 | Test.kt:119:2:123:12 | <Expr>; |
 | Test.kt:118:37:124:1 | { ... } | 2 | Test.kt:119:2:123:12 | when ... |
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStmts.ql b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStmts.ql
index 4e8367040f5f0..26280efc3b95a 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStmts.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStmts.ql
@@ -3,5 +3,5 @@ import default
 from BasicBlock b, int i, ControlFlowNode n
 where
   b.getNode(i) = n and
-  b.getFile().(CompilationUnit).fromSource()
+  b.getLocation().getFile().(CompilationUnit).fromSource()
 select b, i, n
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStrictDominance.expected b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStrictDominance.expected
index 544f50e60fa6b..fa358b39a35e2 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStrictDominance.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStrictDominance.expected
@@ -1,39 +1,39 @@
-| Test.kt:4:13:79:2 | { ... } | Test.kt:4:2:79:2 | test |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:4:2:79:2 | Exit |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:11:3:16:3 | ... -> ... |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:18:3:18:7 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:24:4:24:9 | ... -> ... |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:22:4:22:4 | <Expr>; |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:35:3:35:8 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:35:3:35:3 | <Expr>; |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:38:9:38:9 | x |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:4:2:79:2 | test |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:24:4:24:9 | ... -> ... |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:38:9:38:9 | x |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:38:9:38:9 | x |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:38:9:38:9 | x |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:4:2:79:2 | Exit |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:38:9:38:9 | x |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:38:9:38:9 | x |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:9:38:9 | x |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
 | Test.kt:38:9:38:9 | x | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:38:9:38:9 | x | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:82:21:89:1 | { ... } | Test.kt:82:1:89:1 | t1 |
-| Test.kt:82:21:89:1 | { ... } | Test.kt:84:3:84:18 | x |
+| Test.kt:38:9:38:9 | x | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:82:21:89:1 | { ... } | Test.kt:82:1:89:1 | Exit |
+| Test.kt:82:21:89:1 | { ... } | Test.kt:84:7:84:7 | x |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:86:4:88:2 | catch (...) |
-| Test.kt:91:22:98:1 | { ... } | Test.kt:91:1:98:1 | t2 |
-| Test.kt:91:22:98:1 | { ... } | Test.kt:93:3:93:13 | x |
+| Test.kt:91:22:98:1 | { ... } | Test.kt:91:1:98:1 | Exit |
+| Test.kt:91:22:98:1 | { ... } | Test.kt:93:7:93:7 | x |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:95:4:97:2 | catch (...) |
-| Test.kt:100:25:110:1 | { ... } | Test.kt:100:1:110:1 | fn |
+| Test.kt:100:25:110:1 | { ... } | Test.kt:100:1:110:1 | Exit |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:101:22:101:22 | y |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:101:33:103:5 | { ... } |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:105:5:109:5 | <Expr>; |
@@ -45,11 +45,11 @@
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:16:109:5 | ... -> ... |
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:27:109:5 | { ... } |
 | Test.kt:107:16:109:5 | ... -> ... | Test.kt:107:27:109:5 | { ... } |
-| Test.kt:112:32:116:1 | { ... } | Test.kt:112:1:116:1 | fn |
+| Test.kt:112:32:116:1 | { ... } | Test.kt:112:1:116:1 | Exit |
 | Test.kt:112:32:116:1 | { ... } | Test.kt:113:14:113:14 | y |
 | Test.kt:112:32:116:1 | { ... } | Test.kt:113:17:115:5 | { ... } |
 | Test.kt:113:14:113:14 | y | Test.kt:113:17:115:5 | { ... } |
-| Test.kt:118:37:124:1 | { ... } | Test.kt:118:1:124:1 | fn_when |
+| Test.kt:118:37:124:1 | { ... } | Test.kt:118:1:124:1 | Exit |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:121:9:121:9 | <Expr>; |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:122:12:122:16 | ... -> ... |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:123:8:123:10 | { ... } |
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbSuccessor.expected b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbSuccessor.expected
index 0e115a651f58a..3768db75d7e82 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbSuccessor.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbSuccessor.expected
@@ -1,45 +1,45 @@
+| Test.kt:4:13:79:2 | { ... } | Test.kt:11:3:16:3 | ... -> ... |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:11:14:14:3 | { ... } | Test.kt:18:3:18:7 | <Expr>; |
-| Test.kt:14:10:16:3 | ... -> ... | Test.kt:18:3:18:7 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:24:4:24:9 | ... -> ... |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:24:4:24:9 | ... -> ... | Test.kt:4:2:79:2 | test |
-| Test.kt:30:15:33:3 | { ... } | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:38:9:38:9 | x |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:11:14:14:3 | { ... } | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:4:2:79:2 | Exit |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:30:15:33:3 | { ... } | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:9:38:9 | x |
 | Test.kt:38:9:38:9 | x | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:38:9:38:9 | x | Test.kt:43:3:43:8 | <Expr>; |
+| Test.kt:38:9:38:9 | x | Test.kt:43:3:43:3 | <Expr>; |
 | Test.kt:38:16:41:3 | { ... } | Test.kt:38:9:38:9 | x |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:4:2:79:2 | test |
-| Test.kt:82:21:89:1 | { ... } | Test.kt:84:3:84:18 | x |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:4:2:79:2 | Exit |
+| Test.kt:82:21:89:1 | { ... } | Test.kt:84:7:84:7 | x |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:86:4:88:2 | catch (...) |
-| Test.kt:84:3:84:18 | x | Test.kt:82:1:89:1 | t1 |
-| Test.kt:86:4:88:2 | catch (...) | Test.kt:82:1:89:1 | t1 |
-| Test.kt:91:22:98:1 | { ... } | Test.kt:93:3:93:13 | x |
+| Test.kt:84:7:84:7 | x | Test.kt:82:1:89:1 | Exit |
+| Test.kt:86:4:88:2 | catch (...) | Test.kt:82:1:89:1 | Exit |
+| Test.kt:91:22:98:1 | { ... } | Test.kt:93:7:93:7 | x |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:95:4:97:2 | catch (...) |
-| Test.kt:93:3:93:13 | x | Test.kt:91:1:98:1 | t2 |
-| Test.kt:95:4:97:2 | catch (...) | Test.kt:91:1:98:1 | t2 |
+| Test.kt:93:7:93:7 | x | Test.kt:91:1:98:1 | Exit |
+| Test.kt:95:4:97:2 | catch (...) | Test.kt:91:1:98:1 | Exit |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:101:22:101:22 | y |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:105:5:109:5 | <Expr>; |
 | Test.kt:101:22:101:22 | y | Test.kt:101:33:103:5 | { ... } |
 | Test.kt:101:22:101:22 | y | Test.kt:105:5:109:5 | <Expr>; |
-| Test.kt:101:33:103:5 | { ... } | Test.kt:100:1:110:1 | fn |
+| Test.kt:101:33:103:5 | { ... } | Test.kt:100:1:110:1 | Exit |
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:105:20:107:5 | { ... } |
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:16:109:5 | ... -> ... |
-| Test.kt:105:20:107:5 | { ... } | Test.kt:100:1:110:1 | fn |
-| Test.kt:107:16:109:5 | ... -> ... | Test.kt:100:1:110:1 | fn |
+| Test.kt:105:20:107:5 | { ... } | Test.kt:100:1:110:1 | Exit |
+| Test.kt:107:16:109:5 | ... -> ... | Test.kt:100:1:110:1 | Exit |
 | Test.kt:107:16:109:5 | ... -> ... | Test.kt:107:27:109:5 | { ... } |
-| Test.kt:107:27:109:5 | { ... } | Test.kt:100:1:110:1 | fn |
-| Test.kt:112:32:116:1 | { ... } | Test.kt:112:1:116:1 | fn |
+| Test.kt:107:27:109:5 | { ... } | Test.kt:100:1:110:1 | Exit |
+| Test.kt:112:32:116:1 | { ... } | Test.kt:112:1:116:1 | Exit |
 | Test.kt:112:32:116:1 | { ... } | Test.kt:113:14:113:14 | y |
-| Test.kt:113:14:113:14 | y | Test.kt:112:1:116:1 | fn |
+| Test.kt:113:14:113:14 | y | Test.kt:112:1:116:1 | Exit |
 | Test.kt:113:14:113:14 | y | Test.kt:113:17:115:5 | { ... } |
-| Test.kt:113:17:115:5 | { ... } | Test.kt:112:1:116:1 | fn |
+| Test.kt:113:17:115:5 | { ... } | Test.kt:112:1:116:1 | Exit |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:121:9:121:9 | <Expr>; |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:122:12:122:16 | ... -> ... |
-| Test.kt:121:9:121:9 | <Expr>; | Test.kt:118:1:124:1 | fn_when |
+| Test.kt:121:9:121:9 | <Expr>; | Test.kt:118:1:124:1 | Exit |
 | Test.kt:121:9:121:9 | <Expr>; | Test.kt:123:8:123:10 | { ... } |
-| Test.kt:122:12:122:16 | ... -> ... | Test.kt:118:1:124:1 | fn_when |
-| Test.kt:123:8:123:10 | { ... } | Test.kt:118:1:124:1 | fn_when |
+| Test.kt:122:12:122:16 | ... -> ... | Test.kt:118:1:124:1 | Exit |
+| Test.kt:123:8:123:10 | { ... } | Test.kt:118:1:124:1 | Exit |
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/getASuccessor.expected b/java/ql/test-kotlin2/library-tests/controlflow/basic/getASuccessor.expected
index 1f1db340aeb5d..81142abc1df8d 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/getASuccessor.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/getASuccessor.expected
@@ -1,202 +1,160 @@
 #select
-| Test.kt:0:0:0:0 | TestKt | Class | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:3:1:80:1 | Test | Class | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:3:1:80:1 | Test | Constructor | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:3:1:80:1 | super(...) | SuperConstructorInvocationStmt | Test.kt:3:1:80:1 | { ... } | BlockStmt |
-| Test.kt:3:1:80:1 | { ... } | BlockStmt | Test.kt:3:1:80:1 | Test | Constructor |
-| Test.kt:3:1:80:1 | { ... } | BlockStmt | Test.kt:3:1:80:1 | super(...) | SuperConstructorInvocationStmt |
-| Test.kt:4:2:79:2 | Unit | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:4:2:79:2 | test | Method | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:4:13:79:2 | { ... } | BlockStmt | Test.kt:5:3:5:16 | var ...; | LocalVariableDeclStmt |
-| Test.kt:5:3:5:16 | int x | LocalVariableDecl | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:5:3:5:16 | var ...; | LocalVariableDeclStmt | Test.kt:5:16:5:16 | 0 | IntegerLiteral |
-| Test.kt:5:3:5:16 | x | LocalVariableDeclExpr | Test.kt:6:3:6:18 | var ...; | LocalVariableDeclStmt |
-| Test.kt:5:16:5:16 | 0 | IntegerLiteral | Test.kt:5:3:5:16 | x | LocalVariableDeclExpr |
-| Test.kt:6:3:6:18 | long y | LocalVariableDecl | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:6:3:6:18 | var ...; | LocalVariableDeclStmt | Test.kt:6:17:6:18 | 50 | LongLiteral |
-| Test.kt:6:3:6:18 | y | LocalVariableDeclExpr | Test.kt:7:3:7:16 | var ...; | LocalVariableDeclStmt |
-| Test.kt:6:17:6:18 | 50 | LongLiteral | Test.kt:6:3:6:18 | y | LocalVariableDeclExpr |
-| Test.kt:7:3:7:16 | int z | LocalVariableDecl | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:7:3:7:16 | var ...; | LocalVariableDeclStmt | Test.kt:7:16:7:16 | 0 | IntegerLiteral |
-| Test.kt:7:3:7:16 | z | LocalVariableDeclExpr | Test.kt:8:3:8:16 | var ...; | LocalVariableDeclStmt |
-| Test.kt:7:16:7:16 | 0 | IntegerLiteral | Test.kt:7:3:7:16 | z | LocalVariableDeclExpr |
-| Test.kt:8:3:8:16 | int w | LocalVariableDecl | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:8:3:8:16 | var ...; | LocalVariableDeclStmt | Test.kt:8:16:8:16 | 0 | IntegerLiteral |
-| Test.kt:8:3:8:16 | w | LocalVariableDeclExpr | Test.kt:11:3:16:3 | <Expr>; | ExprStmt |
-| Test.kt:8:16:8:16 | 0 | IntegerLiteral | Test.kt:8:3:8:16 | w | LocalVariableDeclExpr |
+| Test.kt:3:1:80:1 | super(...) | SuperConstructorInvocationStmt | Test.kt:3:8:80:1 | { ... } | BlockStmt |
+| Test.kt:3:8:80:1 | Exit | Constructor | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:3:8:80:1 | { ... } | BlockStmt | Test.kt:3:1:80:1 | super(...) | SuperConstructorInvocationStmt |
+| Test.kt:3:8:80:1 | { ... } | BlockStmt | Test.kt:3:8:80:1 | Exit | Constructor |
+| Test.kt:4:2:79:2 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:4:13:79:2 | { ... } | BlockStmt | Test.kt:5:7:5:7 | var ...; | LocalVariableDeclStmt |
+| Test.kt:5:7:5:7 | var ...; | LocalVariableDeclStmt | Test.kt:5:16:5:16 | 0 | IntegerLiteral |
+| Test.kt:5:7:5:7 | x | LocalVariableDeclExpr | Test.kt:6:7:6:7 | var ...; | LocalVariableDeclStmt |
+| Test.kt:5:16:5:16 | 0 | IntegerLiteral | Test.kt:5:7:5:7 | x | LocalVariableDeclExpr |
+| Test.kt:6:7:6:7 | var ...; | LocalVariableDeclStmt | Test.kt:6:17:6:18 | 50 | LongLiteral |
+| Test.kt:6:7:6:7 | y | LocalVariableDeclExpr | Test.kt:7:7:7:7 | var ...; | LocalVariableDeclStmt |
+| Test.kt:6:17:6:18 | 50 | LongLiteral | Test.kt:6:7:6:7 | y | LocalVariableDeclExpr |
+| Test.kt:7:7:7:7 | var ...; | LocalVariableDeclStmt | Test.kt:7:16:7:16 | 0 | IntegerLiteral |
+| Test.kt:7:7:7:7 | z | LocalVariableDeclExpr | Test.kt:8:7:8:7 | var ...; | LocalVariableDeclStmt |
+| Test.kt:7:16:7:16 | 0 | IntegerLiteral | Test.kt:7:7:7:7 | z | LocalVariableDeclExpr |
+| Test.kt:8:7:8:7 | var ...; | LocalVariableDeclStmt | Test.kt:8:16:8:16 | 0 | IntegerLiteral |
+| Test.kt:8:7:8:7 | w | LocalVariableDeclExpr | Test.kt:11:3:16:3 | <Expr>; | ExprStmt |
+| Test.kt:8:16:8:16 | 0 | IntegerLiteral | Test.kt:8:7:8:7 | w | LocalVariableDeclExpr |
+| Test.kt:11:3:16:3 | ... -> ... | WhenBranch | Test.kt:11:3:16:3 | true | BooleanLiteral |
+| Test.kt:11:3:16:3 | ... -> ... | WhenBranch | Test.kt:11:7:11:7 | x | VarAccess |
 | Test.kt:11:3:16:3 | <Expr>; | ExprStmt | Test.kt:11:3:16:3 | when ... | WhenExpr |
-| Test.kt:11:3:16:3 | when ... | WhenExpr | Test.kt:11:7:14:3 | ... -> ... | WhenBranch |
+| Test.kt:11:3:16:3 | true | BooleanLiteral | Test.kt:14:10:16:3 | { ... } | BlockStmt |
+| Test.kt:11:3:16:3 | when ... | WhenExpr | Test.kt:11:3:16:3 | ... -> ... | WhenBranch |
 | Test.kt:11:7:11:7 | x | VarAccess | Test.kt:11:11:11:11 | 0 | IntegerLiteral |
+| Test.kt:11:7:11:11 | ... > ... | GTExpr | Test.kt:11:3:16:3 | ... -> ... | WhenBranch |
 | Test.kt:11:7:11:11 | ... > ... | GTExpr | Test.kt:11:14:14:3 | { ... } | BlockStmt |
-| Test.kt:11:7:11:11 | ... > ... | GTExpr | Test.kt:14:10:16:3 | ... -> ... | WhenBranch |
-| Test.kt:11:7:14:3 | ... -> ... | WhenBranch | Test.kt:11:7:11:7 | x | VarAccess |
 | Test.kt:11:11:11:11 | 0 | IntegerLiteral | Test.kt:11:7:11:11 | ... > ... | GTExpr |
-| Test.kt:11:14:14:3 | { ... } | BlockStmt | Test.kt:12:4:12:9 | <Expr>; | ExprStmt |
-| Test.kt:12:4:12:9 | ...=... | AssignExpr | Test.kt:13:4:13:9 | <Expr>; | ExprStmt |
-| Test.kt:12:4:12:9 | <Expr>; | ExprStmt | Test.kt:12:8:12:9 | 20 | LongLiteral |
-| Test.kt:12:4:12:9 | y | VarAccess | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:11:14:14:3 | { ... } | BlockStmt | Test.kt:12:4:12:4 | <Expr>; | ExprStmt |
+| Test.kt:12:4:12:4 | <Expr>; | ExprStmt | Test.kt:12:8:12:9 | 20 | LongLiteral |
+| Test.kt:12:4:12:9 | ...=... | AssignExpr | Test.kt:13:4:13:4 | <Expr>; | ExprStmt |
 | Test.kt:12:8:12:9 | 20 | LongLiteral | Test.kt:12:4:12:9 | ...=... | AssignExpr |
-| Test.kt:13:4:13:9 | ...=... | AssignExpr | Test.kt:18:3:18:7 | <Expr>; | ExprStmt |
-| Test.kt:13:4:13:9 | <Expr>; | ExprStmt | Test.kt:13:8:13:9 | 10 | IntegerLiteral |
-| Test.kt:13:4:13:9 | z | VarAccess | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:13:4:13:4 | <Expr>; | ExprStmt | Test.kt:13:8:13:9 | 10 | IntegerLiteral |
+| Test.kt:13:4:13:9 | ...=... | AssignExpr | Test.kt:18:3:18:3 | <Expr>; | ExprStmt |
 | Test.kt:13:8:13:9 | 10 | IntegerLiteral | Test.kt:13:4:13:9 | ...=... | AssignExpr |
-| Test.kt:14:10:16:3 | ... -> ... | WhenBranch | Test.kt:14:10:16:3 | true | BooleanLiteral |
-| Test.kt:14:10:16:3 | true | BooleanLiteral | Test.kt:14:10:16:3 | { ... } | BlockStmt |
-| Test.kt:14:10:16:3 | { ... } | BlockStmt | Test.kt:15:4:15:9 | <Expr>; | ExprStmt |
-| Test.kt:15:4:15:9 | ...=... | AssignExpr | Test.kt:18:3:18:7 | <Expr>; | ExprStmt |
-| Test.kt:15:4:15:9 | <Expr>; | ExprStmt | Test.kt:15:8:15:9 | 30 | LongLiteral |
-| Test.kt:15:4:15:9 | y | VarAccess | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:14:10:16:3 | { ... } | BlockStmt | Test.kt:15:4:15:4 | <Expr>; | ExprStmt |
+| Test.kt:15:4:15:4 | <Expr>; | ExprStmt | Test.kt:15:8:15:9 | 30 | LongLiteral |
+| Test.kt:15:4:15:9 | ...=... | AssignExpr | Test.kt:18:3:18:3 | <Expr>; | ExprStmt |
 | Test.kt:15:8:15:9 | 30 | LongLiteral | Test.kt:15:4:15:9 | ...=... | AssignExpr |
+| Test.kt:18:3:18:3 | <Expr>; | ExprStmt | Test.kt:18:7:18:7 | 0 | IntegerLiteral |
 | Test.kt:18:3:18:7 | ...=... | AssignExpr | Test.kt:21:3:24:9 | <Expr>; | ExprStmt |
-| Test.kt:18:3:18:7 | <Expr>; | ExprStmt | Test.kt:18:7:18:7 | 0 | IntegerLiteral |
-| Test.kt:18:3:18:7 | z | VarAccess | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:18:7:18:7 | 0 | IntegerLiteral | Test.kt:18:3:18:7 | ...=... | AssignExpr |
+| Test.kt:21:3:24:9 | ... -> ... | WhenBranch | Test.kt:21:3:24:9 | true | BooleanLiteral |
+| Test.kt:21:3:24:9 | ... -> ... | WhenBranch | Test.kt:21:6:21:6 | x | VarAccess |
 | Test.kt:21:3:24:9 | <Expr>; | ExprStmt | Test.kt:21:3:24:9 | when ... | WhenExpr |
-| Test.kt:21:3:24:9 | when ... | WhenExpr | Test.kt:21:6:22:9 | ... -> ... | WhenBranch |
+| Test.kt:21:3:24:9 | true | BooleanLiteral | Test.kt:24:4:24:9 | INSTANCE | VarAccess |
+| Test.kt:21:3:24:9 | when ... | WhenExpr | Test.kt:21:3:24:9 | ... -> ... | WhenBranch |
 | Test.kt:21:6:21:6 | x | VarAccess | Test.kt:21:10:21:10 | 0 | IntegerLiteral |
-| Test.kt:21:6:21:10 | ... < ... | LTExpr | Test.kt:22:4:22:9 | <Expr>; | ExprStmt |
-| Test.kt:21:6:21:10 | ... < ... | LTExpr | Test.kt:24:4:24:9 | ... -> ... | WhenBranch |
-| Test.kt:21:6:22:9 | ... -> ... | WhenBranch | Test.kt:21:6:21:6 | x | VarAccess |
+| Test.kt:21:6:21:10 | ... < ... | LTExpr | Test.kt:21:3:24:9 | ... -> ... | WhenBranch |
+| Test.kt:21:6:21:10 | ... < ... | LTExpr | Test.kt:22:4:22:4 | <Expr>; | ExprStmt |
 | Test.kt:21:10:21:10 | 0 | IntegerLiteral | Test.kt:21:6:21:10 | ... < ... | LTExpr |
-| Test.kt:22:4:22:9 | ...=... | AssignExpr | Test.kt:27:3:27:8 | <Expr>; | ExprStmt |
-| Test.kt:22:4:22:9 | <Expr>; | ExprStmt | Test.kt:22:8:22:9 | 40 | LongLiteral |
-| Test.kt:22:4:22:9 | y | VarAccess | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:22:4:22:4 | <Expr>; | ExprStmt | Test.kt:22:8:22:9 | 40 | LongLiteral |
+| Test.kt:22:4:22:9 | ...=... | AssignExpr | Test.kt:27:3:27:3 | <Expr>; | ExprStmt |
 | Test.kt:22:8:22:9 | 40 | LongLiteral | Test.kt:22:4:22:9 | ...=... | AssignExpr |
-| Test.kt:24:4:24:9 | ... -> ... | WhenBranch | Test.kt:24:4:24:9 | true | BooleanLiteral |
-| Test.kt:24:4:24:9 | return ... | ReturnStmt | Test.kt:4:2:79:2 | test | Method |
-| Test.kt:24:4:24:9 | true | BooleanLiteral | Test.kt:24:10:24:10 | INSTANCE | VarAccess |
-| Test.kt:24:10:24:10 | INSTANCE | VarAccess | Test.kt:24:4:24:9 | return ... | ReturnStmt |
+| Test.kt:24:4:24:9 | INSTANCE | VarAccess | Test.kt:24:4:24:9 | return ... | ReturnStmt |
+| Test.kt:24:4:24:9 | return ... | ReturnStmt | Test.kt:4:2:79:2 | Exit | Method |
+| Test.kt:27:3:27:3 | <Expr>; | ExprStmt | Test.kt:27:7:27:8 | 10 | IntegerLiteral |
 | Test.kt:27:3:27:8 | ...=... | AssignExpr | Test.kt:30:3:33:3 | <Expr>; | ExprStmt |
-| Test.kt:27:3:27:8 | <Expr>; | ExprStmt | Test.kt:27:7:27:8 | 10 | IntegerLiteral |
-| Test.kt:27:3:27:8 | z | VarAccess | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:27:7:27:8 | 10 | IntegerLiteral | Test.kt:27:3:27:8 | ...=... | AssignExpr |
+| Test.kt:30:3:33:3 | ... -> ... | WhenBranch | Test.kt:30:7:30:7 | x | VarAccess |
 | Test.kt:30:3:33:3 | <Expr>; | ExprStmt | Test.kt:30:3:33:3 | when ... | WhenExpr |
-| Test.kt:30:3:33:3 | when ... | WhenExpr | Test.kt:30:7:33:3 | ... -> ... | WhenBranch |
+| Test.kt:30:3:33:3 | when ... | WhenExpr | Test.kt:30:3:33:3 | ... -> ... | WhenBranch |
 | Test.kt:30:7:30:7 | x | VarAccess | Test.kt:30:12:30:12 | 0 | IntegerLiteral |
 | Test.kt:30:7:30:12 | ... (value equals) ... | ValueEQExpr | Test.kt:30:15:33:3 | { ... } | BlockStmt |
-| Test.kt:30:7:30:12 | ... (value equals) ... | ValueEQExpr | Test.kt:35:3:35:8 | <Expr>; | ExprStmt |
-| Test.kt:30:7:33:3 | ... -> ... | WhenBranch | Test.kt:30:7:30:7 | x | VarAccess |
+| Test.kt:30:7:30:12 | ... (value equals) ... | ValueEQExpr | Test.kt:35:3:35:3 | <Expr>; | ExprStmt |
 | Test.kt:30:12:30:12 | 0 | IntegerLiteral | Test.kt:30:7:30:12 | ... (value equals) ... | ValueEQExpr |
-| Test.kt:30:15:33:3 | { ... } | BlockStmt | Test.kt:31:4:31:9 | <Expr>; | ExprStmt |
-| Test.kt:31:4:31:9 | ...=... | AssignExpr | Test.kt:32:4:32:9 | <Expr>; | ExprStmt |
-| Test.kt:31:4:31:9 | <Expr>; | ExprStmt | Test.kt:31:8:31:9 | 60 | LongLiteral |
-| Test.kt:31:4:31:9 | y | VarAccess | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:30:15:33:3 | { ... } | BlockStmt | Test.kt:31:4:31:4 | <Expr>; | ExprStmt |
+| Test.kt:31:4:31:4 | <Expr>; | ExprStmt | Test.kt:31:8:31:9 | 60 | LongLiteral |
+| Test.kt:31:4:31:9 | ...=... | AssignExpr | Test.kt:32:4:32:4 | <Expr>; | ExprStmt |
 | Test.kt:31:8:31:9 | 60 | LongLiteral | Test.kt:31:4:31:9 | ...=... | AssignExpr |
-| Test.kt:32:4:32:9 | ...=... | AssignExpr | Test.kt:35:3:35:8 | <Expr>; | ExprStmt |
-| Test.kt:32:4:32:9 | <Expr>; | ExprStmt | Test.kt:32:8:32:9 | 10 | IntegerLiteral |
-| Test.kt:32:4:32:9 | z | VarAccess | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:32:4:32:4 | <Expr>; | ExprStmt | Test.kt:32:8:32:9 | 10 | IntegerLiteral |
+| Test.kt:32:4:32:9 | ...=... | AssignExpr | Test.kt:35:3:35:3 | <Expr>; | ExprStmt |
 | Test.kt:32:8:32:9 | 10 | IntegerLiteral | Test.kt:32:4:32:9 | ...=... | AssignExpr |
+| Test.kt:35:3:35:3 | <Expr>; | ExprStmt | Test.kt:35:7:35:8 | 20 | IntegerLiteral |
 | Test.kt:35:3:35:8 | ...=... | AssignExpr | Test.kt:38:3:41:3 | while (...) | WhileStmt |
-| Test.kt:35:3:35:8 | <Expr>; | ExprStmt | Test.kt:35:7:35:8 | 20 | IntegerLiteral |
-| Test.kt:35:3:35:8 | z | VarAccess | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:35:7:35:8 | 20 | IntegerLiteral | Test.kt:35:3:35:8 | ...=... | AssignExpr |
 | Test.kt:38:3:41:3 | while (...) | WhileStmt | Test.kt:38:9:38:9 | x | VarAccess |
 | Test.kt:38:9:38:9 | x | VarAccess | Test.kt:38:13:38:13 | 0 | IntegerLiteral |
 | Test.kt:38:9:38:13 | ... > ... | GTExpr | Test.kt:38:16:41:3 | { ... } | BlockStmt |
-| Test.kt:38:9:38:13 | ... > ... | GTExpr | Test.kt:43:3:43:8 | <Expr>; | ExprStmt |
+| Test.kt:38:9:38:13 | ... > ... | GTExpr | Test.kt:43:3:43:3 | <Expr>; | ExprStmt |
 | Test.kt:38:13:38:13 | 0 | IntegerLiteral | Test.kt:38:9:38:13 | ... > ... | GTExpr |
-| Test.kt:38:16:41:3 | { ... } | BlockStmt | Test.kt:39:4:39:9 | <Expr>; | ExprStmt |
+| Test.kt:38:16:41:3 | { ... } | BlockStmt | Test.kt:39:4:39:4 | <Expr>; | ExprStmt |
+| Test.kt:39:4:39:4 | <Expr>; | ExprStmt | Test.kt:39:8:39:9 | 10 | LongLiteral |
 | Test.kt:39:4:39:9 | ...=... | AssignExpr | Test.kt:40:4:40:6 | <Expr>; | ExprStmt |
-| Test.kt:39:4:39:9 | <Expr>; | ExprStmt | Test.kt:39:8:39:9 | 10 | LongLiteral |
-| Test.kt:39:4:39:9 | y | VarAccess | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:39:8:39:9 | 10 | LongLiteral | Test.kt:39:4:39:9 | ...=... | AssignExpr |
-| Test.kt:40:4:40:4 | x | VarAccess | Test.kt:40:4:40:6 | <unary> | LocalVariableDeclExpr |
+| Test.kt:40:4:40:4 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | tmp0 | VarAccess |
+| Test.kt:40:4:40:4 | x | VarAccess | Test.kt:40:4:40:6 | tmp0 | LocalVariableDeclExpr |
 | Test.kt:40:4:40:6 | ...=... | AssignExpr | Test.kt:40:4:40:6 | <Expr>; | ExprStmt |
 | Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | <Stmt> | StmtExpr |
-| Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | <unary> | VarAccess |
-| Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | <unary> | VarAccess |
+| Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | tmp0 | VarAccess |
 | Test.kt:40:4:40:6 | <Stmt> | StmtExpr | Test.kt:40:4:40:6 | { ... } | BlockStmt |
 | Test.kt:40:4:40:6 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr | Test.kt:38:9:38:9 | x | VarAccess |
-| Test.kt:40:4:40:6 | <unary> | LocalVariableDeclExpr | Test.kt:40:4:40:6 | <Expr>; | ExprStmt |
-| Test.kt:40:4:40:6 | <unary> | VarAccess | Test.kt:40:4:40:6 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
-| Test.kt:40:4:40:6 | <unary> | VarAccess | Test.kt:40:4:40:6 | dec(...) | MethodCall |
-| Test.kt:40:4:40:6 | Unit | TypeAccess | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:40:4:40:6 | dec(...) | MethodCall | Test.kt:40:4:40:6 | ...=... | AssignExpr |
-| Test.kt:40:4:40:6 | int <unary> | LocalVariableDecl | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:40:4:40:6 | tmp0 | LocalVariableDeclExpr | Test.kt:40:4:40:4 | <Expr>; | ExprStmt |
+| Test.kt:40:4:40:6 | tmp0 | VarAccess | Test.kt:40:4:40:6 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
+| Test.kt:40:4:40:6 | tmp0 | VarAccess | Test.kt:40:4:40:6 | dec(...) | MethodCall |
 | Test.kt:40:4:40:6 | var ...; | LocalVariableDeclStmt | Test.kt:40:4:40:4 | x | VarAccess |
-| Test.kt:40:4:40:6 | x | VarAccess | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:40:4:40:6 | { ... } | BlockStmt | Test.kt:40:4:40:6 | var ...; | LocalVariableDeclStmt |
-| Test.kt:43:3:43:8 | ...=... | AssignExpr | Test.kt:73:3:73:8 | <Expr>; | ExprStmt |
-| Test.kt:43:3:43:8 | <Expr>; | ExprStmt | Test.kt:43:7:43:8 | 30 | IntegerLiteral |
-| Test.kt:43:3:43:8 | z | VarAccess | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:43:3:43:3 | <Expr>; | ExprStmt | Test.kt:43:7:43:8 | 30 | IntegerLiteral |
+| Test.kt:43:3:43:8 | ...=... | AssignExpr | Test.kt:73:3:73:3 | <Expr>; | ExprStmt |
 | Test.kt:43:7:43:8 | 30 | IntegerLiteral | Test.kt:43:3:43:8 | ...=... | AssignExpr |
-| Test.kt:73:3:73:8 | ...=... | AssignExpr | Test.kt:77:3:77:8 | <Expr>; | ExprStmt |
-| Test.kt:73:3:73:8 | <Expr>; | ExprStmt | Test.kt:73:7:73:8 | 50 | IntegerLiteral |
-| Test.kt:73:3:73:8 | z | VarAccess | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:73:3:73:3 | <Expr>; | ExprStmt | Test.kt:73:7:73:8 | 50 | IntegerLiteral |
+| Test.kt:73:3:73:8 | ...=... | AssignExpr | Test.kt:77:3:77:3 | <Expr>; | ExprStmt |
 | Test.kt:73:7:73:8 | 50 | IntegerLiteral | Test.kt:73:3:73:8 | ...=... | AssignExpr |
-| Test.kt:77:3:77:8 | ...=... | AssignExpr | Test.kt:78:9:78:9 | INSTANCE | VarAccess |
-| Test.kt:77:3:77:8 | <Expr>; | ExprStmt | Test.kt:77:7:77:8 | 40 | IntegerLiteral |
-| Test.kt:77:3:77:8 | w | VarAccess | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:77:3:77:3 | <Expr>; | ExprStmt | Test.kt:77:7:77:8 | 40 | IntegerLiteral |
+| Test.kt:77:3:77:8 | ...=... | AssignExpr | Test.kt:78:3:78:8 | INSTANCE | VarAccess |
 | Test.kt:77:7:77:8 | 40 | IntegerLiteral | Test.kt:77:3:77:8 | ...=... | AssignExpr |
-| Test.kt:78:3:78:8 | return ... | ReturnStmt | Test.kt:4:2:79:2 | test | Method |
-| Test.kt:78:9:78:9 | INSTANCE | VarAccess | Test.kt:78:3:78:8 | return ... | ReturnStmt |
-| Test.kt:82:1:89:1 | int | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:82:1:89:1 | t1 | Method | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:82:8:82:13 | Object | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:82:8:82:13 | o | Parameter | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:78:3:78:8 | INSTANCE | VarAccess | Test.kt:78:3:78:8 | return ... | ReturnStmt |
+| Test.kt:78:3:78:8 | return ... | ReturnStmt | Test.kt:4:2:79:2 | Exit | Method |
+| Test.kt:82:1:89:1 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:82:21:89:1 | { ... } | BlockStmt | Test.kt:83:2:88:2 | try ... | TryStmt |
 | Test.kt:83:2:88:2 | try ... | TryStmt | Test.kt:83:6:86:2 | { ... } | BlockStmt |
-| Test.kt:83:6:86:2 | { ... } | BlockStmt | Test.kt:84:3:84:18 | var ...; | LocalVariableDeclStmt |
-| Test.kt:84:3:84:18 | int x | LocalVariableDecl | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:84:3:84:18 | var ...; | LocalVariableDeclStmt | Test.kt:84:11:84:11 | o | VarAccess |
-| Test.kt:84:3:84:18 | x | LocalVariableDeclExpr | Test.kt:85:10:85:10 | 1 | IntegerLiteral |
+| Test.kt:83:6:86:2 | { ... } | BlockStmt | Test.kt:84:7:84:7 | var ...; | LocalVariableDeclStmt |
+| Test.kt:84:7:84:7 | var ...; | LocalVariableDeclStmt | Test.kt:84:11:84:11 | o | VarAccess |
+| Test.kt:84:7:84:7 | x | LocalVariableDeclExpr | Test.kt:85:10:85:10 | 1 | IntegerLiteral |
 | Test.kt:84:11:84:11 | o | VarAccess | Test.kt:84:11:84:18 | (...)... | CastExpr |
-| Test.kt:84:11:84:18 | (...)... | CastExpr | Test.kt:84:3:84:18 | x | LocalVariableDeclExpr |
+| Test.kt:84:11:84:18 | (...)... | CastExpr | Test.kt:84:7:84:7 | x | LocalVariableDeclExpr |
 | Test.kt:84:11:84:18 | (...)... | CastExpr | Test.kt:86:4:88:2 | catch (...) | CatchClause |
-| Test.kt:84:11:84:18 | int | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:85:3:85:10 | return ... | ReturnStmt | Test.kt:82:1:89:1 | t1 | Method |
+| Test.kt:85:3:85:10 | return ... | ReturnStmt | Test.kt:82:1:89:1 | Exit | Method |
 | Test.kt:85:10:85:10 | 1 | IntegerLiteral | Test.kt:85:3:85:10 | return ... | ReturnStmt |
 | Test.kt:86:4:88:2 | catch (...) | CatchClause | Test.kt:86:11:86:31 | e | LocalVariableDeclExpr |
-| Test.kt:86:11:86:31 | ClassCastException | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:86:11:86:31 | ClassCastException e | LocalVariableDecl | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:86:11:86:31 | e | LocalVariableDeclExpr | Test.kt:86:34:88:2 | { ... } | BlockStmt |
 | Test.kt:86:34:88:2 | { ... } | BlockStmt | Test.kt:87:10:87:10 | 2 | IntegerLiteral |
-| Test.kt:87:3:87:10 | return ... | ReturnStmt | Test.kt:82:1:89:1 | t1 | Method |
+| Test.kt:87:3:87:10 | return ... | ReturnStmt | Test.kt:82:1:89:1 | Exit | Method |
 | Test.kt:87:10:87:10 | 2 | IntegerLiteral | Test.kt:87:3:87:10 | return ... | ReturnStmt |
-| Test.kt:91:1:98:1 | int | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:91:1:98:1 | t2 | Method | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:91:8:91:14 | Object | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:91:8:91:14 | o | Parameter | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:91:1:98:1 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:91:22:98:1 | { ... } | BlockStmt | Test.kt:92:2:97:2 | try ... | TryStmt |
 | Test.kt:92:2:97:2 | try ... | TryStmt | Test.kt:92:6:95:2 | { ... } | BlockStmt |
-| Test.kt:92:6:95:2 | { ... } | BlockStmt | Test.kt:93:3:93:13 | var ...; | LocalVariableDeclStmt |
-| Test.kt:93:3:93:13 | Object x | LocalVariableDecl | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:93:3:93:13 | var ...; | LocalVariableDeclStmt | Test.kt:93:11:93:11 | o | VarAccess |
-| Test.kt:93:3:93:13 | x | LocalVariableDeclExpr | Test.kt:94:10:94:10 | 1 | IntegerLiteral |
-| Test.kt:93:11:93:11 | o | VarAccess | Test.kt:93:11:93:13 | ...!! | NotNullExpr |
-| Test.kt:93:11:93:13 | ...!! | NotNullExpr | Test.kt:93:3:93:13 | x | LocalVariableDeclExpr |
-| Test.kt:93:11:93:13 | ...!! | NotNullExpr | Test.kt:95:4:97:2 | catch (...) | CatchClause |
-| Test.kt:94:3:94:10 | return ... | ReturnStmt | Test.kt:91:1:98:1 | t2 | Method |
+| Test.kt:92:6:95:2 | { ... } | BlockStmt | Test.kt:93:7:93:7 | var ...; | LocalVariableDeclStmt |
+| Test.kt:93:7:93:7 | var ...; | LocalVariableDeclStmt | Test.kt:93:11:93:11 | o | VarAccess |
+| Test.kt:93:7:93:7 | x | LocalVariableDeclExpr | Test.kt:94:10:94:10 | 1 | IntegerLiteral |
+| Test.kt:93:11:93:11 | o | VarAccess | Test.kt:93:12:93:13 | ...!! | NotNullExpr |
+| Test.kt:93:12:93:13 | ...!! | NotNullExpr | Test.kt:93:7:93:7 | x | LocalVariableDeclExpr |
+| Test.kt:93:12:93:13 | ...!! | NotNullExpr | Test.kt:95:4:97:2 | catch (...) | CatchClause |
+| Test.kt:94:3:94:10 | return ... | ReturnStmt | Test.kt:91:1:98:1 | Exit | Method |
 | Test.kt:94:10:94:10 | 1 | IntegerLiteral | Test.kt:94:3:94:10 | return ... | ReturnStmt |
 | Test.kt:95:4:97:2 | catch (...) | CatchClause | Test.kt:95:11:95:33 | e | LocalVariableDeclExpr |
-| Test.kt:95:11:95:33 | NullPointerException | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:95:11:95:33 | NullPointerException e | LocalVariableDecl | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:95:11:95:33 | e | LocalVariableDeclExpr | Test.kt:95:36:97:2 | { ... } | BlockStmt |
 | Test.kt:95:36:97:2 | { ... } | BlockStmt | Test.kt:96:10:96:10 | 2 | IntegerLiteral |
-| Test.kt:96:3:96:10 | return ... | ReturnStmt | Test.kt:91:1:98:1 | t2 | Method |
+| Test.kt:96:3:96:10 | return ... | ReturnStmt | Test.kt:91:1:98:1 | Exit | Method |
 | Test.kt:96:10:96:10 | 2 | IntegerLiteral | Test.kt:96:3:96:10 | return ... | ReturnStmt |
-| Test.kt:100:1:110:1 | Unit | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:100:1:110:1 | fn | Method | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:100:8:100:13 | Object | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:100:8:100:13 | x | Parameter | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:100:16:100:22 | Object | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:100:16:100:22 | y | Parameter | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:100:1:110:1 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:100:25:110:1 | { ... } | BlockStmt | Test.kt:101:5:103:5 | <Expr>; | ExprStmt |
+| Test.kt:101:5:103:5 | ... -> ... | WhenBranch | Test.kt:101:9:101:30 | ... && ... | AndLogicalExpr |
 | Test.kt:101:5:103:5 | <Expr>; | ExprStmt | Test.kt:101:5:103:5 | when ... | WhenExpr |
-| Test.kt:101:5:103:5 | when ... | WhenExpr | Test.kt:101:9:103:5 | ... -> ... | WhenBranch |
+| Test.kt:101:5:103:5 | when ... | WhenExpr | Test.kt:101:5:103:5 | ... -> ... | WhenBranch |
 | Test.kt:101:9:101:9 | x | VarAccess | Test.kt:101:14:101:17 | null | NullLiteral |
 | Test.kt:101:9:101:17 | ... (value equals) ... | ValueEQExpr | Test.kt:101:22:101:22 | y | VarAccess |
 | Test.kt:101:9:101:17 | ... (value equals) ... | ValueEQExpr | Test.kt:105:5:109:5 | <Expr>; | ExprStmt |
 | Test.kt:101:9:101:30 | ... && ... | AndLogicalExpr | Test.kt:101:9:101:9 | x | VarAccess |
-| Test.kt:101:9:103:5 | ... -> ... | WhenBranch | Test.kt:101:9:101:30 | ... && ... | AndLogicalExpr |
 | Test.kt:101:14:101:17 | null | NullLiteral | Test.kt:101:9:101:17 | ... (value equals) ... | ValueEQExpr |
 | Test.kt:101:22:101:22 | y | VarAccess | Test.kt:101:27:101:30 | null | NullLiteral |
 | Test.kt:101:22:101:30 | ... (value equals) ... | ValueEQExpr | Test.kt:101:33:103:5 | { ... } | BlockStmt |
 | Test.kt:101:22:101:30 | ... (value equals) ... | ValueEQExpr | Test.kt:105:5:109:5 | <Expr>; | ExprStmt |
 | Test.kt:101:27:101:30 | null | NullLiteral | Test.kt:101:22:101:30 | ... (value equals) ... | ValueEQExpr |
 | Test.kt:101:33:103:5 | { ... } | BlockStmt | Test.kt:102:15:102:25 | new Exception(...) | ClassInstanceExpr |
-| Test.kt:102:9:102:25 | throw ... | ThrowStmt | Test.kt:100:1:110:1 | fn | Method |
-| Test.kt:102:15:102:25 | Exception | TypeAccess | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:102:9:102:25 | throw ... | ThrowStmt | Test.kt:100:1:110:1 | Exit | Method |
 | Test.kt:102:15:102:25 | new Exception(...) | ClassInstanceExpr | Test.kt:102:9:102:25 | throw ... | ThrowStmt |
 | Test.kt:105:5:109:5 | <Expr>; | ExprStmt | Test.kt:105:5:109:5 | when ... | WhenExpr |
 | Test.kt:105:5:109:5 | when ... | WhenExpr | Test.kt:105:9:107:5 | ... -> ... | WhenBranch |
@@ -207,41 +165,29 @@
 | Test.kt:105:14:105:17 | null | NullLiteral | Test.kt:105:9:105:17 | ... (value not-equals) ... | ValueNEExpr |
 | Test.kt:105:20:107:5 | { ... } | BlockStmt | Test.kt:106:9:106:29 | <Expr>; | ExprStmt |
 | Test.kt:106:9:106:29 | <Expr>; | ExprStmt | Test.kt:106:17:106:28 | "x not null" | StringLiteral |
-| Test.kt:106:9:106:29 | ConsoleKt | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:106:9:106:29 | println(...) | MethodCall | Test.kt:100:1:110:1 | fn | Method |
+| Test.kt:106:9:106:29 | println(...) | MethodCall | Test.kt:100:1:110:1 | Exit | Method |
 | Test.kt:106:17:106:28 | "x not null" | StringLiteral | Test.kt:106:9:106:29 | println(...) | MethodCall |
 | Test.kt:107:16:107:16 | y | VarAccess | Test.kt:107:21:107:24 | null | NullLiteral |
-| Test.kt:107:16:107:24 | ... (value not-equals) ... | ValueNEExpr | Test.kt:100:1:110:1 | fn | Method |
+| Test.kt:107:16:107:24 | ... (value not-equals) ... | ValueNEExpr | Test.kt:100:1:110:1 | Exit | Method |
 | Test.kt:107:16:107:24 | ... (value not-equals) ... | ValueNEExpr | Test.kt:107:27:109:5 | { ... } | BlockStmt |
 | Test.kt:107:16:109:5 | ... -> ... | WhenBranch | Test.kt:107:16:107:16 | y | VarAccess |
 | Test.kt:107:21:107:24 | null | NullLiteral | Test.kt:107:16:107:24 | ... (value not-equals) ... | ValueNEExpr |
 | Test.kt:107:27:109:5 | { ... } | BlockStmt | Test.kt:108:9:108:29 | <Expr>; | ExprStmt |
 | Test.kt:108:9:108:29 | <Expr>; | ExprStmt | Test.kt:108:17:108:28 | "y not null" | StringLiteral |
-| Test.kt:108:9:108:29 | ConsoleKt | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:108:9:108:29 | println(...) | MethodCall | Test.kt:100:1:110:1 | fn | Method |
+| Test.kt:108:9:108:29 | println(...) | MethodCall | Test.kt:100:1:110:1 | Exit | Method |
 | Test.kt:108:17:108:28 | "y not null" | StringLiteral | Test.kt:108:9:108:29 | println(...) | MethodCall |
-| Test.kt:112:1:116:1 | Unit | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:112:1:116:1 | fn | Method | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:112:8:112:17 | boolean | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:112:8:112:17 | x | Parameter | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:112:20:112:29 | boolean | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:112:20:112:29 | y | Parameter | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:112:1:116:1 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:112:32:116:1 | { ... } | BlockStmt | Test.kt:113:5:115:5 | <Expr>; | ExprStmt |
+| Test.kt:113:5:115:5 | ... -> ... | WhenBranch | Test.kt:113:9:113:14 | ... && ... | AndLogicalExpr |
 | Test.kt:113:5:115:5 | <Expr>; | ExprStmt | Test.kt:113:5:115:5 | when ... | WhenExpr |
-| Test.kt:113:5:115:5 | when ... | WhenExpr | Test.kt:113:9:115:5 | ... -> ... | WhenBranch |
-| Test.kt:113:9:113:9 | x | VarAccess | Test.kt:112:1:116:1 | fn | Method |
+| Test.kt:113:5:115:5 | when ... | WhenExpr | Test.kt:113:5:115:5 | ... -> ... | WhenBranch |
+| Test.kt:113:9:113:9 | x | VarAccess | Test.kt:112:1:116:1 | Exit | Method |
 | Test.kt:113:9:113:9 | x | VarAccess | Test.kt:113:14:113:14 | y | VarAccess |
 | Test.kt:113:9:113:14 | ... && ... | AndLogicalExpr | Test.kt:113:9:113:9 | x | VarAccess |
-| Test.kt:113:9:115:5 | ... -> ... | WhenBranch | Test.kt:113:9:113:14 | ... && ... | AndLogicalExpr |
-| Test.kt:113:14:113:14 | y | VarAccess | Test.kt:112:1:116:1 | fn | Method |
+| Test.kt:113:14:113:14 | y | VarAccess | Test.kt:112:1:116:1 | Exit | Method |
 | Test.kt:113:14:113:14 | y | VarAccess | Test.kt:113:17:115:5 | { ... } | BlockStmt |
-| Test.kt:113:17:115:5 | { ... } | BlockStmt | Test.kt:112:1:116:1 | fn | Method |
-| Test.kt:118:1:124:1 | Unit | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:118:1:124:1 | fn_when | Method | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:118:13:118:22 | boolean | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:118:13:118:22 | x | Parameter | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:118:25:118:34 | boolean | TypeAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:118:25:118:34 | y | Parameter | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:113:17:115:5 | { ... } | BlockStmt | Test.kt:112:1:116:1 | Exit | Method |
+| Test.kt:118:1:124:1 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:118:37:124:1 | { ... } | BlockStmt | Test.kt:119:2:123:12 | <Expr>; | ExprStmt |
 | Test.kt:119:2:123:12 | <Expr>; | ExprStmt | Test.kt:119:2:123:12 | when ... | WhenExpr |
 | Test.kt:119:2:123:12 | when ... | WhenExpr | Test.kt:120:3:123:10 | ... -> ... | WhenBranch |
@@ -251,11 +197,11 @@
 | Test.kt:121:4:121:4 | x | VarAccess | Test.kt:122:12:122:16 | ... -> ... | WhenBranch |
 | Test.kt:121:4:121:9 | ... -> ... | WhenBranch | Test.kt:121:4:121:4 | x | VarAccess |
 | Test.kt:121:9:121:9 | <Expr>; | ExprStmt | Test.kt:121:9:121:9 | y | VarAccess |
-| Test.kt:121:9:121:9 | y | VarAccess | Test.kt:118:1:124:1 | fn_when | Method |
+| Test.kt:121:9:121:9 | y | VarAccess | Test.kt:118:1:124:1 | Exit | Method |
 | Test.kt:121:9:121:9 | y | VarAccess | Test.kt:123:8:123:10 | { ... } | BlockStmt |
 | Test.kt:122:12:122:16 | ... -> ... | WhenBranch | Test.kt:122:12:122:16 | true | BooleanLiteral |
 | Test.kt:122:12:122:16 | <Expr>; | ExprStmt | Test.kt:122:12:122:16 | false | BooleanLiteral |
-| Test.kt:122:12:122:16 | false | BooleanLiteral | Test.kt:118:1:124:1 | fn_when | Method |
+| Test.kt:122:12:122:16 | false | BooleanLiteral | Test.kt:118:1:124:1 | Exit | Method |
 | Test.kt:122:12:122:16 | true | BooleanLiteral | Test.kt:122:12:122:16 | <Expr>; | ExprStmt |
-| Test.kt:123:8:123:10 | { ... } | BlockStmt | Test.kt:118:1:124:1 | fn_when | Method |
+| Test.kt:123:8:123:10 | { ... } | BlockStmt | Test.kt:118:1:124:1 | Exit | Method |
 missingSuccessor
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/getASuccessor.ql b/java/ql/test-kotlin2/library-tests/controlflow/basic/getASuccessor.ql
index eff8c2306e857..10a2568b0607c 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/getASuccessor.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/getASuccessor.ql
@@ -21,7 +21,7 @@ class YesMaybeControlFlowNode extends MaybeControlFlowNode {
 
   override Location getLocation() { result = c.getLocation() }
 
-  override string getPrimaryQlClasses() { result = c.getPrimaryQlClasses() }
+  override string getPrimaryQlClasses() { result = c.getAstNode().getPrimaryQlClasses() }
 }
 
 class NoMaybeControlFlowNode extends MaybeControlFlowNode {
@@ -43,11 +43,11 @@ MaybeControlFlowNode maybeSuccessor(ControlFlowNode n) {
 from ControlFlowNode n, MaybeControlFlowNode m
 where
   m = maybeSuccessor(n) and
-  n.getFile().(CompilationUnit).fromSource()
-select n, n.getPrimaryQlClasses(), m, m.getPrimaryQlClasses()
+  n.getLocation().getFile().(CompilationUnit).fromSource()
+select n, n.getAstNode().getPrimaryQlClasses(), m, m.getPrimaryQlClasses()
 
 query predicate missingSuccessor(Expr n) {
-  maybeSuccessor(n) instanceof NoMaybeControlFlowNode and
+  maybeSuccessor(n.getControlFlowNode()) instanceof NoMaybeControlFlowNode and
   n.getFile().(CompilationUnit).fromSource() and
   not n instanceof TypeAccess and
   not n instanceof VarWrite
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/strictDominance.expected b/java/ql/test-kotlin2/library-tests/controlflow/basic/strictDominance.expected
index 4fb56510ed51d..a85a0c120b3ce 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/strictDominance.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/strictDominance.expected
@@ -1,495 +1,495 @@
-| Test.kt:3:1:80:1 | super(...) | Test.kt:3:1:80:1 | { ... } |
-| Test.kt:3:1:80:1 | { ... } | Test.kt:3:1:80:1 | super(...) |
-| Test.kt:3:1:80:1 | { ... } | Test.kt:3:1:80:1 | { ... } |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:5:3:5:16 | var ...; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:6:3:6:18 | var ...; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:7:3:7:16 | var ...; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:8:3:8:16 | var ...; |
+| Test.kt:3:1:80:1 | super(...) | Test.kt:3:8:80:1 | { ... } |
+| Test.kt:3:8:80:1 | { ... } | Test.kt:3:1:80:1 | super(...) |
+| Test.kt:3:8:80:1 | { ... } | Test.kt:3:8:80:1 | { ... } |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:5:7:5:7 | var ...; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:6:7:6:7 | var ...; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:7:7:7:7 | var ...; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:8:7:8:7 | var ...; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:11:3:16:3 | ... -> ... |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:11:7:14:3 | ... -> ... |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:12:4:12:9 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:13:4:13:9 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:14:10:16:3 | ... -> ... |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:12:4:12:4 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:13:4:13:4 | <Expr>; |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:15:4:15:9 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:18:3:18:7 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:15:4:15:4 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:21:3:24:9 | ... -> ... |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:21:3:24:9 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:21:6:22:9 | ... -> ... |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:24:4:24:9 | ... -> ... |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:22:4:22:4 | <Expr>; |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:24:4:24:9 | return ... |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:27:3:27:8 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:30:3:33:3 | ... -> ... |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:30:7:33:3 | ... -> ... |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:35:3:35:8 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:35:3:35:3 | <Expr>; |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:38:3:41:3 | while (...) |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:40:4:40:4 | <Expr>; |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:40:4:40:6 | var ...; |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:77:3:77:8 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:77:3:77:3 | <Expr>; |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:78:3:78:8 | return ... |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:6:3:6:18 | var ...; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:7:3:7:16 | var ...; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:8:3:8:16 | var ...; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:11:7:14:3 | ... -> ... |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:12:4:12:9 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:13:4:13:9 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:15:4:15:9 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:18:3:18:7 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:21:3:24:9 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:21:6:22:9 | ... -> ... |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:24:4:24:9 | ... -> ... |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:24:4:24:9 | return ... |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:7:3:7:16 | var ...; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:8:3:8:16 | var ...; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:11:7:14:3 | ... -> ... |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:12:4:12:9 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:13:4:13:9 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:15:4:15:9 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:18:3:18:7 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:21:3:24:9 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:21:6:22:9 | ... -> ... |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:24:4:24:9 | ... -> ... |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:24:4:24:9 | return ... |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:8:3:8:16 | var ...; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:11:7:14:3 | ... -> ... |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:12:4:12:9 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:13:4:13:9 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:15:4:15:9 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:18:3:18:7 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:21:3:24:9 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:21:6:22:9 | ... -> ... |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:24:4:24:9 | ... -> ... |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:24:4:24:9 | return ... |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:11:7:14:3 | ... -> ... |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:12:4:12:9 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:13:4:13:9 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:15:4:15:9 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:18:3:18:7 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:21:3:24:9 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:21:6:22:9 | ... -> ... |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:24:4:24:9 | ... -> ... |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:24:4:24:9 | return ... |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:11:7:14:3 | ... -> ... |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:6:7:6:7 | var ...; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:7:7:7:7 | var ...; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:8:7:8:7 | var ...; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:11:3:16:3 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:11:14:14:3 | { ... } |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:12:4:12:4 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:13:4:13:4 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:14:10:16:3 | { ... } |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:15:4:15:4 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:21:3:24:9 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:24:4:24:9 | return ... |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:30:3:33:3 | ... -> ... |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:77:3:77:3 | <Expr>; |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:78:3:78:8 | return ... |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:7:7:7:7 | var ...; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:8:7:8:7 | var ...; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:11:3:16:3 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:11:14:14:3 | { ... } |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:12:4:12:4 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:13:4:13:4 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:14:10:16:3 | { ... } |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:15:4:15:4 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:21:3:24:9 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:24:4:24:9 | return ... |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:30:3:33:3 | ... -> ... |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:77:3:77:3 | <Expr>; |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:78:3:78:8 | return ... |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:8:7:8:7 | var ...; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:11:3:16:3 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:11:14:14:3 | { ... } |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:12:4:12:4 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:13:4:13:4 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:14:10:16:3 | { ... } |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:15:4:15:4 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:21:3:24:9 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:24:4:24:9 | return ... |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:30:3:33:3 | ... -> ... |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:77:3:77:3 | <Expr>; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:78:3:78:8 | return ... |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:11:3:16:3 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:11:14:14:3 | { ... } |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:12:4:12:4 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:13:4:13:4 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:14:10:16:3 | { ... } |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:15:4:15:4 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:21:3:24:9 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:24:4:24:9 | return ... |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:30:3:33:3 | ... -> ... |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:77:3:77:3 | <Expr>; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:78:3:78:8 | return ... |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:11:14:14:3 | { ... } |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:12:4:12:4 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:13:4:13:4 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:14:10:16:3 | { ... } |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:14:10:16:3 | { ... } |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:15:4:15:4 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:15:4:15:4 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:21:3:24:9 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:24:4:24:9 | return ... |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:30:3:33:3 | ... -> ... |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:77:3:77:3 | <Expr>; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:78:3:78:8 | return ... |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:11:3:16:3 | ... -> ... |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:12:4:12:9 | <Expr>; |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:13:4:13:9 | <Expr>; |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:14:10:16:3 | ... -> ... |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:12:4:12:4 | <Expr>; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:13:4:13:4 | <Expr>; |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:15:4:15:9 | <Expr>; |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:18:3:18:7 | <Expr>; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:15:4:15:4 | <Expr>; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:21:3:24:9 | ... -> ... |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:21:3:24:9 | <Expr>; |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:21:6:22:9 | ... -> ... |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:24:4:24:9 | ... -> ... |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:24:4:24:9 | return ... |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:27:3:27:8 | <Expr>; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:30:3:33:3 | ... -> ... |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:77:3:77:8 | <Expr>; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:77:3:77:3 | <Expr>; |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:12:4:12:9 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:13:4:13:9 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:15:4:15:9 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:18:3:18:7 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:21:3:24:9 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:21:6:22:9 | ... -> ... |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:24:4:24:9 | ... -> ... |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:24:4:24:9 | return ... |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:78:3:78:8 | return ... |
-| Test.kt:11:14:14:3 | { ... } | Test.kt:12:4:12:9 | <Expr>; |
-| Test.kt:11:14:14:3 | { ... } | Test.kt:13:4:13:9 | <Expr>; |
-| Test.kt:12:4:12:9 | <Expr>; | Test.kt:13:4:13:9 | <Expr>; |
-| Test.kt:14:10:16:3 | ... -> ... | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:14:10:16:3 | ... -> ... | Test.kt:15:4:15:9 | <Expr>; |
-| Test.kt:14:10:16:3 | { ... } | Test.kt:15:4:15:9 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:21:3:24:9 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:21:6:22:9 | ... -> ... |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:24:4:24:9 | ... -> ... |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:24:4:24:9 | return ... |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:21:6:22:9 | ... -> ... |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:24:4:24:9 | ... -> ... |
+| Test.kt:11:14:14:3 | { ... } | Test.kt:12:4:12:4 | <Expr>; |
+| Test.kt:11:14:14:3 | { ... } | Test.kt:13:4:13:4 | <Expr>; |
+| Test.kt:12:4:12:4 | <Expr>; | Test.kt:13:4:13:4 | <Expr>; |
+| Test.kt:14:10:16:3 | { ... } | Test.kt:15:4:15:4 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:21:3:24:9 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:24:4:24:9 | return ... |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:30:3:33:3 | ... -> ... |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:77:3:77:3 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:78:3:78:8 | return ... |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:24:4:24:9 | return ... |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:24:4:24:9 | return ... |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:30:3:33:3 | ... -> ... |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:77:3:77:3 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:78:3:78:8 | return ... |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:24:4:24:9 | return ... |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:27:3:27:8 | <Expr>; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:30:3:33:3 | ... -> ... |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:77:3:77:8 | <Expr>; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:77:3:77:3 | <Expr>; |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:24:4:24:9 | ... -> ... |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:24:4:24:9 | return ... |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:78:3:78:8 | return ... |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:24:4:24:9 | ... -> ... | Test.kt:24:4:24:9 | return ... |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:30:3:33:3 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:3:33:3 | ... -> ... |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:77:3:77:3 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:78:3:78:8 | return ... |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:30:3:33:3 | ... -> ... |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:77:3:77:3 | <Expr>; |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:78:3:78:8 | return ... |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:77:3:77:3 | <Expr>; |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:78:3:78:8 | return ... |
+| Test.kt:30:3:33:3 | <Expr>; | Test.kt:30:3:33:3 | ... -> ... |
 | Test.kt:30:3:33:3 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:30:3:33:3 | <Expr>; | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:30:3:33:3 | <Expr>; | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:30:3:33:3 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
+| Test.kt:30:3:33:3 | <Expr>; | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:30:3:33:3 | <Expr>; | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:30:3:33:3 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
 | Test.kt:30:3:33:3 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
 | Test.kt:30:3:33:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:30:3:33:3 | <Expr>; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:30:3:33:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:30:3:33:3 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:30:3:33:3 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
 | Test.kt:30:3:33:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:30:3:33:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:30:3:33:3 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
 | Test.kt:30:3:33:3 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:30:3:33:3 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:30:3:33:3 | <Expr>; | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:30:3:33:3 | <Expr>; | Test.kt:77:3:77:8 | <Expr>; |
+| Test.kt:30:3:33:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:30:3:33:3 | <Expr>; | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:30:3:33:3 | <Expr>; | Test.kt:77:3:77:3 | <Expr>; |
 | Test.kt:30:3:33:3 | <Expr>; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:78:3:78:8 | return ... |
-| Test.kt:30:15:33:3 | { ... } | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:30:15:33:3 | { ... } | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:31:4:31:9 | <Expr>; | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:78:3:78:8 | return ... |
+| Test.kt:30:15:33:3 | { ... } | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:30:15:33:3 | { ... } | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:31:4:31:4 | <Expr>; | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:77:3:77:3 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:78:3:78:8 | return ... |
 | Test.kt:38:3:41:3 | while (...) | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:38:3:41:3 | while (...) | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:38:3:41:3 | while (...) | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:38:3:41:3 | while (...) | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:38:3:41:3 | while (...) | Test.kt:40:4:40:4 | <Expr>; |
 | Test.kt:38:3:41:3 | while (...) | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:38:3:41:3 | while (...) | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:38:3:41:3 | while (...) | Test.kt:40:4:40:6 | var ...; |
 | Test.kt:38:3:41:3 | while (...) | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:38:3:41:3 | while (...) | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:38:3:41:3 | while (...) | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:38:3:41:3 | while (...) | Test.kt:77:3:77:8 | <Expr>; |
+| Test.kt:38:3:41:3 | while (...) | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:38:3:41:3 | while (...) | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:38:3:41:3 | while (...) | Test.kt:77:3:77:3 | <Expr>; |
 | Test.kt:38:3:41:3 | while (...) | Test.kt:78:3:78:8 | return ... |
-| Test.kt:38:16:41:3 | { ... } | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:38:16:41:3 | { ... } | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:38:16:41:3 | { ... } | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:38:16:41:3 | { ... } | Test.kt:40:4:40:4 | <Expr>; |
 | Test.kt:38:16:41:3 | { ... } | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:38:16:41:3 | { ... } | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:38:16:41:3 | { ... } | Test.kt:40:4:40:6 | var ...; |
 | Test.kt:38:16:41:3 | { ... } | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:39:4:39:9 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:39:4:39:9 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:39:4:39:9 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:39:4:39:9 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:39:4:39:9 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:39:4:39:4 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:39:4:39:4 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:39:4:39:4 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:39:4:39:4 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:39:4:39:4 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:40:4:40:4 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:40:4:40:6 | var ...; | Test.kt:40:4:40:4 | <Expr>; |
 | Test.kt:40:4:40:6 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:40:4:40:6 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:4 | <Expr>; |
 | Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:78:3:78:8 | return ... |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:77:3:77:3 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:78:3:78:8 | return ... |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:77:3:77:3 | <Expr>; |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:78:3:78:8 | return ... |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:78:3:78:8 | return ... |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:83:2:88:2 | try ... |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:83:6:86:2 | { ... } |
-| Test.kt:82:21:89:1 | { ... } | Test.kt:84:3:84:18 | var ...; |
+| Test.kt:82:21:89:1 | { ... } | Test.kt:84:7:84:7 | var ...; |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:85:3:85:10 | return ... |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:86:4:88:2 | catch (...) |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:86:34:88:2 | { ... } |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:87:3:87:10 | return ... |
 | Test.kt:83:2:88:2 | try ... | Test.kt:83:6:86:2 | { ... } |
-| Test.kt:83:2:88:2 | try ... | Test.kt:84:3:84:18 | var ...; |
+| Test.kt:83:2:88:2 | try ... | Test.kt:84:7:84:7 | var ...; |
 | Test.kt:83:2:88:2 | try ... | Test.kt:85:3:85:10 | return ... |
 | Test.kt:83:2:88:2 | try ... | Test.kt:86:4:88:2 | catch (...) |
 | Test.kt:83:2:88:2 | try ... | Test.kt:86:34:88:2 | { ... } |
 | Test.kt:83:2:88:2 | try ... | Test.kt:87:3:87:10 | return ... |
-| Test.kt:83:6:86:2 | { ... } | Test.kt:84:3:84:18 | var ...; |
+| Test.kt:83:6:86:2 | { ... } | Test.kt:84:7:84:7 | var ...; |
 | Test.kt:83:6:86:2 | { ... } | Test.kt:85:3:85:10 | return ... |
 | Test.kt:83:6:86:2 | { ... } | Test.kt:86:4:88:2 | catch (...) |
 | Test.kt:83:6:86:2 | { ... } | Test.kt:86:34:88:2 | { ... } |
 | Test.kt:83:6:86:2 | { ... } | Test.kt:87:3:87:10 | return ... |
-| Test.kt:84:3:84:18 | var ...; | Test.kt:85:3:85:10 | return ... |
-| Test.kt:84:3:84:18 | var ...; | Test.kt:86:4:88:2 | catch (...) |
-| Test.kt:84:3:84:18 | var ...; | Test.kt:86:34:88:2 | { ... } |
-| Test.kt:84:3:84:18 | var ...; | Test.kt:87:3:87:10 | return ... |
+| Test.kt:84:7:84:7 | var ...; | Test.kt:85:3:85:10 | return ... |
+| Test.kt:84:7:84:7 | var ...; | Test.kt:86:4:88:2 | catch (...) |
+| Test.kt:84:7:84:7 | var ...; | Test.kt:86:34:88:2 | { ... } |
+| Test.kt:84:7:84:7 | var ...; | Test.kt:87:3:87:10 | return ... |
 | Test.kt:86:4:88:2 | catch (...) | Test.kt:86:34:88:2 | { ... } |
 | Test.kt:86:4:88:2 | catch (...) | Test.kt:87:3:87:10 | return ... |
 | Test.kt:86:34:88:2 | { ... } | Test.kt:87:3:87:10 | return ... |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:92:2:97:2 | try ... |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:92:6:95:2 | { ... } |
-| Test.kt:91:22:98:1 | { ... } | Test.kt:93:3:93:13 | var ...; |
+| Test.kt:91:22:98:1 | { ... } | Test.kt:93:7:93:7 | var ...; |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:94:3:94:10 | return ... |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:95:4:97:2 | catch (...) |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:95:36:97:2 | { ... } |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:96:3:96:10 | return ... |
 | Test.kt:92:2:97:2 | try ... | Test.kt:92:6:95:2 | { ... } |
-| Test.kt:92:2:97:2 | try ... | Test.kt:93:3:93:13 | var ...; |
+| Test.kt:92:2:97:2 | try ... | Test.kt:93:7:93:7 | var ...; |
 | Test.kt:92:2:97:2 | try ... | Test.kt:94:3:94:10 | return ... |
 | Test.kt:92:2:97:2 | try ... | Test.kt:95:4:97:2 | catch (...) |
 | Test.kt:92:2:97:2 | try ... | Test.kt:95:36:97:2 | { ... } |
 | Test.kt:92:2:97:2 | try ... | Test.kt:96:3:96:10 | return ... |
-| Test.kt:92:6:95:2 | { ... } | Test.kt:93:3:93:13 | var ...; |
+| Test.kt:92:6:95:2 | { ... } | Test.kt:93:7:93:7 | var ...; |
 | Test.kt:92:6:95:2 | { ... } | Test.kt:94:3:94:10 | return ... |
 | Test.kt:92:6:95:2 | { ... } | Test.kt:95:4:97:2 | catch (...) |
 | Test.kt:92:6:95:2 | { ... } | Test.kt:95:36:97:2 | { ... } |
 | Test.kt:92:6:95:2 | { ... } | Test.kt:96:3:96:10 | return ... |
-| Test.kt:93:3:93:13 | var ...; | Test.kt:94:3:94:10 | return ... |
-| Test.kt:93:3:93:13 | var ...; | Test.kt:95:4:97:2 | catch (...) |
-| Test.kt:93:3:93:13 | var ...; | Test.kt:95:36:97:2 | { ... } |
-| Test.kt:93:3:93:13 | var ...; | Test.kt:96:3:96:10 | return ... |
+| Test.kt:93:7:93:7 | var ...; | Test.kt:94:3:94:10 | return ... |
+| Test.kt:93:7:93:7 | var ...; | Test.kt:95:4:97:2 | catch (...) |
+| Test.kt:93:7:93:7 | var ...; | Test.kt:95:36:97:2 | { ... } |
+| Test.kt:93:7:93:7 | var ...; | Test.kt:96:3:96:10 | return ... |
 | Test.kt:95:4:97:2 | catch (...) | Test.kt:95:36:97:2 | { ... } |
 | Test.kt:95:4:97:2 | catch (...) | Test.kt:96:3:96:10 | return ... |
 | Test.kt:95:36:97:2 | { ... } | Test.kt:96:3:96:10 | return ... |
+| Test.kt:100:25:110:1 | { ... } | Test.kt:101:5:103:5 | ... -> ... |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:101:5:103:5 | <Expr>; |
-| Test.kt:100:25:110:1 | { ... } | Test.kt:101:9:103:5 | ... -> ... |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:101:33:103:5 | { ... } |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:102:9:102:25 | throw ... |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:105:5:109:5 | <Expr>; |
@@ -499,7 +499,16 @@
 | Test.kt:100:25:110:1 | { ... } | Test.kt:107:16:109:5 | ... -> ... |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:107:27:109:5 | { ... } |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:108:9:108:29 | <Expr>; |
-| Test.kt:101:5:103:5 | <Expr>; | Test.kt:101:9:103:5 | ... -> ... |
+| Test.kt:101:5:103:5 | ... -> ... | Test.kt:101:33:103:5 | { ... } |
+| Test.kt:101:5:103:5 | ... -> ... | Test.kt:102:9:102:25 | throw ... |
+| Test.kt:101:5:103:5 | ... -> ... | Test.kt:105:5:109:5 | <Expr>; |
+| Test.kt:101:5:103:5 | ... -> ... | Test.kt:105:9:107:5 | ... -> ... |
+| Test.kt:101:5:103:5 | ... -> ... | Test.kt:105:20:107:5 | { ... } |
+| Test.kt:101:5:103:5 | ... -> ... | Test.kt:106:9:106:29 | <Expr>; |
+| Test.kt:101:5:103:5 | ... -> ... | Test.kt:107:16:109:5 | ... -> ... |
+| Test.kt:101:5:103:5 | ... -> ... | Test.kt:107:27:109:5 | { ... } |
+| Test.kt:101:5:103:5 | ... -> ... | Test.kt:108:9:108:29 | <Expr>; |
+| Test.kt:101:5:103:5 | <Expr>; | Test.kt:101:5:103:5 | ... -> ... |
 | Test.kt:101:5:103:5 | <Expr>; | Test.kt:101:33:103:5 | { ... } |
 | Test.kt:101:5:103:5 | <Expr>; | Test.kt:102:9:102:25 | throw ... |
 | Test.kt:101:5:103:5 | <Expr>; | Test.kt:105:5:109:5 | <Expr>; |
@@ -509,15 +518,6 @@
 | Test.kt:101:5:103:5 | <Expr>; | Test.kt:107:16:109:5 | ... -> ... |
 | Test.kt:101:5:103:5 | <Expr>; | Test.kt:107:27:109:5 | { ... } |
 | Test.kt:101:5:103:5 | <Expr>; | Test.kt:108:9:108:29 | <Expr>; |
-| Test.kt:101:9:103:5 | ... -> ... | Test.kt:101:33:103:5 | { ... } |
-| Test.kt:101:9:103:5 | ... -> ... | Test.kt:102:9:102:25 | throw ... |
-| Test.kt:101:9:103:5 | ... -> ... | Test.kt:105:5:109:5 | <Expr>; |
-| Test.kt:101:9:103:5 | ... -> ... | Test.kt:105:9:107:5 | ... -> ... |
-| Test.kt:101:9:103:5 | ... -> ... | Test.kt:105:20:107:5 | { ... } |
-| Test.kt:101:9:103:5 | ... -> ... | Test.kt:106:9:106:29 | <Expr>; |
-| Test.kt:101:9:103:5 | ... -> ... | Test.kt:107:16:109:5 | ... -> ... |
-| Test.kt:101:9:103:5 | ... -> ... | Test.kt:107:27:109:5 | { ... } |
-| Test.kt:101:9:103:5 | ... -> ... | Test.kt:108:9:108:29 | <Expr>; |
 | Test.kt:101:33:103:5 | { ... } | Test.kt:102:9:102:25 | throw ... |
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:105:9:107:5 | ... -> ... |
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:105:20:107:5 | { ... } |
@@ -534,12 +534,12 @@
 | Test.kt:107:16:109:5 | ... -> ... | Test.kt:107:27:109:5 | { ... } |
 | Test.kt:107:16:109:5 | ... -> ... | Test.kt:108:9:108:29 | <Expr>; |
 | Test.kt:107:27:109:5 | { ... } | Test.kt:108:9:108:29 | <Expr>; |
+| Test.kt:112:32:116:1 | { ... } | Test.kt:113:5:115:5 | ... -> ... |
 | Test.kt:112:32:116:1 | { ... } | Test.kt:113:5:115:5 | <Expr>; |
-| Test.kt:112:32:116:1 | { ... } | Test.kt:113:9:115:5 | ... -> ... |
 | Test.kt:112:32:116:1 | { ... } | Test.kt:113:17:115:5 | { ... } |
-| Test.kt:113:5:115:5 | <Expr>; | Test.kt:113:9:115:5 | ... -> ... |
+| Test.kt:113:5:115:5 | ... -> ... | Test.kt:113:17:115:5 | { ... } |
+| Test.kt:113:5:115:5 | <Expr>; | Test.kt:113:5:115:5 | ... -> ... |
 | Test.kt:113:5:115:5 | <Expr>; | Test.kt:113:17:115:5 | { ... } |
-| Test.kt:113:9:115:5 | ... -> ... | Test.kt:113:17:115:5 | { ... } |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:119:2:123:12 | <Expr>; |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:120:3:123:10 | ... -> ... |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:121:4:121:9 | ... -> ... |
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/strictDominance.ql b/java/ql/test-kotlin2/library-tests/controlflow/basic/strictDominance.ql
index 2d366a4f37277..10529b6d5c862 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/strictDominance.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/strictDominance.ql
@@ -2,5 +2,5 @@ import default
 import semmle.code.java.controlflow.Dominance
 
 from Stmt pre, Stmt post
-where strictlyDominates(pre, post)
+where strictlyDominates(pre.getControlFlowNode(), post.getControlFlowNode())
 select pre, post
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/strictPostDominance.expected b/java/ql/test-kotlin2/library-tests/controlflow/basic/strictPostDominance.expected
index 257d82fc1a7f2..9971f41a3be20 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/strictPostDominance.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/strictPostDominance.expected
@@ -1,219 +1,219 @@
-| Test.kt:3:1:80:1 | super(...) | Test.kt:3:1:80:1 | { ... } |
-| Test.kt:3:1:80:1 | { ... } | Test.kt:3:1:80:1 | super(...) |
-| Test.kt:3:1:80:1 | { ... } | Test.kt:3:1:80:1 | { ... } |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:4:13:79:2 | { ... } |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:4:13:79:2 | { ... } |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:5:3:5:16 | var ...; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:4:13:79:2 | { ... } |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:5:3:5:16 | var ...; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:6:3:6:18 | var ...; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:4:13:79:2 | { ... } |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:5:3:5:16 | var ...; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:6:3:6:18 | var ...; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:7:3:7:16 | var ...; |
+| Test.kt:3:1:80:1 | super(...) | Test.kt:3:8:80:1 | { ... } |
+| Test.kt:3:8:80:1 | { ... } | Test.kt:3:1:80:1 | super(...) |
+| Test.kt:3:8:80:1 | { ... } | Test.kt:3:8:80:1 | { ... } |
+| Test.kt:5:7:5:7 | var ...; | Test.kt:4:13:79:2 | { ... } |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:4:13:79:2 | { ... } |
+| Test.kt:6:7:6:7 | var ...; | Test.kt:5:7:5:7 | var ...; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:4:13:79:2 | { ... } |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:5:7:5:7 | var ...; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:6:7:6:7 | var ...; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:4:13:79:2 | { ... } |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:5:7:5:7 | var ...; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:6:7:6:7 | var ...; |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:7:7:7:7 | var ...; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:4:13:79:2 | { ... } |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:5:7:5:7 | var ...; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:6:7:6:7 | var ...; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:7:7:7:7 | var ...; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:8:7:8:7 | var ...; |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:11:3:16:3 | <Expr>; |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:4:13:79:2 | { ... } |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:5:3:5:16 | var ...; |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:6:3:6:18 | var ...; |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:7:3:7:16 | var ...; |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:8:3:8:16 | var ...; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:4:13:79:2 | { ... } |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:5:3:5:16 | var ...; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:6:3:6:18 | var ...; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:7:3:7:16 | var ...; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:8:3:8:16 | var ...; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:12:4:12:9 | <Expr>; | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:13:4:13:9 | <Expr>; | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:13:4:13:9 | <Expr>; | Test.kt:12:4:12:9 | <Expr>; |
-| Test.kt:14:10:16:3 | { ... } | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:15:4:15:9 | <Expr>; | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:15:4:15:9 | <Expr>; | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:4:13:79:2 | { ... } |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:5:3:5:16 | var ...; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:6:3:6:18 | var ...; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:7:3:7:16 | var ...; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:8:3:8:16 | var ...; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:11:7:14:3 | ... -> ... |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:12:4:12:9 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:13:4:13:9 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:15:4:15:9 | <Expr>; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:5:7:5:7 | var ...; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:6:7:6:7 | var ...; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:7:7:7:7 | var ...; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:8:7:8:7 | var ...; |
+| Test.kt:12:4:12:4 | <Expr>; | Test.kt:11:14:14:3 | { ... } |
+| Test.kt:13:4:13:4 | <Expr>; | Test.kt:11:14:14:3 | { ... } |
+| Test.kt:13:4:13:4 | <Expr>; | Test.kt:12:4:12:4 | <Expr>; |
+| Test.kt:14:10:16:3 | { ... } | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:15:4:15:4 | <Expr>; | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:15:4:15:4 | <Expr>; | Test.kt:14:10:16:3 | { ... } |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:4:13:79:2 | { ... } |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:5:7:5:7 | var ...; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:6:7:6:7 | var ...; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:7:7:7:7 | var ...; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:8:7:8:7 | var ...; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:11:3:16:3 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:11:14:14:3 | { ... } |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:12:4:12:4 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:13:4:13:4 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:14:10:16:3 | { ... } |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:15:4:15:4 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:4:13:79:2 | { ... } |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:5:7:5:7 | var ...; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:6:7:6:7 | var ...; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:7:7:7:7 | var ...; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:8:7:8:7 | var ...; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:11:3:16:3 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:11:14:14:3 | { ... } |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:12:4:12:4 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:13:4:13:4 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:14:10:16:3 | { ... } |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:15:4:15:4 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:21:3:24:9 | ... -> ... | Test.kt:21:3:24:9 | <Expr>; |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:4:13:79:2 | { ... } |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:5:3:5:16 | var ...; |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:6:3:6:18 | var ...; |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:7:3:7:16 | var ...; |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:8:3:8:16 | var ...; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:5:7:5:7 | var ...; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:6:7:6:7 | var ...; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:7:7:7:7 | var ...; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:8:7:8:7 | var ...; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:11:3:16:3 | ... -> ... |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:11:7:14:3 | ... -> ... |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:12:4:12:9 | <Expr>; |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:13:4:13:9 | <Expr>; |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:14:10:16:3 | ... -> ... |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:12:4:12:4 | <Expr>; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:13:4:13:4 | <Expr>; |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:15:4:15:9 | <Expr>; |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:18:3:18:7 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:4:13:79:2 | { ... } |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:5:3:5:16 | var ...; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:6:3:6:18 | var ...; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:7:3:7:16 | var ...; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:8:3:8:16 | var ...; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:11:7:14:3 | ... -> ... |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:12:4:12:9 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:13:4:13:9 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:15:4:15:9 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:18:3:18:7 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:21:3:24:9 | <Expr>; |
-| Test.kt:24:4:24:9 | return ... | Test.kt:24:4:24:9 | ... -> ... |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:30:3:33:3 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:30:3:33:3 | <Expr>; | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:31:4:31:9 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:32:4:32:9 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:32:4:32:9 | <Expr>; | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:38:3:41:3 | while (...) | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:38:3:41:3 | while (...) | Test.kt:27:3:27:8 | <Expr>; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:15:4:15:4 | <Expr>; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:24:4:24:9 | return ... | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:30:3:33:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:30:3:33:3 | <Expr>; | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:31:4:31:4 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:32:4:32:4 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:32:4:32:4 | <Expr>; | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:30:3:33:3 | ... -> ... |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:38:3:41:3 | while (...) | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:38:3:41:3 | while (...) | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:38:3:41:3 | while (...) | Test.kt:30:3:33:3 | ... -> ... |
 | Test.kt:38:3:41:3 | while (...) | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:38:3:41:3 | while (...) | Test.kt:30:7:33:3 | ... -> ... |
 | Test.kt:38:3:41:3 | while (...) | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:38:3:41:3 | while (...) | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:38:3:41:3 | while (...) | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:38:3:41:3 | while (...) | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:39:4:39:9 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:38:3:41:3 | while (...) | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:38:3:41:3 | while (...) | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:38:3:41:3 | while (...) | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:39:4:39:4 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:40:4:40:4 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:40:4:40:4 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:40:4:40:4 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:40:4:40:4 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:40:4:40:4 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:40:4:40:6 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:40:4:40:6 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
 | Test.kt:40:4:40:6 | var ...; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:40:4:40:6 | var ...; | Test.kt:39:4:39:9 | <Expr>; |
+| Test.kt:40:4:40:6 | var ...; | Test.kt:39:4:39:4 | <Expr>; |
 | Test.kt:40:4:40:6 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:40:4:40:6 | var ...; | Test.kt:40:4:40:6 | { ... } |
 | Test.kt:40:4:40:6 | { ... } | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:40:4:40:6 | { ... } | Test.kt:39:4:39:9 | <Expr>; |
+| Test.kt:40:4:40:6 | { ... } | Test.kt:39:4:39:4 | <Expr>; |
 | Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:43:3:43:8 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:73:3:73:8 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:78:3:78:8 | return ... | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:78:3:78:8 | return ... | Test.kt:27:3:27:8 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:30:3:33:3 | ... -> ... |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:30:3:33:3 | ... -> ... |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:30:3:33:3 | ... -> ... |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:78:3:78:8 | return ... | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:78:3:78:8 | return ... | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:78:3:78:8 | return ... | Test.kt:30:3:33:3 | ... -> ... |
 | Test.kt:78:3:78:8 | return ... | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:78:3:78:8 | return ... | Test.kt:30:7:33:3 | ... -> ... |
 | Test.kt:78:3:78:8 | return ... | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:78:3:78:8 | return ... | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:78:3:78:8 | return ... | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:78:3:78:8 | return ... | Test.kt:35:3:35:8 | <Expr>; |
+| Test.kt:78:3:78:8 | return ... | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:78:3:78:8 | return ... | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:78:3:78:8 | return ... | Test.kt:35:3:35:3 | <Expr>; |
 | Test.kt:78:3:78:8 | return ... | Test.kt:38:3:41:3 | while (...) |
 | Test.kt:78:3:78:8 | return ... | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:78:3:78:8 | return ... | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:78:3:78:8 | return ... | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:78:3:78:8 | return ... | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:78:3:78:8 | return ... | Test.kt:40:4:40:4 | <Expr>; |
 | Test.kt:78:3:78:8 | return ... | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:78:3:78:8 | return ... | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:78:3:78:8 | return ... | Test.kt:40:4:40:6 | var ...; |
 | Test.kt:78:3:78:8 | return ... | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:78:3:78:8 | return ... | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:78:3:78:8 | return ... | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:78:3:78:8 | return ... | Test.kt:77:3:77:8 | <Expr>; |
+| Test.kt:78:3:78:8 | return ... | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:78:3:78:8 | return ... | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:78:3:78:8 | return ... | Test.kt:77:3:77:3 | <Expr>; |
 | Test.kt:83:2:88:2 | try ... | Test.kt:82:21:89:1 | { ... } |
 | Test.kt:83:6:86:2 | { ... } | Test.kt:82:21:89:1 | { ... } |
 | Test.kt:83:6:86:2 | { ... } | Test.kt:83:2:88:2 | try ... |
-| Test.kt:84:3:84:18 | var ...; | Test.kt:82:21:89:1 | { ... } |
-| Test.kt:84:3:84:18 | var ...; | Test.kt:83:2:88:2 | try ... |
-| Test.kt:84:3:84:18 | var ...; | Test.kt:83:6:86:2 | { ... } |
+| Test.kt:84:7:84:7 | var ...; | Test.kt:82:21:89:1 | { ... } |
+| Test.kt:84:7:84:7 | var ...; | Test.kt:83:2:88:2 | try ... |
+| Test.kt:84:7:84:7 | var ...; | Test.kt:83:6:86:2 | { ... } |
 | Test.kt:86:34:88:2 | { ... } | Test.kt:86:4:88:2 | catch (...) |
 | Test.kt:87:3:87:10 | return ... | Test.kt:86:4:88:2 | catch (...) |
 | Test.kt:87:3:87:10 | return ... | Test.kt:86:34:88:2 | { ... } |
 | Test.kt:92:2:97:2 | try ... | Test.kt:91:22:98:1 | { ... } |
 | Test.kt:92:6:95:2 | { ... } | Test.kt:91:22:98:1 | { ... } |
 | Test.kt:92:6:95:2 | { ... } | Test.kt:92:2:97:2 | try ... |
-| Test.kt:93:3:93:13 | var ...; | Test.kt:91:22:98:1 | { ... } |
-| Test.kt:93:3:93:13 | var ...; | Test.kt:92:2:97:2 | try ... |
-| Test.kt:93:3:93:13 | var ...; | Test.kt:92:6:95:2 | { ... } |
+| Test.kt:93:7:93:7 | var ...; | Test.kt:91:22:98:1 | { ... } |
+| Test.kt:93:7:93:7 | var ...; | Test.kt:92:2:97:2 | try ... |
+| Test.kt:93:7:93:7 | var ...; | Test.kt:92:6:95:2 | { ... } |
 | Test.kt:95:36:97:2 | { ... } | Test.kt:95:4:97:2 | catch (...) |
 | Test.kt:96:3:96:10 | return ... | Test.kt:95:4:97:2 | catch (...) |
 | Test.kt:96:3:96:10 | return ... | Test.kt:95:36:97:2 | { ... } |
+| Test.kt:101:5:103:5 | ... -> ... | Test.kt:100:25:110:1 | { ... } |
+| Test.kt:101:5:103:5 | ... -> ... | Test.kt:101:5:103:5 | <Expr>; |
 | Test.kt:101:5:103:5 | <Expr>; | Test.kt:100:25:110:1 | { ... } |
-| Test.kt:101:9:103:5 | ... -> ... | Test.kt:100:25:110:1 | { ... } |
-| Test.kt:101:9:103:5 | ... -> ... | Test.kt:101:5:103:5 | <Expr>; |
 | Test.kt:102:9:102:25 | throw ... | Test.kt:101:33:103:5 | { ... } |
 | Test.kt:105:9:107:5 | ... -> ... | Test.kt:105:5:109:5 | <Expr>; |
 | Test.kt:106:9:106:29 | <Expr>; | Test.kt:105:20:107:5 | { ... } |
 | Test.kt:108:9:108:29 | <Expr>; | Test.kt:107:27:109:5 | { ... } |
+| Test.kt:113:5:115:5 | ... -> ... | Test.kt:112:32:116:1 | { ... } |
+| Test.kt:113:5:115:5 | ... -> ... | Test.kt:113:5:115:5 | <Expr>; |
 | Test.kt:113:5:115:5 | <Expr>; | Test.kt:112:32:116:1 | { ... } |
-| Test.kt:113:9:115:5 | ... -> ... | Test.kt:112:32:116:1 | { ... } |
-| Test.kt:113:9:115:5 | ... -> ... | Test.kt:113:5:115:5 | <Expr>; |
 | Test.kt:119:2:123:12 | <Expr>; | Test.kt:118:37:124:1 | { ... } |
 | Test.kt:120:3:123:10 | ... -> ... | Test.kt:118:37:124:1 | { ... } |
 | Test.kt:120:3:123:10 | ... -> ... | Test.kt:119:2:123:12 | <Expr>; |
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/strictPostDominance.ql b/java/ql/test-kotlin2/library-tests/controlflow/basic/strictPostDominance.ql
index 9948718fc83b1..99268a03c4be8 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/strictPostDominance.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/strictPostDominance.ql
@@ -2,5 +2,5 @@ import default
 import semmle.code.java.controlflow.Dominance
 
 from Stmt pre, Stmt post
-where strictlyPostDominates(post, pre)
+where strictlyPostDominates(post.getControlFlowNode(), pre.getControlFlowNode())
 select post, pre
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominanceBad.ql b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominanceBad.ql
index 26d33d9d07bd0..41b23313ec8e4 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominanceBad.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominanceBad.ql
@@ -4,6 +4,6 @@ import semmle.code.java.controlflow.Dominance
 from IfStmt i, BlockStmt b
 where
   b = i.getThen() and
-  dominates(i.getThen(), b) and
-  dominates(i.getElse(), b)
+  dominates(i.getThen().getControlFlowNode(), b.getControlFlowNode()) and
+  dominates(i.getElse().getControlFlowNode(), b.getControlFlowNode())
 select i, b
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominanceWrong.ql b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominanceWrong.ql
index 298e0752ee416..5ee23224d5f93 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominanceWrong.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominanceWrong.ql
@@ -17,5 +17,5 @@ predicate dominanceCounterExample(ControlFlowNode entry, ControlFlowNode dom, Co
 from Callable c, ControlFlowNode dom, ControlFlowNode node
 where
   (strictlyDominates(dom, node) or bbStrictlyDominates(dom, node)) and
-  dominanceCounterExample(c.getBody(), dom, node)
+  dominanceCounterExample(c.getBody().getControlFlowNode(), dom, node)
 select c, dom, node
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominatedByStart.ql b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominatedByStart.ql
index b5bdf68899677..9a0d1b0c4bba2 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominatedByStart.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominatedByStart.ql
@@ -3,14 +3,14 @@ import default
 import semmle.code.java.controlflow.Dominance
 
 ControlFlowNode reachableIn(Method func) {
-  result = func.getBody() or
+  result = func.getBody().getControlFlowNode() or
   result = reachableIn(func).getASuccessor()
 }
 
 from Method func, ControlFlowNode entry, ControlFlowNode node
 where
-  func.getBody() = entry and
+  func.getBody().getControlFlowNode() = entry and
   reachableIn(func) = node and
   entry != node and
-  not strictlyDominates(func.getBody(), node)
+  not strictlyDominates(func.getBody().getControlFlowNode(), node)
 select func, node
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected
index 72d9d6bbbde1d..3eae234518683 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected
@@ -1,157 +1,157 @@
-| Test.kt:2:43:79:2 | { ... } | Test.kt:3:9:3:18 | var ...; |
-| Test.kt:3:9:3:18 | var ...; | Test.kt:3:17:3:18 | px |
-| Test.kt:3:9:3:18 | x | Test.kt:4:9:4:18 | var ...; |
-| Test.kt:3:17:3:18 | px | Test.kt:3:9:3:18 | x |
-| Test.kt:4:9:4:18 | var ...; | Test.kt:4:17:4:18 | pw |
-| Test.kt:4:9:4:18 | w | Test.kt:5:9:5:18 | var ...; |
-| Test.kt:4:17:4:18 | pw | Test.kt:4:9:4:18 | w |
-| Test.kt:5:9:5:18 | var ...; | Test.kt:5:17:5:18 | pz |
-| Test.kt:5:9:5:18 | z | Test.kt:7:3:7:12 | var ...; |
-| Test.kt:5:17:5:18 | pz | Test.kt:5:9:5:18 | z |
-| Test.kt:7:3:7:12 | j | Test.kt:8:3:8:18 | var ...; |
-| Test.kt:7:3:7:12 | var ...; | Test.kt:7:3:7:12 | j |
-| Test.kt:8:3:8:18 | var ...; | Test.kt:8:17:8:18 | 50 |
-| Test.kt:8:3:8:18 | y | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:8:17:8:18 | 50 | Test.kt:8:3:8:18 | y |
+| Test.kt:2:43:79:2 | { ... } | Test.kt:3:13:3:13 | var ...; |
+| Test.kt:3:13:3:13 | var ...; | Test.kt:3:17:3:18 | px |
+| Test.kt:3:13:3:13 | x | Test.kt:4:13:4:13 | var ...; |
+| Test.kt:3:17:3:18 | px | Test.kt:3:13:3:13 | x |
+| Test.kt:4:13:4:13 | var ...; | Test.kt:4:17:4:18 | pw |
+| Test.kt:4:13:4:13 | w | Test.kt:5:13:5:13 | var ...; |
+| Test.kt:4:17:4:18 | pw | Test.kt:4:13:4:13 | w |
+| Test.kt:5:13:5:13 | var ...; | Test.kt:5:17:5:18 | pz |
+| Test.kt:5:13:5:13 | z | Test.kt:7:7:7:7 | var ...; |
+| Test.kt:5:17:5:18 | pz | Test.kt:5:13:5:13 | z |
+| Test.kt:7:7:7:7 | j | Test.kt:8:7:8:7 | var ...; |
+| Test.kt:7:7:7:7 | var ...; | Test.kt:7:7:7:7 | j |
+| Test.kt:8:7:8:7 | var ...; | Test.kt:8:17:8:18 | 50 |
+| Test.kt:8:7:8:7 | y | Test.kt:11:3:16:3 | <Expr>; |
+| Test.kt:8:17:8:18 | 50 | Test.kt:8:7:8:7 | y |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:11:3:16:3 | true |
+| Test.kt:11:3:16:3 | ... -> ... | Test.kt:11:7:11:7 | x |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:11:3:16:3 | when ... |
-| Test.kt:11:3:16:3 | when ... | Test.kt:11:7:14:3 | ... -> ... |
+| Test.kt:11:3:16:3 | true | Test.kt:14:10:16:3 | { ... } |
+| Test.kt:11:3:16:3 | when ... | Test.kt:11:3:16:3 | ... -> ... |
 | Test.kt:11:7:11:7 | x | Test.kt:11:11:11:11 | 0 |
+| Test.kt:11:7:11:11 | ... > ... | Test.kt:11:3:16:3 | ... -> ... |
 | Test.kt:11:7:11:11 | ... > ... | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:11:7:11:11 | ... > ... | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:11:7:11:11 | ... > ... | Test.kt:18:3:18:20 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:11:7:11:7 | x |
+| Test.kt:11:7:11:11 | ... > ... | Test.kt:18:3:18:3 | <Expr>; |
 | Test.kt:11:11:11:11 | 0 | Test.kt:11:7:11:11 | ... > ... |
-| Test.kt:11:14:14:3 | { ... } | Test.kt:12:4:12:9 | <Expr>; |
-| Test.kt:12:4:12:9 | ...=... | Test.kt:13:4:13:9 | <Expr>; |
-| Test.kt:12:4:12:9 | <Expr>; | Test.kt:12:8:12:9 | 20 |
+| Test.kt:11:14:14:3 | { ... } | Test.kt:12:4:12:4 | <Expr>; |
+| Test.kt:12:4:12:4 | <Expr>; | Test.kt:12:8:12:9 | 20 |
+| Test.kt:12:4:12:9 | ...=... | Test.kt:13:4:13:4 | <Expr>; |
 | Test.kt:12:8:12:9 | 20 | Test.kt:12:4:12:9 | ...=... |
-| Test.kt:13:4:13:9 | <Expr>; | Test.kt:13:8:13:9 | 10 |
+| Test.kt:13:4:13:4 | <Expr>; | Test.kt:13:8:13:9 | 10 |
 | Test.kt:13:8:13:9 | 10 | Test.kt:13:4:13:9 | ...=... |
-| Test.kt:14:10:16:3 | ... -> ... | Test.kt:14:10:16:3 | true |
-| Test.kt:14:10:16:3 | true | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:14:10:16:3 | { ... } | Test.kt:15:4:15:9 | <Expr>; |
-| Test.kt:15:4:15:9 | <Expr>; | Test.kt:15:8:15:9 | 30 |
+| Test.kt:14:10:16:3 | { ... } | Test.kt:15:4:15:4 | <Expr>; |
+| Test.kt:15:4:15:4 | <Expr>; | Test.kt:15:8:15:9 | 30 |
 | Test.kt:15:8:15:9 | 30 | Test.kt:15:4:15:9 | ...=... |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:18:8:18:8 | x |
 | Test.kt:18:3:18:20 | ...=... | Test.kt:21:3:24:11 | <Expr>; |
-| Test.kt:18:3:18:20 | <Expr>; | Test.kt:18:8:18:8 | x |
 | Test.kt:18:7:18:20 | (...)... | Test.kt:18:3:18:20 | ...=... |
 | Test.kt:18:8:18:8 | x | Test.kt:18:12:18:12 | y |
 | Test.kt:18:8:18:12 | ... + ... | Test.kt:18:7:18:20 | (...)... |
 | Test.kt:18:12:18:12 | y | Test.kt:18:8:18:12 | ... + ... |
+| Test.kt:21:3:24:11 | ... -> ... | Test.kt:21:3:24:11 | true |
+| Test.kt:21:3:24:11 | ... -> ... | Test.kt:21:7:21:7 | x |
 | Test.kt:21:3:24:11 | <Expr>; | Test.kt:21:3:24:11 | when ... |
-| Test.kt:21:3:24:11 | when ... | Test.kt:21:7:22:9 | ... -> ... |
+| Test.kt:21:3:24:11 | true | Test.kt:24:11:24:11 | z |
+| Test.kt:21:3:24:11 | when ... | Test.kt:21:3:24:11 | ... -> ... |
 | Test.kt:21:7:21:7 | x | Test.kt:21:11:21:11 | 0 |
-| Test.kt:21:7:21:11 | ... < ... | Test.kt:2:2:79:2 | test |
-| Test.kt:21:7:21:11 | ... < ... | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:21:7:21:11 | ... < ... | Test.kt:24:4:24:11 | ... -> ... |
-| Test.kt:21:7:22:9 | ... -> ... | Test.kt:21:7:21:7 | x |
+| Test.kt:21:7:21:11 | ... < ... | Test.kt:2:2:79:2 | Exit |
+| Test.kt:21:7:21:11 | ... < ... | Test.kt:21:3:24:11 | ... -> ... |
+| Test.kt:21:7:21:11 | ... < ... | Test.kt:22:4:22:4 | <Expr>; |
 | Test.kt:21:11:21:11 | 0 | Test.kt:21:7:21:11 | ... < ... |
-| Test.kt:22:4:22:9 | ...=... | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:22:8:22:9 | 40 |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:22:8:22:9 | 40 |
+| Test.kt:22:4:22:9 | ...=... | Test.kt:27:3:27:3 | <Expr>; |
 | Test.kt:22:8:22:9 | 40 | Test.kt:22:4:22:9 | ...=... |
-| Test.kt:24:4:24:11 | ... -> ... | Test.kt:24:4:24:11 | true |
-| Test.kt:24:4:24:11 | true | Test.kt:24:11:24:11 | z |
 | Test.kt:24:11:24:11 | z | Test.kt:24:4:24:11 | return ... |
+| Test.kt:27:3:27:3 | <Expr>; | Test.kt:27:7:27:8 | 10 |
 | Test.kt:27:3:27:8 | ...=... | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:27:7:27:8 | 10 |
 | Test.kt:27:7:27:8 | 10 | Test.kt:27:3:27:8 | ...=... |
+| Test.kt:30:3:33:3 | ... -> ... | Test.kt:30:7:30:7 | x |
 | Test.kt:30:3:33:3 | <Expr>; | Test.kt:30:3:33:3 | when ... |
-| Test.kt:30:3:33:3 | when ... | Test.kt:30:7:33:3 | ... -> ... |
+| Test.kt:30:3:33:3 | when ... | Test.kt:30:3:33:3 | ... -> ... |
 | Test.kt:30:7:30:7 | x | Test.kt:30:12:30:12 | 0 |
 | Test.kt:30:7:30:12 | ... (value equals) ... | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:30:7:30:12 | ... (value equals) ... | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:30:7:30:7 | x |
+| Test.kt:30:7:30:12 | ... (value equals) ... | Test.kt:35:3:35:3 | <Expr>; |
 | Test.kt:30:12:30:12 | 0 | Test.kt:30:7:30:12 | ... (value equals) ... |
-| Test.kt:30:15:33:3 | { ... } | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:31:4:31:9 | ...=... | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:31:4:31:9 | <Expr>; | Test.kt:31:8:31:9 | 60 |
+| Test.kt:30:15:33:3 | { ... } | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:31:4:31:4 | <Expr>; | Test.kt:31:8:31:9 | 60 |
+| Test.kt:31:4:31:9 | ...=... | Test.kt:32:4:32:4 | <Expr>; |
 | Test.kt:31:8:31:9 | 60 | Test.kt:31:4:31:9 | ...=... |
-| Test.kt:32:4:32:9 | <Expr>; | Test.kt:32:8:32:9 | 10 |
+| Test.kt:32:4:32:4 | <Expr>; | Test.kt:32:8:32:9 | 10 |
 | Test.kt:32:8:32:9 | 10 | Test.kt:32:4:32:9 | ...=... |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:35:3:35:3 | z |
+| Test.kt:35:3:35:3 | z | Test.kt:35:8:35:8 | x |
 | Test.kt:35:3:35:8 | ...+=... | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:35:3:35:8 | z |
-| Test.kt:35:3:35:8 | z | Test.kt:35:8:35:8 | x |
 | Test.kt:35:8:35:8 | x | Test.kt:35:3:35:8 | ...+=... |
 | Test.kt:38:3:41:3 | while (...) | Test.kt:38:10:38:10 | x |
 | Test.kt:38:10:38:10 | x | Test.kt:38:14:38:14 | 0 |
 | Test.kt:38:10:38:14 | ... > ... | Test.kt:38:17:41:3 | { ... } |
-| Test.kt:38:10:38:14 | ... > ... | Test.kt:43:3:43:15 | <Expr>; |
+| Test.kt:38:10:38:14 | ... > ... | Test.kt:43:3:43:3 | <Expr>; |
 | Test.kt:38:14:38:14 | 0 | Test.kt:38:10:38:14 | ... > ... |
-| Test.kt:38:17:41:3 | { ... } | Test.kt:39:4:39:9 | <Expr>; |
+| Test.kt:38:17:41:3 | { ... } | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:39:4:39:4 | <Expr>; | Test.kt:39:8:39:9 | 10 |
 | Test.kt:39:4:39:9 | ...=... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:39:4:39:9 | <Expr>; | Test.kt:39:8:39:9 | 10 |
 | Test.kt:39:8:39:9 | 10 | Test.kt:39:4:39:9 | ...=... |
-| Test.kt:40:4:40:4 | x | Test.kt:40:4:40:6 | <unary> |
+| Test.kt:40:4:40:4 | <Expr>; | Test.kt:40:4:40:6 | tmp0 |
+| Test.kt:40:4:40:4 | x | Test.kt:40:4:40:6 | tmp0 |
 | Test.kt:40:4:40:6 | ...=... | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <Stmt> |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <unary> |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <unary> |
+| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | tmp0 |
 | Test.kt:40:4:40:6 | <Stmt> | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:40:4:40:6 | <unary> | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:40:4:40:6 | <unary> | Test.kt:40:4:40:6 | <implicit coercion to unit> |
-| Test.kt:40:4:40:6 | <unary> | Test.kt:40:4:40:6 | dec(...) |
 | Test.kt:40:4:40:6 | dec(...) | Test.kt:40:4:40:6 | ...=... |
+| Test.kt:40:4:40:6 | tmp0 | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:40:4:40:6 | tmp0 | Test.kt:40:4:40:6 | <implicit coercion to unit> |
+| Test.kt:40:4:40:6 | tmp0 | Test.kt:40:4:40:6 | dec(...) |
 | Test.kt:40:4:40:6 | var ...; | Test.kt:40:4:40:4 | x |
 | Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:43:3:43:15 | ...+=... | Test.kt:73:3:73:16 | <Expr>; |
-| Test.kt:43:3:43:15 | <Expr>; | Test.kt:43:3:43:15 | z |
-| Test.kt:43:3:43:15 | z | Test.kt:43:8:43:8 | y |
+| Test.kt:43:3:43:3 | <Expr>; | Test.kt:43:3:43:3 | z |
+| Test.kt:43:3:43:3 | z | Test.kt:43:8:43:8 | y |
+| Test.kt:43:3:43:15 | ...+=... | Test.kt:73:3:73:3 | <Expr>; |
 | Test.kt:43:8:43:8 | y | Test.kt:43:8:43:15 | (...)... |
 | Test.kt:43:8:43:15 | (...)... | Test.kt:43:3:43:15 | ...+=... |
-| Test.kt:73:3:73:16 | ...+=... | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:73:3:73:16 | <Expr>; | Test.kt:73:3:73:16 | z |
-| Test.kt:73:3:73:16 | z | Test.kt:73:8:73:8 | x |
+| Test.kt:73:3:73:3 | <Expr>; | Test.kt:73:3:73:3 | z |
+| Test.kt:73:3:73:3 | z | Test.kt:73:8:73:8 | x |
+| Test.kt:73:3:73:16 | ...+=... | Test.kt:77:3:77:3 | <Expr>; |
 | Test.kt:73:8:73:8 | x | Test.kt:73:12:73:12 | y |
 | Test.kt:73:8:73:12 | ... + ... | Test.kt:73:16:73:16 | w |
 | Test.kt:73:8:73:16 | ... + ... | Test.kt:73:3:73:16 | ...+=... |
 | Test.kt:73:12:73:12 | <implicit cast> | Test.kt:73:8:73:12 | ... + ... |
 | Test.kt:73:12:73:12 | y | Test.kt:73:12:73:12 | <implicit cast> |
 | Test.kt:73:16:73:16 | w | Test.kt:73:8:73:16 | ... + ... |
+| Test.kt:77:3:77:3 | <Expr>; | Test.kt:77:7:77:8 | 40 |
 | Test.kt:77:3:77:8 | ...=... | Test.kt:78:10:78:10 | w |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:77:7:77:8 | 40 |
 | Test.kt:77:7:77:8 | 40 | Test.kt:77:3:77:8 | ...=... |
 | Test.kt:78:10:78:10 | w | Test.kt:78:3:78:10 | return ... |
-| Test.kt:81:25:98:2 | { ... } | Test.kt:83:3:83:12 | var ...; |
-| Test.kt:83:3:83:12 | b | Test.kt:84:3:84:12 | var ...; |
-| Test.kt:83:3:83:12 | var ...; | Test.kt:83:3:83:12 | b |
-| Test.kt:84:3:84:12 | c | Test.kt:85:3:85:7 | <Expr>; |
-| Test.kt:84:3:84:12 | var ...; | Test.kt:84:3:84:12 | c |
+| Test.kt:81:25:98:2 | { ... } | Test.kt:83:7:83:7 | var ...; |
+| Test.kt:83:7:83:7 | b | Test.kt:84:7:84:7 | var ...; |
+| Test.kt:83:7:83:7 | var ...; | Test.kt:83:7:83:7 | b |
+| Test.kt:84:7:84:7 | c | Test.kt:85:3:85:3 | <Expr>; |
+| Test.kt:84:7:84:7 | var ...; | Test.kt:84:7:84:7 | c |
+| Test.kt:85:3:85:3 | <Expr>; | Test.kt:85:7:85:7 | 0 |
 | Test.kt:85:3:85:7 | ...=... | Test.kt:86:3:96:3 | while (...) |
-| Test.kt:85:3:85:7 | <Expr>; | Test.kt:85:7:85:7 | 0 |
 | Test.kt:85:7:85:7 | 0 | Test.kt:85:3:85:7 | ...=... |
 | Test.kt:86:3:96:3 | while (...) | Test.kt:86:9:86:12 | true |
 | Test.kt:86:9:86:12 | true | Test.kt:86:15:96:3 | { ... } |
-| Test.kt:86:15:96:3 | { ... } | Test.kt:87:4:87:9 | <Expr>; |
+| Test.kt:86:15:96:3 | { ... } | Test.kt:87:4:87:4 | <Expr>; |
+| Test.kt:87:4:87:4 | <Expr>; | Test.kt:87:8:87:9 | 10 |
 | Test.kt:87:4:87:9 | ...=... | Test.kt:88:4:91:4 | <Expr>; |
-| Test.kt:87:4:87:9 | <Expr>; | Test.kt:87:8:87:9 | 10 |
 | Test.kt:87:8:87:9 | 10 | Test.kt:87:4:87:9 | ...=... |
+| Test.kt:88:4:91:4 | ... -> ... | Test.kt:88:8:88:8 | a |
 | Test.kt:88:4:91:4 | <Expr>; | Test.kt:88:4:91:4 | when ... |
-| Test.kt:88:4:91:4 | when ... | Test.kt:88:8:91:4 | ... -> ... |
+| Test.kt:88:4:91:4 | when ... | Test.kt:88:4:91:4 | ... -> ... |
 | Test.kt:88:8:88:8 | a | Test.kt:88:12:88:14 | 100 |
 | Test.kt:88:8:88:14 | ... > ... | Test.kt:88:17:91:4 | { ... } |
 | Test.kt:88:8:88:14 | ... > ... | Test.kt:92:4:93:9 | <Expr>; |
-| Test.kt:88:8:91:4 | ... -> ... | Test.kt:88:8:88:8 | a |
 | Test.kt:88:12:88:14 | 100 | Test.kt:88:8:88:14 | ... > ... |
-| Test.kt:88:17:91:4 | { ... } | Test.kt:89:5:89:10 | <Expr>; |
-| Test.kt:89:5:89:10 | ...=... | Test.kt:90:5:90:9 | <Expr>; |
-| Test.kt:89:5:89:10 | <Expr>; | Test.kt:89:9:89:10 | 10 |
+| Test.kt:88:17:91:4 | { ... } | Test.kt:89:5:89:5 | <Expr>; |
+| Test.kt:89:5:89:5 | <Expr>; | Test.kt:89:9:89:10 | 10 |
+| Test.kt:89:5:89:10 | ...=... | Test.kt:90:5:90:5 | <Expr>; |
 | Test.kt:89:9:89:10 | 10 | Test.kt:89:5:89:10 | ...=... |
-| Test.kt:90:5:90:9 | <Expr>; | Test.kt:90:9:90:9 | c |
+| Test.kt:90:5:90:5 | <Expr>; | Test.kt:90:9:90:9 | c |
 | Test.kt:90:9:90:9 | c | Test.kt:90:5:90:9 | ...=... |
+| Test.kt:92:4:93:9 | ... -> ... | Test.kt:92:8:92:8 | a |
 | Test.kt:92:4:93:9 | <Expr>; | Test.kt:92:4:93:9 | when ... |
-| Test.kt:92:4:93:9 | when ... | Test.kt:92:8:93:9 | ... -> ... |
+| Test.kt:92:4:93:9 | when ... | Test.kt:92:4:93:9 | ... -> ... |
 | Test.kt:92:8:92:8 | a | Test.kt:92:13:92:14 | 10 |
-| Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:81:2:98:2 | test2 |
+| Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:81:2:98:2 | Exit |
 | Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:93:5:93:9 | break |
 | Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:94:4:95:12 | <Expr>; |
-| Test.kt:92:8:93:9 | ... -> ... | Test.kt:92:8:92:8 | a |
 | Test.kt:92:13:92:14 | 10 | Test.kt:92:8:92:14 | ... (value equals) ... |
 | Test.kt:93:5:93:9 | break | Test.kt:97:10:97:10 | b |
+| Test.kt:94:4:95:12 | ... -> ... | Test.kt:94:8:94:8 | a |
 | Test.kt:94:4:95:12 | <Expr>; | Test.kt:94:4:95:12 | when ... |
-| Test.kt:94:4:95:12 | when ... | Test.kt:94:8:95:12 | ... -> ... |
+| Test.kt:94:4:95:12 | when ... | Test.kt:94:4:95:12 | ... -> ... |
 | Test.kt:94:8:94:8 | a | Test.kt:94:13:94:14 | 20 |
 | Test.kt:94:8:94:14 | ... (value equals) ... | Test.kt:95:12:95:12 | c |
-| Test.kt:94:8:95:12 | ... -> ... | Test.kt:94:8:94:8 | a |
 | Test.kt:94:13:94:14 | 20 | Test.kt:94:8:94:14 | ... (value equals) ... |
 | Test.kt:95:12:95:12 | c | Test.kt:95:5:95:12 | return ... |
 | Test.kt:97:10:97:10 | b | Test.kt:97:3:97:10 | return ... |
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominatorExists.ql b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominatorExists.ql
index 34469a686b14b..220e4f275d54f 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominatorExists.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominatorExists.ql
@@ -4,13 +4,13 @@ import semmle.code.java.controlflow.Dominance
 
 /** transitive dominance */
 ControlFlowNode reachableIn(Method func) {
-  result = func.getBody() or
+  result = func.getBody().getControlFlowNode() or
   result = reachableIn(func).getASuccessor()
 }
 
 from Method func, ControlFlowNode node
 where
   node = reachableIn(func) and
-  node != func.getBody() and
+  node != func.getBody().getControlFlowNode() and
   not iDominates(_, node)
 select func, node
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/paths/paths.ql b/java/ql/test-kotlin2/library-tests/controlflow/paths/paths.ql
index 389c46a48f597..33e51acef784f 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/paths/paths.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/paths/paths.ql
@@ -5,7 +5,7 @@ class PathTestConf extends ActionConfiguration {
   PathTestConf() { this = "PathTestConf" }
 
   override predicate isAction(ControlFlowNode node) {
-    node.(MethodCall).getMethod().hasName("action")
+    node.asExpr().(MethodCall).getMethod().hasName("action")
   }
 }