Fix temporary variable locations

2026-04-30 03:05:15 +02:00 · 2021-12-16 10:32:09 +01:00
parent 5c77131637
commit 9d7794185e
7 changed files with 53 additions and 43 deletions
--- a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
+++ b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -605,9 +605,16 @@ open class KotlinFileExtractor(
        }
    }

+    private fun getVariableLocationProvider(v: IrVariable): IrElement {
+        if (v.origin == IrDeclarationOrigin.IR_TEMPORARY_VARIABLE) {
+            return v.initializer ?: v
+        }
+        return v
+    }
+
    fun extractVariable(v: IrVariable, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {
        val stmtId = tw.getFreshIdLabel<DbLocalvariabledeclstmt>()
-        val locId = tw.getLocation(v)
+        val locId = tw.getLocation(getVariableLocationProvider(v))
        tw.writeStmts_localvariabledeclstmt(stmtId, parent, idx, callable)
        tw.writeHasLocation(stmtId, locId)
        extractVariableExpr(v, callable, stmtId, 1, stmtId)
@@ -616,7 +623,7 @@ open class KotlinFileExtractor(
    fun extractVariableExpr(v: IrVariable, callable: Label<out DbCallable>, parent: Label<out DbExprparent>, idx: Int, enclosingStmt: Label<out DbStmt>) {
        val varId = useVariable(v)
        val exprId = tw.getFreshIdLabel<DbLocalvariabledeclexpr>()
-        val locId = tw.getLocation(v)
+        val locId = tw.getLocation(getVariableLocationProvider(v))
        val type = useType(v.type)
        tw.writeLocalvars(varId, v.name.asString(), type.javaResult.id, type.kotlinResult.id, exprId)
        tw.writeHasLocation(varId, locId)
--- a/java/ql/test/kotlin/library-tests/controlflow/basic/bbStmts.expected
+++ b/java/ql/test/kotlin/library-tests/controlflow/basic/bbStmts.expected
@@ -82,9 +82,9 @@
 | Test.kt:38:16:41:3 | { ... } | 4 | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:38:16:41:3 | { ... } | 5 | Test.kt:40:4:40:6 | <Stmt> |
 | Test.kt:38:16:41:3 | { ... } | 6 | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:38:16:41:3 | { ... } | 7 | file://:0:0:0:0 | var ...; |
+| Test.kt:38:16:41:3 | { ... } | 7 | Test.kt:40:4:40:4 | var ...; |
 | Test.kt:38:16:41:3 | { ... } | 8 | Test.kt:40:4:40:4 | x |
-| Test.kt:38:16:41:3 | { ... } | 9 | file://:0:0:0:0 | tmp0 |
+| Test.kt:38:16:41:3 | { ... } | 9 | Test.kt:40:4:40:4 | tmp0 |
 | Test.kt:38:16:41:3 | { ... } | 10 | Test.kt:40:4:40:4 | <Expr>; |
 | Test.kt:38:16:41:3 | { ... } | 11 | Test.kt:40:4:40:6 | tmp0 |
 | Test.kt:38:16:41:3 | { ... } | 12 | Test.kt:40:4:40:6 | dec(...) |
--- a/java/ql/test/kotlin/library-tests/controlflow/basic/getASuccessor.expected
+++ b/java/ql/test/kotlin/library-tests/controlflow/basic/getASuccessor.expected
@@ -101,8 +101,11 @@
 | Test.kt:39:8:39:9 | 10 | LongLiteral | Test.kt:39:4:39:4 | ...=... | AssignExpr |
 | Test.kt:40:4:40:4 | ...=... | AssignExpr | Test.kt:40:4:40:6 | <Expr>; | ExprStmt |
 | Test.kt:40:4:40:4 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | tmp0 | VarAccess |
+| Test.kt:40:4:40:4 | int tmp0 | LocalVariableDecl | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:40:4:40:4 | tmp0 | LocalVariableDeclExpr | Test.kt:40:4:40:4 | <Expr>; | ExprStmt |
+| Test.kt:40:4:40:4 | var ...; | LocalVariableDeclStmt | Test.kt:40:4:40:4 | x | VarAccess |
+| Test.kt:40:4:40:4 | x | VarAccess | Test.kt:40:4:40:4 | tmp0 | LocalVariableDeclExpr |
 | Test.kt:40:4:40:4 | x | VarAccess | file://:0:0:0:0 | <none> | <none> |
-| Test.kt:40:4:40:4 | x | VarAccess | file://:0:0:0:0 | tmp0 | LocalVariableDeclExpr |
 | Test.kt:40:4:40:6 | (...)... | CastExpr | Test.kt:38:9:38:9 | x | VarAccess |
 | Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | <Stmt> | StmtExpr |
 | Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | tmp0 | VarAccess |
@@ -111,7 +114,7 @@
 | Test.kt:40:4:40:6 | dec(...) | MethodAccess | Test.kt:40:4:40:4 | ...=... | AssignExpr |
 | Test.kt:40:4:40:6 | tmp0 | VarAccess | Test.kt:40:4:40:6 | (...)... | CastExpr |
 | Test.kt:40:4:40:6 | tmp0 | VarAccess | Test.kt:40:4:40:6 | dec(...) | MethodAccess |
-| Test.kt:40:4:40:6 | { ... } | BlockStmt | file://:0:0:0:0 | var ...; | LocalVariableDeclStmt |
+| Test.kt:40:4:40:6 | { ... } | BlockStmt | Test.kt:40:4:40:4 | var ...; | LocalVariableDeclStmt |
 | Test.kt:43:3:43:3 | ...=... | AssignExpr | Test.kt:73:3:73:3 | <Expr>; | ExprStmt |
 | Test.kt:43:3:43:3 | <Expr>; | ExprStmt | Test.kt:43:7:43:8 | 30 | IntegerLiteral |
 | Test.kt:43:3:43:3 | z | VarAccess | file://:0:0:0:0 | <none> | <none> |
--- a/java/ql/test/kotlin/library-tests/controlflow/basic/strictDominance.expected
+++ b/java/ql/test/kotlin/library-tests/controlflow/basic/strictDominance.expected
@@ -22,6 +22,7 @@
 | 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:40:4:40:4 | var ...; |
 | 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 | { ... } |
@@ -29,7 +30,6 @@
 | Test.kt:4:13:79:2 | { ... } | Test.kt:73:3:73:3 | <Expr>; |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:77:3:77:3 | <Expr>; |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:78:3:78:8 | return ... |
-| Test.kt:4:13:79:2 | { ... } | file://:0:0:0:0 | var ...; |
 | Test.kt:5:3:5:16 | var ...; | Test.kt:6:3:6:18 | var ...; |
 | Test.kt:5:3:5:16 | var ...; | Test.kt:7:3:7:16 | var ...; |
 | Test.kt:5:3:5:16 | var ...; | Test.kt:8:3:8:16 | var ...; |
@@ -50,6 +50,7 @@
 | 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:40:4:40:4 | var ...; |
 | 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 | { ... } |
@@ -57,7 +58,6 @@
 | 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:78:3:78:8 | return ... |
-| Test.kt:5:3:5:16 | var ...; | file://:0:0:0:0 | var ...; |
 | 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>; |
@@ -77,6 +77,7 @@
 | 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:40:4:40:4 | var ...; |
 | 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 | { ... } |
@@ -84,7 +85,6 @@
 | 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:78:3:78:8 | return ... |
-| Test.kt:6:3:6:18 | var ...; | file://:0:0:0:0 | var ...; |
 | 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:14:14:3 | { ... } |
@@ -103,6 +103,7 @@
 | 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:40:4:40:4 | var ...; |
 | 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 | { ... } |
@@ -110,7 +111,6 @@
 | 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:78:3:78:8 | return ... |
-| Test.kt:7:3:7:16 | var ...; | file://:0:0:0:0 | var ...; |
 | Test.kt:8:3:8:16 | var ...; | Test.kt:11:3:16:3 | <Expr>; |
 | 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>; |
@@ -128,6 +128,7 @@
 | 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:40:4:40:4 | var ...; |
 | 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 | { ... } |
@@ -135,7 +136,6 @@
 | 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:78:3:78:8 | return ... |
-| Test.kt:8:3:8:16 | var ...; | file://:0:0:0:0 | var ...; |
 | 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>; |
@@ -152,6 +152,7 @@
 | 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:40:4:40:4 | var ...; |
 | 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 | { ... } |
@@ -159,7 +160,6 @@
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:73:3:73:3 | <Expr>; |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:77:3:77:3 | <Expr>; |
 | Test.kt:11:3:16:3 | <Expr>; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:11:3:16:3 | <Expr>; | file://:0:0:0:0 | var ...; |
 | 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:11:14:14:3 | { ... } | Test.kt:18:3:18:3 | <Expr>; |
@@ -175,6 +175,7 @@
 | Test.kt:11:14:14:3 | { ... } | Test.kt:38:16:41:3 | { ... } |
 | Test.kt:11:14:14:3 | { ... } | Test.kt:39:4:39:4 | <Expr>; |
 | Test.kt:11:14:14:3 | { ... } | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:11:14:14:3 | { ... } | Test.kt:40:4:40:4 | var ...; |
 | Test.kt:11:14:14:3 | { ... } | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:11:14:14:3 | { ... } | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:11:14:14:3 | { ... } | Test.kt:40:4:40:6 | { ... } |
@@ -182,7 +183,6 @@
 | Test.kt:11:14:14:3 | { ... } | Test.kt:73:3:73:3 | <Expr>; |
 | Test.kt:11:14:14:3 | { ... } | Test.kt:77:3:77:3 | <Expr>; |
 | Test.kt:11:14:14:3 | { ... } | Test.kt:78:3:78:8 | return ... |
-| Test.kt:11:14:14:3 | { ... } | file://:0:0:0:0 | var ...; |
 | Test.kt:12:4:12:4 | <Expr>; | Test.kt:13:4:13:4 | <Expr>; |
 | Test.kt:12:4:12:4 | <Expr>; | Test.kt:18:3:18:3 | <Expr>; |
 | Test.kt:12:4:12:4 | <Expr>; | Test.kt:21:3:24:9 | <Expr>; |
@@ -197,6 +197,7 @@
 | Test.kt:12:4:12:4 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
 | Test.kt:12:4:12:4 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
 | Test.kt:12:4:12:4 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:12:4:12:4 | <Expr>; | Test.kt:40:4:40:4 | var ...; |
 | Test.kt:12:4:12:4 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:12:4:12:4 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:12:4:12:4 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
@@ -204,7 +205,6 @@
 | Test.kt:12:4:12:4 | <Expr>; | Test.kt:73:3:73:3 | <Expr>; |
 | Test.kt:12:4:12:4 | <Expr>; | Test.kt:77:3:77:3 | <Expr>; |
 | Test.kt:12:4:12:4 | <Expr>; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:12:4:12:4 | <Expr>; | file://:0:0:0:0 | var ...; |
 | Test.kt:13:4:13:4 | <Expr>; | Test.kt:18:3:18:3 | <Expr>; |
 | Test.kt:13:4:13:4 | <Expr>; | Test.kt:21:3:24:9 | <Expr>; |
 | Test.kt:13:4:13:4 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
@@ -218,6 +218,7 @@
 | Test.kt:13:4:13:4 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
 | Test.kt:13:4:13:4 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
 | Test.kt:13:4:13:4 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:13:4:13:4 | <Expr>; | Test.kt:40:4:40:4 | var ...; |
 | Test.kt:13:4:13:4 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:13:4:13:4 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:13:4:13:4 | <Expr>; | Test.kt:40:4:40:6 | { ... } |
@@ -225,7 +226,6 @@
 | Test.kt:13:4:13:4 | <Expr>; | Test.kt:73:3:73:3 | <Expr>; |
 | Test.kt:13:4:13:4 | <Expr>; | Test.kt:77:3:77:3 | <Expr>; |
 | Test.kt:13:4:13:4 | <Expr>; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:13:4:13:4 | <Expr>; | file://:0:0:0:0 | var ...; |
 | 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:22:4:22:4 | <Expr>; |
@@ -239,6 +239,7 @@
 | 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:4 | var ...; |
 | 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 | { ... } |
@@ -246,7 +247,6 @@
 | 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:18:3:18:3 | <Expr>; | file://:0:0:0:0 | var ...; |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:27:3:27:3 | <Expr>; |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
@@ -258,6 +258,7 @@
 | 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:40:4:40:4 | var ...; |
 | 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 | { ... } |
@@ -265,7 +266,6 @@
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:73:3:73:3 | <Expr>; |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:77:3:77:3 | <Expr>; |
 | Test.kt:21:3:24:9 | <Expr>; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:21:3:24:9 | <Expr>; | file://:0:0:0:0 | var ...; |
 | 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:15:33:3 | { ... } |
@@ -276,6 +276,7 @@
 | 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:4 | var ...; |
 | 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 | { ... } |
@@ -283,7 +284,6 @@
 | 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:4 | <Expr>; | file://:0:0:0:0 | var ...; |
 | Test.kt:27:3:27:3 | <Expr>; | Test.kt:30:3:33:3 | <Expr>; |
 | Test.kt:27:3:27:3 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
 | Test.kt:27:3:27:3 | <Expr>; | Test.kt:31:4:31:4 | <Expr>; |
@@ -293,6 +293,7 @@
 | 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:4 | var ...; |
 | 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 | { ... } |
@@ -300,7 +301,6 @@
 | 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:3 | <Expr>; | file://:0:0:0:0 | var ...; |
 | 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>; |
@@ -309,6 +309,7 @@
 | 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:40:4:40:4 | var ...; |
 | 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 | { ... } |
@@ -316,7 +317,6 @@
 | Test.kt:30:3:33:3 | <Expr>; | Test.kt:73:3:73:3 | <Expr>; |
 | Test.kt:30:3:33:3 | <Expr>; | Test.kt:77:3:77:3 | <Expr>; |
 | Test.kt:30:3:33:3 | <Expr>; | Test.kt:78:3:78:8 | return ... |
-| Test.kt:30:3:33:3 | <Expr>; | file://:0:0:0:0 | var ...; |
 | 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>; |
@@ -324,6 +324,7 @@
 | 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:4 | var ...; |
 | 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 | { ... } |
@@ -331,10 +332,10 @@
 | 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:35:3:35:3 | <Expr>; | file://:0:0:0:0 | var ...; |
 | 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:40:4:40:4 | var ...; |
 | 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 | { ... } |
@@ -342,26 +343,27 @@
 | Test.kt:38:3:41:3 | while (...) | Test.kt:73:3:73:3 | <Expr>; |
 | Test.kt:38:3:41:3 | while (...) | Test.kt:77:3:77:3 | <Expr>; |
 | Test.kt:38:3:41:3 | while (...) | Test.kt:78:3:78:8 | return ... |
-| Test.kt:38:3:41:3 | while (...) | file://:0:0:0:0 | var ...; |
 | Test.kt:38:16:41:3 | { ... } | Test.kt:39:4:39:4 | <Expr>; |
 | Test.kt:38:16:41:3 | { ... } | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:38:16:41:3 | { ... } | Test.kt:40:4:40:4 | var ...; |
 | 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 | { ... } |
-| Test.kt:38:16:41:3 | { ... } | file://:0:0:0:0 | var ...; |
 | 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:4 | var ...; |
 | 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 | { ... } |
-| Test.kt:39:4:39:4 | <Expr>; | file://:0:0:0:0 | var ...; |
 | Test.kt:40:4:40:4 | <Expr>; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:40:4:40:4 | var ...; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:40:4:40:4 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:4 | var ...; |
 | 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 | { ... } |
-| Test.kt:40:4:40:6 | <Expr>; | file://:0:0:0:0 | var ...; |
 | Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:4 | var ...; |
 | Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:40:4:40:6 | { ... } | file://:0:0:0:0 | 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 ... |
@@ -418,5 +420,3 @@
 | Test.kt:95:4:97:2 | catch (...) | Test.kt:95:36:97:2 | { ... } |
 | Test.kt:95:4:97:2 | catch (...) | Test.kt:96:3:96:10 | return ... |
 | Test.kt:95:36:97:2 | { ... } | Test.kt:96:3:96:10 | return ... |
-| file://:0:0:0:0 | var ...; | Test.kt:40:4:40:4 | <Expr>; |
-| file://:0:0:0:0 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
--- a/java/ql/test/kotlin/library-tests/controlflow/basic/strictPostDominance.expected
+++ b/java/ql/test/kotlin/library-tests/controlflow/basic/strictPostDominance.expected
@@ -148,17 +148,21 @@
 | 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:4 | var ...; |
 | 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 | { ... } |
-| Test.kt:40:4:40:4 | <Expr>; | file://:0:0:0:0 | var ...; |
+| Test.kt:40:4:40:4 | var ...; | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:40:4:40:4 | var ...; | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:40:4:40:4 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:40:4:40:4 | var ...; | Test.kt:40:4:40:6 | { ... } |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:38:16:41:3 | { ... } |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:39:4:39:4 | <Expr>; |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:4 | var ...; |
 | 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 | { ... } |
-| Test.kt:40:4:40:6 | <Expr>; | file://:0:0:0:0 | var ...; |
 | 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:40:4:40:6 | <Expr>; |
@@ -186,10 +190,10 @@
 | 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:4 | var ...; |
 | 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 | { ... } |
-| Test.kt:43:3:43:3 | <Expr>; | file://:0:0:0:0 | var ...; |
 | Test.kt:73:3:73:3 | <Expr>; | Test.kt:4:13:79:2 | { ... } |
 | Test.kt:73:3:73:3 | <Expr>; | Test.kt:5:3:5:16 | var ...; |
 | Test.kt:73:3:73:3 | <Expr>; | Test.kt:6:3:6:18 | var ...; |
@@ -214,11 +218,11 @@
 | 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:4 | var ...; |
 | 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 | { ... } |
 | Test.kt:73:3:73:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
-| Test.kt:73:3:73:3 | <Expr>; | file://:0:0:0:0 | var ...; |
 | Test.kt:77:3:77:3 | <Expr>; | Test.kt:4:13:79:2 | { ... } |
 | Test.kt:77:3:77:3 | <Expr>; | Test.kt:5:3:5:16 | var ...; |
 | Test.kt:77:3:77:3 | <Expr>; | Test.kt:6:3:6:18 | var ...; |
@@ -243,12 +247,12 @@
 | 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:4 | var ...; |
 | 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 | { ... } |
 | 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:77:3:77:3 | <Expr>; | file://:0:0:0:0 | var ...; |
 | Test.kt:78:3:78:8 | return ... | Test.kt:4:13:79:2 | { ... } |
 | Test.kt:78:3:78:8 | return ... | Test.kt:5:3:5:16 | var ...; |
 | Test.kt:78:3:78:8 | return ... | Test.kt:6:3:6:18 | var ...; |
@@ -273,13 +277,13 @@
 | 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:40:4:40:4 | var ...; |
 | 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 | { ... } |
 | 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 ... | file://:0:0:0:0 | var ...; |
 | 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 ... |
@@ -298,7 +302,3 @@
 | Test.kt:95:36:97:2 | { ... } | Test.kt:95:4:97:2 | catch (...) |
 | Test.kt:96:3:96:10 | return ... | Test.kt:95:4:97:2 | catch (...) |
 | Test.kt:96:3:96:10 | return ... | Test.kt:95:36:97:2 | { ... } |
-| file://:0:0:0:0 | var ...; | Test.kt:38:16:41:3 | { ... } |
-| file://:0:0:0:0 | var ...; | Test.kt:39:4:39:4 | <Expr>; |
-| file://:0:0:0:0 | var ...; | Test.kt:40:4:40:6 | <Expr>; |
-| file://:0:0:0:0 | var ...; | Test.kt:40:4:40:6 | { ... } |
--- a/java/ql/test/kotlin/library-tests/controlflow/dominance/dominator.expected
+++ b/java/ql/test/kotlin/library-tests/controlflow/dominance/dominator.expected
@@ -77,14 +77,16 @@
 | Test.kt:39:8:39:9 | 10 | Test.kt:39:4:39:4 | ...=... |
 | Test.kt:40:4:40:4 | ...=... | Test.kt:40:4:40:6 | <Expr>; |
 | Test.kt:40:4:40:4 | <Expr>; | Test.kt:40:4:40:6 | tmp0 |
-| Test.kt:40:4:40:4 | x | file://:0:0:0:0 | tmp0 |
+| Test.kt:40:4:40:4 | tmp0 | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:40:4:40:4 | var ...; | Test.kt:40:4:40:4 | x |
+| Test.kt:40:4:40:4 | x | Test.kt:40:4:40:4 | tmp0 |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <Stmt> |
 | Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | tmp0 |
 | Test.kt:40:4:40:6 | <Stmt> | Test.kt:40:4:40:6 | { ... } |
 | Test.kt:40:4:40:6 | dec(...) | Test.kt:40:4:40:4 | ...=... |
 | Test.kt:40:4:40:6 | tmp0 | Test.kt:40:4:40:6 | (...)... |
 | Test.kt:40:4:40:6 | tmp0 | Test.kt:40:4:40:6 | dec(...) |
-| Test.kt:40:4:40:6 | { ... } | file://:0:0:0:0 | var ...; |
+| Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:4 | var ...; |
 | Test.kt:43:3:43:3 | ...=... | Test.kt:73:3:73:3 | <Expr>; |
 | Test.kt:43:3:43:3 | <Expr>; | Test.kt:43:3:43:3 | z |
 | Test.kt:43:3:43:3 | z | Test.kt:43:8:43:8 | y |
@@ -146,5 +148,3 @@
 | Test.kt:95:12:95:12 | c | Test.kt:95:5:95:12 | return ... |
 | Test.kt:97:3:97:10 | return ... | Test.kt:81:2:98:2 | test2 |
 | Test.kt:97:10:97:10 | b | Test.kt:97:3:97:10 | return ... |
-| file://:0:0:0:0 | tmp0 | Test.kt:40:4:40:4 | <Expr>; |
-| file://:0:0:0:0 | var ...; | Test.kt:40:4:40:4 | x |
--- a/java/ql/test/kotlin/library-tests/exprs/exprs.expected
+++ b/java/ql/test/kotlin/library-tests/exprs/exprs.expected
@@ -460,6 +460,7 @@
 | exprs.kt:131:12:131:23 | ... > ... | exprs.kt:4:1:136:1 | topLevelMethod | GTExpr |
 | exprs.kt:131:23:131:23 | 0 | exprs.kt:4:1:136:1 | topLevelMethod | IntegerLiteral |
 | exprs.kt:132:9:132:16 | ...=... | exprs.kt:4:1:136:1 | topLevelMethod | AssignExpr |
+| exprs.kt:132:9:132:16 | tmp0 | exprs.kt:4:1:136:1 | topLevelMethod | LocalVariableDeclExpr |
 | exprs.kt:132:9:132:16 | variable | exprs.kt:4:1:136:1 | topLevelMethod | VarAccess |
 | exprs.kt:132:9:132:16 | variable | exprs.kt:4:1:136:1 | topLevelMethod | VarAccess |
 | exprs.kt:132:9:132:18 | (...)... | exprs.kt:4:1:136:1 | topLevelMethod | CastExpr |
@@ -633,7 +634,6 @@
 | file://:0:0:0:0 | int | file://:0:0:0:0 | <none> | TypeAccess |
 | file://:0:0:0:0 | int | file://:0:0:0:0 | <none> | TypeAccess |
 | file://:0:0:0:0 | int | file://:0:0:0:0 | <none> | TypeAccess |
-| file://:0:0:0:0 | tmp0 | exprs.kt:4:1:136:1 | topLevelMethod | LocalVariableDeclExpr |
 | funcExprs.kt:14:5:14:33 | functionExpression0a(...) | funcExprs.kt:13:1:29:1 | call | MethodAccess |
 | funcExprs.kt:14:26:14:33 | ...->... | funcExprs.kt:13:1:29:1 | call | LambdaExpr |
 | funcExprs.kt:14:31:14:31 | 5 | funcExprs.kt:14:26:14:33 | invoke | IntegerLiteral |