diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
index 95e3f2463c1..80fc938861f 100644
--- a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
+++ b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -3203,6 +3203,23 @@ open class KotlinFileExtractor(
         else e.endOffset
     }
 
+    /**
+     * Returns the location for the `ExprStmt` wrapper synthesised around a statement-position
+     * expression [e].
+     *
+     * The K1 frontend records an assignment's raw end offset at its left-hand side rather than
+     * past its right-hand value, so a bare assignment statement (`z = 4`) yields a zero-width
+     * wrapper location collapsed onto the LHS. K2 spans the whole assignment. Widen the wrapper to
+     * end past the assigned value (matching the inner `AssignExpr` location, which already uses
+     * `e.startOffset .. rhsValue.endOffset`). This is a no-op for non-assignments and under K2,
+     * where the assignment already spans its value, so `correctedEndOffset` returns the raw end.
+     */
+    private fun getExpressionStmtLocation(e: IrExpression): Label<DbLocation> {
+        val correctedEnd = correctedEndOffset(e)
+        return if (correctedEnd != e.endOffset) tw.getLocation(e.startOffset, correctedEnd)
+        else tw.getLocation(e)
+    }
+
     private fun extractVariable(
         v: IrVariable,
         callable: Label<out DbCallable>,
@@ -5703,7 +5720,7 @@ open class KotlinFileExtractor(
         override fun stmt(e: IrExpression, callable: Label<out DbCallable>) = this
 
         override fun expr(e: IrExpression, callable: Label<out DbCallable>) =
-            extractExpressionStmt(tw.getLocation(e), parent, idx, callable).let { id ->
+            extractExpressionStmt(getExpressionStmtLocation(e), parent, idx, callable).let { id ->
                 ExprParent(id, 0, id)
             }
     }
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStmts.expected b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStmts.expected
index 431b1ab32c2..3d1c6c3b6b7 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStmts.expected
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStmts.expected
@@ -44,13 +44,13 @@
 | Test.kt:4:2:79:2 | Normal Exit | 1 | Test.kt:4:2:79:2 | Exit |
 | Test.kt:11:3:16:3 | After when ... | 0 | Test.kt:11:3:16:3 | After when ... |
 | Test.kt:11:3:16:3 | After when ... | 1 | Test.kt:11:3:16:3 | After <Expr>; |
-| Test.kt:11:3:16:3 | After when ... | 2 | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:11:3:16:3 | After when ... | 2 | Test.kt:18:3:18:7 | <Expr>; |
 | Test.kt:11:3:16:3 | After when ... | 3 | Test.kt:18:3:18:7 | Before ...=... |
 | Test.kt:11:3:16:3 | After when ... | 4 | Test.kt:18:3:18:3 | z |
 | Test.kt:11:3:16:3 | After when ... | 5 | Test.kt:18:7:18:7 | 0 |
 | Test.kt:11:3:16:3 | After when ... | 6 | Test.kt:18:3:18:7 | ...=... |
 | Test.kt:11:3:16:3 | After when ... | 7 | Test.kt:18:3:18:7 | After ...=... |
-| Test.kt:11:3:16:3 | After when ... | 8 | Test.kt:18:3:18:3 | After <Expr>; |
+| Test.kt:11:3:16:3 | After when ... | 8 | Test.kt:18:3:18:7 | After <Expr>; |
 | Test.kt:11:3:16:3 | After when ... | 9 | Test.kt:21:3:24:9 | <Expr>; |
 | Test.kt:11:3:16:3 | After when ... | 10 | Test.kt:21:3:24:9 | when ... |
 | Test.kt:11:3:16:3 | After when ... | 11 | Test.kt:21:6:22:9 | ... -> ... |
@@ -63,30 +63,30 @@
 | Test.kt:11:7:11:11 | After ... > ... [false] | 2 | Test.kt:11:3:16:3 | true |
 | Test.kt:11:7:11:11 | After ... > ... [false] | 3 | Test.kt:11:3:16:3 | After true [true] |
 | Test.kt:11:7:11:11 | After ... > ... [false] | 4 | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:11:7:11:11 | After ... > ... [false] | 5 | Test.kt:15:4:15:4 | <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 5 | Test.kt:15:4:15:9 | <Expr>; |
 | Test.kt:11:7:11:11 | After ... > ... [false] | 6 | Test.kt:15:4:15:9 | Before ...=... |
 | Test.kt:11:7:11:11 | After ... > ... [false] | 7 | Test.kt:15:4:15:4 | y |
 | Test.kt:11:7:11:11 | After ... > ... [false] | 8 | Test.kt:15:8:15:9 | 30 |
 | Test.kt:11:7:11:11 | After ... > ... [false] | 9 | Test.kt:15:4:15:9 | ...=... |
 | Test.kt:11:7:11:11 | After ... > ... [false] | 10 | Test.kt:15:4:15:9 | After ...=... |
-| Test.kt:11:7:11:11 | After ... > ... [false] | 11 | Test.kt:15:4:15:4 | After <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 11 | Test.kt:15:4:15:9 | After <Expr>; |
 | Test.kt:11:7:11:11 | After ... > ... [false] | 12 | Test.kt:14:10:16:3 | After { ... } |
 | Test.kt:11:7:11:11 | After ... > ... [true] | 0 | Test.kt:11:7:11:11 | After ... > ... [true] |
 | Test.kt:11:7:11:11 | After ... > ... [true] | 1 | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:11:7:11:11 | After ... > ... [true] | 2 | Test.kt:12:4:12:4 | <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 2 | Test.kt:12:4:12:9 | <Expr>; |
 | Test.kt:11:7:11:11 | After ... > ... [true] | 3 | Test.kt:12:4:12:9 | Before ...=... |
 | Test.kt:11:7:11:11 | After ... > ... [true] | 4 | Test.kt:12:4:12:4 | y |
 | Test.kt:11:7:11:11 | After ... > ... [true] | 5 | Test.kt:12:8:12:9 | 20 |
 | Test.kt:11:7:11:11 | After ... > ... [true] | 6 | Test.kt:12:4:12:9 | ...=... |
 | Test.kt:11:7:11:11 | After ... > ... [true] | 7 | Test.kt:12:4:12:9 | After ...=... |
-| Test.kt:11:7:11:11 | After ... > ... [true] | 8 | Test.kt:12:4:12:4 | After <Expr>; |
-| Test.kt:11:7:11:11 | After ... > ... [true] | 9 | Test.kt:13:4:13:4 | <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 8 | Test.kt:12:4:12:9 | After <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 9 | Test.kt:13:4:13:9 | <Expr>; |
 | Test.kt:11:7:11:11 | After ... > ... [true] | 10 | Test.kt:13:4:13:9 | Before ...=... |
 | Test.kt:11:7:11:11 | After ... > ... [true] | 11 | Test.kt:13:4:13:4 | z |
 | Test.kt:11:7:11:11 | After ... > ... [true] | 12 | Test.kt:13:8:13:9 | 10 |
 | Test.kt:11:7:11:11 | After ... > ... [true] | 13 | Test.kt:13:4:13:9 | ...=... |
 | Test.kt:11:7:11:11 | After ... > ... [true] | 14 | Test.kt:13:4:13:9 | After ...=... |
-| Test.kt:11:7:11:11 | After ... > ... [true] | 15 | Test.kt:13:4:13:4 | After <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 15 | Test.kt:13:4:13:9 | After <Expr>; |
 | Test.kt:11:7:11:11 | After ... > ... [true] | 16 | Test.kt:11:14:14:3 | After { ... } |
 | Test.kt:21:6:21:10 | After ... < ... [false] | 0 | Test.kt:21:6:21:10 | After ... < ... [false] |
 | Test.kt:21:6:21:10 | After ... < ... [false] | 1 | Test.kt:24:4:24:9 | ... -> ... |
@@ -96,22 +96,22 @@
 | Test.kt:21:6:21:10 | After ... < ... [false] | 5 | Test.kt:24:4:24:9 | INSTANCE |
 | Test.kt:21:6:21:10 | After ... < ... [false] | 6 | Test.kt:24:4:24:9 | return ... |
 | Test.kt:21:6:21:10 | After ... < ... [true] | 0 | Test.kt:21:6:21:10 | After ... < ... [true] |
-| Test.kt:21:6:21:10 | After ... < ... [true] | 1 | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 1 | Test.kt:22:4:22:9 | <Expr>; |
 | Test.kt:21:6:21:10 | After ... < ... [true] | 2 | Test.kt:22:4:22:9 | Before ...=... |
 | Test.kt:21:6:21:10 | After ... < ... [true] | 3 | Test.kt:22:4:22:4 | y |
 | Test.kt:21:6:21:10 | After ... < ... [true] | 4 | Test.kt:22:8:22:9 | 40 |
 | Test.kt:21:6:21:10 | After ... < ... [true] | 5 | Test.kt:22:4:22:9 | ...=... |
 | Test.kt:21:6:21:10 | After ... < ... [true] | 6 | Test.kt:22:4:22:9 | After ...=... |
-| Test.kt:21:6:21:10 | After ... < ... [true] | 7 | Test.kt:22:4:22:4 | After <Expr>; |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 7 | Test.kt:22:4:22:9 | After <Expr>; |
 | Test.kt:21:6:21:10 | After ... < ... [true] | 8 | Test.kt:21:3:24:9 | After when ... |
 | Test.kt:21:6:21:10 | After ... < ... [true] | 9 | Test.kt:21:3:24:9 | After <Expr>; |
-| Test.kt:21:6:21:10 | After ... < ... [true] | 10 | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 10 | Test.kt:27:3:27:8 | <Expr>; |
 | Test.kt:21:6:21:10 | After ... < ... [true] | 11 | Test.kt:27:3:27:8 | Before ...=... |
 | Test.kt:21:6:21:10 | After ... < ... [true] | 12 | Test.kt:27:3:27:3 | z |
 | Test.kt:21:6:21:10 | After ... < ... [true] | 13 | Test.kt:27:7:27:8 | 10 |
 | Test.kt:21:6:21:10 | After ... < ... [true] | 14 | Test.kt:27:3:27:8 | ...=... |
 | Test.kt:21:6:21:10 | After ... < ... [true] | 15 | Test.kt:27:3:27:8 | After ...=... |
-| Test.kt:21:6:21:10 | After ... < ... [true] | 16 | Test.kt:27:3:27:3 | After <Expr>; |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 16 | Test.kt:27:3:27:8 | After <Expr>; |
 | Test.kt:21:6:21:10 | After ... < ... [true] | 17 | Test.kt:30:3:33:3 | <Expr>; |
 | Test.kt:21:6:21:10 | After ... < ... [true] | 18 | Test.kt:30:3:33:3 | when ... |
 | Test.kt:21:6:21:10 | After ... < ... [true] | 19 | Test.kt:30:7:33:3 | ... -> ... |
@@ -121,31 +121,31 @@
 | Test.kt:21:6:21:10 | After ... < ... [true] | 23 | Test.kt:30:7:30:12 | ... (value equals) ... |
 | Test.kt:30:3:33:3 | After when ... | 0 | Test.kt:30:3:33:3 | After when ... |
 | Test.kt:30:3:33:3 | After when ... | 1 | Test.kt:30:3:33:3 | After <Expr>; |
-| Test.kt:30:3:33:3 | After when ... | 2 | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:30:3:33:3 | After when ... | 2 | Test.kt:35:3:35:8 | <Expr>; |
 | Test.kt:30:3:33:3 | After when ... | 3 | Test.kt:35:3:35:8 | Before ...=... |
 | Test.kt:30:3:33:3 | After when ... | 4 | Test.kt:35:3:35:3 | z |
 | Test.kt:30:3:33:3 | After when ... | 5 | Test.kt:35:7:35:8 | 20 |
 | Test.kt:30:3:33:3 | After when ... | 6 | Test.kt:35:3:35:8 | ...=... |
 | Test.kt:30:3:33:3 | After when ... | 7 | Test.kt:35:3:35:8 | After ...=... |
-| Test.kt:30:3:33:3 | After when ... | 8 | Test.kt:35:3:35:3 | After <Expr>; |
+| Test.kt:30:3:33:3 | After when ... | 8 | Test.kt:35:3:35:8 | After <Expr>; |
 | Test.kt:30:3:33:3 | After when ... | 9 | Test.kt:38:3:41:3 | while (...) |
 | Test.kt:30:7:30:12 | After ... (value equals) ... [false] | 0 | Test.kt:30:7:30:12 | After ... (value equals) ... [false] |
 | Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 0 | Test.kt:30:7:30:12 | After ... (value equals) ... [true] |
 | Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 1 | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 2 | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 2 | Test.kt:31:4:31:9 | <Expr>; |
 | Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 3 | Test.kt:31:4:31:9 | Before ...=... |
 | Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 4 | Test.kt:31:4:31:4 | y |
 | Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 5 | Test.kt:31:8:31:9 | 60 |
 | Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 6 | Test.kt:31:4:31:9 | ...=... |
 | Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 7 | Test.kt:31:4:31:9 | After ...=... |
-| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 8 | Test.kt:31:4:31:4 | After <Expr>; |
-| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 9 | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 8 | Test.kt:31:4:31:9 | After <Expr>; |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 9 | Test.kt:32:4:32:9 | <Expr>; |
 | Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 10 | Test.kt:32:4:32:9 | Before ...=... |
 | Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 11 | Test.kt:32:4:32:4 | z |
 | Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 12 | Test.kt:32:8:32:9 | 10 |
 | Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 13 | Test.kt:32:4:32:9 | ...=... |
 | Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 14 | Test.kt:32:4:32:9 | After ...=... |
-| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 15 | Test.kt:32:4:32:4 | After <Expr>; |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 15 | Test.kt:32:4:32:9 | After <Expr>; |
 | Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 16 | Test.kt:30:15:33:3 | After { ... } |
 | Test.kt:38:3:41:3 | [LoopHeader] while (...) | 0 | Test.kt:38:3:41:3 | [LoopHeader] while (...) |
 | Test.kt:38:3:41:3 | [LoopHeader] while (...) | 1 | Test.kt:38:9:38:13 | Before ... > ... |
@@ -154,39 +154,39 @@
 | Test.kt:38:3:41:3 | [LoopHeader] while (...) | 4 | Test.kt:38:9:38:13 | ... > ... |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 0 | Test.kt:38:9:38:13 | After ... > ... [false] |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 1 | Test.kt:38:3:41:3 | After while (...) |
-| Test.kt:38:9:38:13 | After ... > ... [false] | 2 | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 2 | Test.kt:43:3:43:8 | <Expr>; |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 3 | Test.kt:43:3:43:8 | Before ...=... |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 4 | Test.kt:43:3:43:3 | z |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 5 | Test.kt:43:7:43:8 | 30 |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 6 | Test.kt:43:3:43:8 | ...=... |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 7 | Test.kt:43:3:43:8 | After ...=... |
-| Test.kt:38:9:38:13 | After ... > ... [false] | 8 | Test.kt:43:3:43:3 | After <Expr>; |
-| Test.kt:38:9:38:13 | After ... > ... [false] | 9 | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 8 | Test.kt:43:3:43:8 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 9 | Test.kt:73:3:73:8 | <Expr>; |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 10 | Test.kt:73:3:73:8 | Before ...=... |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 11 | Test.kt:73:3:73:3 | z |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 12 | Test.kt:73:7:73:8 | 50 |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 13 | Test.kt:73:3:73:8 | ...=... |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 14 | Test.kt:73:3:73:8 | After ...=... |
-| Test.kt:38:9:38:13 | After ... > ... [false] | 15 | Test.kt:73:3:73:3 | After <Expr>; |
-| Test.kt:38:9:38:13 | After ... > ... [false] | 16 | Test.kt:77:3:77:3 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 15 | Test.kt:73:3:73:8 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 16 | Test.kt:77:3:77:8 | <Expr>; |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 17 | Test.kt:77:3:77:8 | Before ...=... |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 18 | Test.kt:77:3:77:3 | w |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 19 | Test.kt:77:7:77:8 | 40 |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 20 | Test.kt:77:3:77:8 | ...=... |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 21 | Test.kt:77:3:77:8 | After ...=... |
-| Test.kt:38:9:38:13 | After ... > ... [false] | 22 | Test.kt:77:3:77:3 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 22 | Test.kt:77:3:77:8 | After <Expr>; |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 23 | Test.kt:78:3:78:8 | Before return ... |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 24 | Test.kt:78:3:78:8 | INSTANCE |
 | Test.kt:38:9:38:13 | After ... > ... [false] | 25 | Test.kt:78:3:78:8 | return ... |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 0 | Test.kt:38:9:38:13 | After ... > ... [true] |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 1 | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:38:9:38:13 | After ... > ... [true] | 2 | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 2 | Test.kt:39:4:39:9 | <Expr>; |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 3 | Test.kt:39:4:39:9 | Before ...=... |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 4 | Test.kt:39:4:39:4 | y |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 5 | Test.kt:39:8:39:9 | 10 |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 6 | Test.kt:39:4:39:9 | ...=... |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 7 | Test.kt:39:4:39:9 | After ...=... |
-| Test.kt:38:9:38:13 | After ... > ... [true] | 8 | Test.kt:39:4:39:4 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 8 | Test.kt:39:4:39:9 | After <Expr>; |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 9 | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 10 | Test.kt:40:4:40:6 | Before <implicit coercion to unit> |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 11 | Test.kt:40:4:40:6 | Before <Stmt> |
@@ -197,7 +197,7 @@
 | Test.kt:38:9:38:13 | After ... > ... [true] | 16 | Test.kt:40:4:40:6 | tmp0 |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 17 | Test.kt:40:4:40:6 | After tmp0 |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 18 | Test.kt:40:4:40:6 | After var ...; |
-| Test.kt:38:9:38:13 | After ... > ... [true] | 19 | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 19 | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 20 | Test.kt:40:4:40:6 | Before ...=... |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 21 | Test.kt:40:4:40:4 | x |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 22 | Test.kt:40:4:40:6 | Before dec(...) |
@@ -206,7 +206,7 @@
 | Test.kt:38:9:38:13 | After ... > ... [true] | 25 | Test.kt:40:4:40:6 | After dec(...) |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 26 | Test.kt:40:4:40:6 | ...=... |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 27 | Test.kt:40:4:40:6 | After ...=... |
-| Test.kt:38:9:38:13 | After ... > ... [true] | 28 | Test.kt:40:4:40:4 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 28 | Test.kt:40:4:40:6 | After <Expr>; |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 29 | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 30 | Test.kt:40:4:40:6 | tmp0 |
 | Test.kt:38:9:38:13 | After ... > ... [true] | 31 | Test.kt:40:4:40:6 | After <Expr>; |
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStrictDominance.expected b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStrictDominance.expected
index 8eab60f8df4..6656577593c 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStrictDominance.expected
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStrictDominance.expected
@@ -1,32 +1,32 @@
 | Test.kt:4:13:79:2 | { ... } | Test.kt:4:2:79:2 | Normal Exit |
 | 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:3 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:22:4:22:4 | <Expr>; |
+| 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:30:15:33:3 | { ... } |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:35:3:35:8 | <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:3 | <Expr>; |
-| Test.kt:18:3:18:3 | <Expr>; | Test.kt:4:2:79:2 | Normal Exit |
-| 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 | ... -> ... |
-| 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:4:13:79:2 | { ... } | Test.kt:43:3:43:8 | <Expr>; |
+| Test.kt:18:3:18:7 | <Expr>; | Test.kt:4:2:79:2 | Normal Exit |
+| 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:38:9:38:9 | x | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:38:9:38:9 | x | Test.kt:43:3:43:3 | <Expr>; |
+| 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 | Exceptional Exit |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:82:1:89:1 | Exit |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:82:1:89:1 | Normal Exit |
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbSuccessor.expected b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbSuccessor.expected
index b19a46e7ec4..4d80d267d97 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbSuccessor.expected
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbSuccessor.expected
@@ -1,19 +1,19 @@
 | 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:3 | <Expr>; |
-| Test.kt:14:10:16:3 | ... -> ... | Test.kt:18:3:18:3 | <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 | ... -> ... |
-| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:7:30:12 | After ... (value equals) ... [false] |
-| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:15:33: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:7:30:12 | After ... (value equals) ... [false] |
+| Test.kt:22:4:22:9 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
 | Test.kt:24:4:24:9 | ... -> ... | Test.kt:4:2:79:2 | Normal Exit |
-| Test.kt:30:7:30:12 | After ... (value equals) ... [false] | 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:30:7:30:12 | After ... (value equals) ... [false] | Test.kt:35:3:35:8 | <Expr>; |
+| 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:38:9:38:9 | x | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:38:9:38:9 | x | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:38:9:38:9 | x | Test.kt:43:3:43:8 | <Expr>; |
 | Test.kt:38:16:41:3 | { ... } | Test.kt:38:9:38:9 | x |
-| Test.kt:43:3:43:3 | <Expr>; | Test.kt:4:2:79:2 | Normal Exit |
+| Test.kt:43:3:43:8 | <Expr>; | Test.kt:4:2:79:2 | Normal Exit |
 | Test.kt:82:1:89:1 | Exceptional Exit | Test.kt:82:1:89:1 | Exit |
 | Test.kt:82:1:89:1 | Normal Exit | Test.kt:82:1:89:1 | Exit |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:84:3:84:18 | x |
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/basic/getASuccessor.expected b/java/ql/test-kotlin1/library-tests/controlflow/basic/getASuccessor.expected
index 60566f33924..f82608c7bd8 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/getASuccessor.expected
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/getASuccessor.expected
@@ -27,99 +27,99 @@
 | 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:4 | <Expr>; | ExprStmt |
-| Test.kt:12:4:12:4 | <Expr>; | ExprStmt | Test.kt:12:4:12:4 | y | VarAccess |
+| Test.kt:11:14:14:3 | { ... } | BlockStmt | Test.kt:12:4:12:9 | <Expr>; | ExprStmt |
 | Test.kt:12:4:12:4 | y | VarAccess | 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:4:12:9 | ...=... | AssignExpr | Test.kt:13:4:13:9 | <Expr>; | ExprStmt |
+| Test.kt:12:4:12:9 | <Expr>; | ExprStmt | Test.kt:12:4:12:4 | y | VarAccess |
 | 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:13:4:13:4 | z | VarAccess |
 | Test.kt:13:4:13:4 | z | VarAccess | 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:4:13:9 | ...=... | AssignExpr | Test.kt:18:3:18:7 | <Expr>; | ExprStmt |
+| Test.kt:13:4:13:9 | <Expr>; | ExprStmt | Test.kt:13:4:13:4 | z | VarAccess |
 | Test.kt:13:8:13:9 | 10 | IntegerLiteral | Test.kt:13:4:13:9 | ...=... | AssignExpr |
 | Test.kt:14:10:16:3 | ... -> ... | WhenBranch | Test.kt:11:3:16:3 | true | BooleanLiteral |
-| 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:4:15:4 | y | VarAccess |
+| Test.kt:14:10:16:3 | { ... } | BlockStmt | Test.kt:15:4:15:9 | <Expr>; | ExprStmt |
 | Test.kt:15:4:15:4 | y | VarAccess | 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:4:15:9 | ...=... | AssignExpr | Test.kt:18:3:18:7 | <Expr>; | ExprStmt |
+| Test.kt:15:4:15:9 | <Expr>; | ExprStmt | Test.kt:15:4:15:4 | y | VarAccess |
 | 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:3:18:3 | z | VarAccess |
 | Test.kt:18:3:18:3 | z | VarAccess | 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:3:18:3 | z | VarAccess |
 | 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:21:3:24:9 | when ... | WhenExpr |
 | 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:6:22: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:4 | <Expr>; | ExprStmt |
+| 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:10:21:10 | 0 | IntegerLiteral | Test.kt:21:6:21:10 | ... < ... | LTExpr |
-| Test.kt:22:4:22:4 | <Expr>; | ExprStmt | Test.kt:22:4:22:4 | y | VarAccess |
 | Test.kt:22:4:22:4 | y | VarAccess | 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:4:22:9 | ...=... | AssignExpr | Test.kt:27:3:27:8 | <Expr>; | ExprStmt |
+| Test.kt:22:4:22:9 | <Expr>; | ExprStmt | Test.kt:22:4:22:4 | y | VarAccess |
 | Test.kt:22:8:22:9 | 40 | LongLiteral | Test.kt:22:4:22:9 | ...=... | AssignExpr |
 | Test.kt:24:4:24:9 | ... -> ... | WhenBranch | Test.kt:21:3:24:9 | true | BooleanLiteral |
 | 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 | Normal Exit | Method |
-| Test.kt:27:3:27:3 | <Expr>; | ExprStmt | Test.kt:27:3:27:3 | z | VarAccess |
 | Test.kt:27:3:27:3 | z | VarAccess | 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:3:27:3 | z | VarAccess |
 | 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:30:3:33:3 | when ... | WhenExpr |
 | Test.kt:30:3:33:3 | when ... | WhenExpr | Test.kt:30:7: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:3 | <Expr>; | ExprStmt |
+| 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: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:4 | <Expr>; | ExprStmt |
-| Test.kt:31:4:31:4 | <Expr>; | ExprStmt | Test.kt:31:4:31:4 | y | VarAccess |
+| Test.kt:30:15:33:3 | { ... } | BlockStmt | Test.kt:31:4:31:9 | <Expr>; | ExprStmt |
 | Test.kt:31:4:31:4 | y | VarAccess | 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:4:31:9 | ...=... | AssignExpr | Test.kt:32:4:32:9 | <Expr>; | ExprStmt |
+| Test.kt:31:4:31:9 | <Expr>; | ExprStmt | Test.kt:31:4:31:4 | y | VarAccess |
 | 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:32:4:32:4 | z | VarAccess |
 | Test.kt:32:4:32:4 | z | VarAccess | 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:4:32:9 | ...=... | AssignExpr | Test.kt:35:3:35:8 | <Expr>; | ExprStmt |
+| Test.kt:32:4:32:9 | <Expr>; | ExprStmt | Test.kt:32:4:32:4 | z | VarAccess |
 | 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:3:35:3 | z | VarAccess |
 | Test.kt:35:3:35:3 | z | VarAccess | 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:3:35:3 | z | VarAccess |
 | 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:3 | <Expr>; | ExprStmt |
+| Test.kt:38:9:38:13 | ... > ... | GTExpr | Test.kt:43:3:43:8 | <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:4 | <Expr>; | ExprStmt |
-| Test.kt:39:4:39:4 | <Expr>; | ExprStmt | Test.kt:39:4:39:4 | y | VarAccess |
+| Test.kt:38:16:41:3 | { ... } | BlockStmt | Test.kt:39:4:39:9 | <Expr>; | ExprStmt |
 | Test.kt:39:4:39:4 | y | VarAccess | 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:4:39:4 | y | VarAccess |
 | Test.kt:39:8:39:9 | 10 | LongLiteral | Test.kt:39:4:39:9 | ...=... | AssignExpr |
-| Test.kt:40:4:40:4 | <Expr>; | ExprStmt | Test.kt:40:4:40:4 | x | VarAccess |
 | Test.kt:40:4:40:4 | x | VarAccess | Test.kt:40:4:40:6 | tmp0 | LocalVariableDeclExpr |
 | Test.kt:40:4:40:4 | x | VarAccess | Test.kt:40:4:40:6 | tmp0 | VarAccess |
 | 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:4 | x | VarAccess |
 | Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | tmp0 | VarAccess |
 | Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | { ... } | BlockStmt |
 | Test.kt:40:4:40:6 | <Stmt> | StmtExpr | Test.kt:40:4:40:6 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
 | 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 | dec(...) | MethodCall | Test.kt:40:4:40:6 | ...=... | AssignExpr |
-| Test.kt:40:4:40:6 | tmp0 | LocalVariableDeclExpr | Test.kt:40:4:40:4 | <Expr>; | ExprStmt |
+| Test.kt:40:4:40:6 | tmp0 | LocalVariableDeclExpr | 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 | 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 | { ... } | BlockStmt | Test.kt:40:4:40:6 | var ...; | LocalVariableDeclStmt |
-| Test.kt:43:3:43:3 | <Expr>; | ExprStmt | Test.kt:43:3:43:3 | z | VarAccess |
 | Test.kt:43:3:43:3 | z | VarAccess | 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:3:43:8 | ...=... | AssignExpr | Test.kt:73:3:73:8 | <Expr>; | ExprStmt |
+| Test.kt:43:3:43:8 | <Expr>; | ExprStmt | Test.kt:43:3:43:3 | z | VarAccess |
 | 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:73:3:73:3 | z | VarAccess |
 | Test.kt:73:3:73:3 | z | VarAccess | 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:3:73:8 | ...=... | AssignExpr | Test.kt:77:3:77:8 | <Expr>; | ExprStmt |
+| Test.kt:73:3:73:8 | <Expr>; | ExprStmt | Test.kt:73:3:73:3 | z | VarAccess |
 | 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:77:3:77:3 | w | VarAccess |
 | Test.kt:77:3:77:3 | w | VarAccess | 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:3:77:8 | <Expr>; | ExprStmt | Test.kt:77:3:77:3 | w | VarAccess |
 | 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:78:3:78:8 | return ... | ReturnStmt |
 | Test.kt:78:3:78:8 | return ... | ReturnStmt | Test.kt:4:2:79:2 | Normal Exit | Method |
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/basic/strictDominance.expected b/java/ql/test-kotlin1/library-tests/controlflow/basic/strictDominance.expected
index 4aa7994a173..79f658f9a10 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/strictDominance.expected
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/strictDominance.expected
@@ -8,35 +8,35 @@
 | 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:4 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:13:4:13:4 | <Expr>; |
+| 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:14:10:16:3 | { ... } |
-| 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: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: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:4 | <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:24:4:24:9 | return ... |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:4:13:79:2 | { ... } | Test.kt:27:3:27:8 | <Expr>; |
 | 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: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: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: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:4 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:40:4:40:4 | <Expr>; |
+| 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: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: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: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: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 ...; |
@@ -44,400 +44,400 @@
 | 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:4 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:13:4:13:4 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:18:3:18:3 | <Expr>; |
+| 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:4 | <Expr>; |
+| 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:3 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:32:4:32:4 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:35:3:35:3 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:40:4:40:4 | <Expr>; |
+| 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:3 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:73:3:73:3 | <Expr>; |
-| Test.kt:5:3:5:16 | var ...; | Test.kt:77:3:77:3 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:13:4:13:4 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:18:3:18:3 | <Expr>; |
+| 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:4 | <Expr>; |
+| 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:3 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:32:4:32:4 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:35:3:35:3 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:40:4:40:4 | <Expr>; |
+| 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:3 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:73:3:73:3 | <Expr>; |
-| Test.kt:6:3:6:18 | var ...; | Test.kt:77:3:77:3 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:13:4:13:4 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:18:3:18:3 | <Expr>; |
+| 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:4 | <Expr>; |
+| 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:3 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:32:4:32:4 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:35:3:35:3 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:40:4:40:4 | <Expr>; |
+| 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:3 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:73:3:73:3 | <Expr>; |
-| Test.kt:7:3:7:16 | var ...; | Test.kt:77:3:77:3 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:13:4:13:4 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:18:3:18:3 | <Expr>; |
+| 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:4 | <Expr>; |
+| 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:3 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:32:4:32:4 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:35:3:35:3 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:40:4:40:4 | <Expr>; |
+| 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:3 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:73:3:73:3 | <Expr>; |
-| Test.kt:8:3:8:16 | var ...; | Test.kt:77:3:77:3 | <Expr>; |
+| 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:11:3:16:3 | <Expr>; | Test.kt:11:14:14: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: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:14:10:16:3 | { ... } |
-| 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: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: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:4 | <Expr>; |
+| 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:24:4:24:9 | return ... |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:11:3:16:3 | <Expr>; | Test.kt:27:3:27:8 | <Expr>; |
 | 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: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: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: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: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: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: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: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: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: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:4 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:13:4:13:4 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:18:3:18:3 | <Expr>; |
+| 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:4 | <Expr>; |
+| 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:3 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:32:4:32:4 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:35:3:35:3 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:40:4:40:4 | <Expr>; |
+| 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:3 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:73:3:73:3 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:77:3:77:3 | <Expr>; |
+| 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: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: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: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 | <Expr>; |
-| Test.kt:18:3:18:3 | <Expr>; | Test.kt:21:6:22:9 | ... -> ... |
-| 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 | ... -> ... |
-| 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 | <Expr>; |
-| Test.kt:18:3:18:3 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
-| 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: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:4 | <Expr>; |
+| 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:21:3:24:9 | <Expr>; | Test.kt:24:4:24:9 | return ... |
-| Test.kt:21:3:24:9 | <Expr>; | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:21:3:24:9 | <Expr>; | Test.kt:27:3:27:8 | <Expr>; |
 | 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: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: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: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: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: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: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: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: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:78:3:78:8 | return ... |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:22:4:22:4 | <Expr>; |
+| 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:3 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:32:4:32:4 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:35:3:35:3 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:40:4:40:4 | <Expr>; |
+| 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:3 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:73:3:73:3 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:77:3:77:3 | <Expr>; |
+| 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:4 | <Expr>; | Test.kt:27:3:27:3 | <Expr>; |
-| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
-| 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: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:3 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:27:3:27:3 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
-| 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: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:30:3:33:3 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| 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: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: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: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: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: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: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: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: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:4 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:32:4:32:4 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:35:3:35:3 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:40:4:40:4 | <Expr>; |
+| 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:3 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:73:3:73:3 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:77:3:77:3 | <Expr>; |
+| 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: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: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:38:3:41:3 | while (...) | Test.kt:38:16:41:3 | { ... } |
-| 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: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: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: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: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:78:3:78:8 | return ... |
-| 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: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: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: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: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: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 | { ... } | 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 | { ... } | 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: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: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: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 ...; |
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/basic/strictPostDominance.expected b/java/ql/test-kotlin1/library-tests/controlflow/basic/strictPostDominance.expected
index 17ccee84c58..978e10bd84e 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/strictPostDominance.expected
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/strictPostDominance.expected
@@ -22,25 +22,25 @@
 | 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: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: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:4 | <Expr>; | Test.kt:14:10: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:3:5:16 | var ...; |
-| Test.kt:18:3:18:3 | <Expr>; | Test.kt:6:3:6:18 | var ...; |
-| Test.kt:18:3:18:3 | <Expr>; | Test.kt:7:3:7:16 | var ...; |
-| Test.kt:18:3:18:3 | <Expr>; | Test.kt:8:3:8:16 | var ...; |
-| Test.kt:18:3:18:3 | <Expr>; | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:18:3:18:3 | <Expr>; | Test.kt:11:7:14:3 | ... -> ... |
-| 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:14:10:16:3 | { ... } |
-| Test.kt:18:3:18:3 | <Expr>; | Test.kt:15:4:15:4 | <Expr>; |
+| 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: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 ...; |
@@ -49,12 +49,12 @@
 | 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: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: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:14:10:16:3 | { ... } |
-| 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: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 ...; |
@@ -63,129 +63,129 @@
 | 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:4 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:13:4:13:4 | <Expr>; |
+| 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:4 | <Expr>; |
-| Test.kt:21:6:22:9 | ... -> ... | Test.kt:18:3:18:3 | <Expr>; |
+| 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:3 | <Expr>; | Test.kt:22:4:22:4 | <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:30:7:33:3 | ... -> ... | Test.kt:22:4:22:4 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:27:3:27:3 | <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: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: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 | <Expr>; |
-| Test.kt:35:3:35:3 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
-| 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: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: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: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: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: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: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: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: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:4 | <Expr>; |
+| Test.kt:40:4:40:6 | var ...; | Test.kt:39:4:39:9 | <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:4 | <Expr>; |
+| Test.kt:40:4:40:6 | { ... } | Test.kt:39:4:39:9 | <Expr>; |
 | Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:6 | <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 | <Expr>; |
-| Test.kt:43:3:43:3 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
-| 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 | <Expr>; |
-| Test.kt:73:3:73:3 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
-| 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 | <Expr>; |
-| Test.kt:77:3:77:3 | <Expr>; | Test.kt:30:7:33:3 | ... -> ... |
-| 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: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: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: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: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: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: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: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: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: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: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: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 ... |
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.expected b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.expected
index 8451c46f83f..6084c631b9d 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.expected
+++ b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.expected
@@ -1,15 +1,15 @@
 | Test.kt:2:43:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
 | Test.kt:2:43:79:2 | { ... } | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:2:43:79:2 | { ... } | Test.kt:18:3:18:3 | <Expr>; |
-| Test.kt:18:3:18:3 | <Expr>; | Test.kt:2:2:79:2 | Normal Exit |
-| 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:11 | ... -> ... |
-| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:7:30:12 | After ... (value equals) ... [false] |
-| 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:35:3:35:3 | <Expr>; | Test.kt:38:10:38:10 | x |
+| Test.kt:2:43:79:2 | { ... } | Test.kt:18:3:18:20 | <Expr>; |
+| Test.kt:18:3:18:20 | <Expr>; | Test.kt:2:2:79:2 | Normal Exit |
+| Test.kt:18:3:18:20 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
+| Test.kt:18:3:18:20 | <Expr>; | Test.kt:24:4:24:11 | ... -> ... |
+| Test.kt:22:4:22:9 | <Expr>; | Test.kt:30:7:30:12 | After ... (value equals) ... [false] |
+| 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:35:3:35:8 | <Expr>; | Test.kt:38:10:38:10 | x |
 | Test.kt:38:10:38:10 | x | Test.kt:38:17:41:3 | { ... } |
-| Test.kt:38:10:38:10 | x | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:38:10:38:10 | x | Test.kt:43:3:43:15 | <Expr>; |
 | Test.kt:81:25:98:2 | { ... } | Test.kt:86:9:86:12 | true |
 | Test.kt:86:9:86:12 | true | Test.kt:88:8:88:14 | After ... > ... [false] |
 | Test.kt:86:9:86:12 | true | Test.kt:88:17:91:4 | { ... } |
diff --git a/java/ql/test-kotlin1/library-tests/stmts/stmts.expected b/java/ql/test-kotlin1/library-tests/stmts/stmts.expected
index c818b6b711c..41941911d67 100644
--- a/java/ql/test-kotlin1/library-tests/stmts/stmts.expected
+++ b/java/ql/test-kotlin1/library-tests/stmts/stmts.expected
@@ -20,15 +20,15 @@
 | stmts.kt:17:5:17:58 | var ...; | LocalVariableDeclStmt |
 | stmts.kt:17:29:17:43 | ... -> ... | WhenBranch |
 | stmts.kt:17:35:17:43 | { ... } | BlockStmt |
-| stmts.kt:17:37:17:37 | <Expr>; | ExprStmt |
+| stmts.kt:17:37:17:41 | <Expr>; | ExprStmt |
 | stmts.kt:17:50:17:58 | ... -> ... | WhenBranch |
 | stmts.kt:17:50:17:58 | { ... } | BlockStmt |
-| stmts.kt:17:52:17:52 | <Expr>; | ExprStmt |
+| stmts.kt:17:52:17:56 | <Expr>; | ExprStmt |
 | stmts.kt:18:5:18:56 | var ...; | LocalVariableDeclStmt |
 | stmts.kt:18:29:18:41 | ... -> ... | WhenBranch |
-| stmts.kt:18:37:18:37 | <Expr>; | ExprStmt |
-| stmts.kt:18:52:18:52 | <Expr>; | ExprStmt |
+| stmts.kt:18:37:18:41 | <Expr>; | ExprStmt |
 | stmts.kt:18:52:18:56 | ... -> ... | WhenBranch |
+| stmts.kt:18:52:18:56 | <Expr>; | ExprStmt |
 | stmts.kt:19:5:19:16 | return ... | ReturnStmt |
 | stmts.kt:22:27:44:1 | { ... } | BlockStmt |
 | stmts.kt:23:11:27:5 | <Label>: ... | LabeledStmt |
@@ -94,15 +94,15 @@ enclosing
 | stmts.kt:17:5:17:58 | var ...; | stmts.kt:2:41:20:1 | { ... } |
 | stmts.kt:17:29:17:43 | ... -> ... | stmts.kt:17:5:17:58 | var ...; |
 | stmts.kt:17:35:17:43 | { ... } | stmts.kt:17:29:17:43 | ... -> ... |
-| stmts.kt:17:37:17:37 | <Expr>; | stmts.kt:17:35:17:43 | { ... } |
+| stmts.kt:17:37:17:41 | <Expr>; | stmts.kt:17:35:17:43 | { ... } |
 | stmts.kt:17:50:17:58 | ... -> ... | stmts.kt:17:5:17:58 | var ...; |
 | stmts.kt:17:50:17:58 | { ... } | stmts.kt:17:50:17:58 | ... -> ... |
-| stmts.kt:17:52:17:52 | <Expr>; | stmts.kt:17:50:17:58 | { ... } |
+| stmts.kt:17:52:17:56 | <Expr>; | stmts.kt:17:50:17:58 | { ... } |
 | stmts.kt:18:5:18:56 | var ...; | stmts.kt:2:41:20:1 | { ... } |
 | stmts.kt:18:29:18:41 | ... -> ... | stmts.kt:18:5:18:56 | var ...; |
-| stmts.kt:18:37:18:37 | <Expr>; | stmts.kt:18:29:18:41 | ... -> ... |
-| stmts.kt:18:52:18:52 | <Expr>; | stmts.kt:18:52:18:56 | ... -> ... |
+| stmts.kt:18:37:18:41 | <Expr>; | stmts.kt:18:29:18:41 | ... -> ... |
 | stmts.kt:18:52:18:56 | ... -> ... | stmts.kt:18:5:18:56 | var ...; |
+| stmts.kt:18:52:18:56 | <Expr>; | stmts.kt:18:52:18:56 | ... -> ... |
 | stmts.kt:19:5:19:16 | return ... | stmts.kt:2:41:20:1 | { ... } |
 | stmts.kt:23:11:27:5 | <Label>: ... | stmts.kt:22:27:44:1 | { ... } |
 | stmts.kt:23:11:27:5 | while (...) | stmts.kt:23:11:27:5 | <Label>: ... |