Extract type access for enum value access

tamasvajk · igfoo · commit f43296a157cf · 2022-05-10T19:51:29.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -2487,6 +2487,8 @@ open class KotlinFileExtractor(
                     if (receiver != null) {
                         extractExpressionExpr(receiver, callable, id, -1, exprParent.enclosingStmt)
                     }
+
+                    // todo: do we need to extract a type access expression for static fields?
                 }
                 is IrGetEnumValue -> {
                     val exprParent = parent.expr(e, callable)
@@ -2511,6 +2513,8 @@ open class KotlinFileExtractor(
 
                     val vId = useEnumEntry(owner)
                     tw.writeVariableBinding(id, vId)
+
+                    extractTypeAccessRecursive(e.type, locId, id, -1, callable, exprParent.enclosingStmt)
                 }
                 is IrSetValue,
                 is IrSetField -> {
diff --git a/java/ql/test/kotlin/library-tests/exprs_typeaccess/PrintAst.expected b/java/ql/test/kotlin/library-tests/exprs_typeaccess/PrintAst.expected
@@ -68,7 +68,8 @@ A.kt:
 #   18|               0: [IntegerLiteral] 1
 #   19|         1: [LocalVariableDeclStmt] var ...;
 #   19|           1: [LocalVariableDeclExpr] e
-#   19|             0: [VarAccess] A
+#   19|             0: [VarAccess] Enu.A
+#   19|               -1: [TypeAccess] Enu
 #   20|         2: [ReturnStmt] return ...
 #   20|           0: [IntegerLiteral] 5
 #   23|     11: [Class] Enu

Original file line number	Diff line number	Diff line change
`@@ -2487,6 +2487,8 @@ open class KotlinFileExtractor(`
`2487`	`2487`	`if (receiver != null) {`
`2488`	`2488`	`extractExpressionExpr(receiver, callable, id, -1, exprParent.enclosingStmt)`
`2489`	`2489`	`}`
	`2490`	`+`
	`2491`	`+ // todo: do we need to extract a type access expression for static fields?`
`2490`	`2492`	`}`
`2491`	`2493`	`is IrGetEnumValue -> {`
`2492`	`2494`	`val exprParent = parent.expr(e, callable)`
`@@ -2511,6 +2513,8 @@ open class KotlinFileExtractor(`
`2511`	`2513`
`2512`	`2514`	`val vId = useEnumEntry(owner)`
`2513`	`2515`	`tw.writeVariableBinding(id, vId)`
	`2516`	`+`
	`2517`	`+ extractTypeAccessRecursive(e.type, locId, id, -1, callable, exprParent.enclosingStmt)`
`2514`	`2518`	`}`
`2515`	`2519`	`is IrSetValue,`
`2516`	`2520`	`is IrSetField -> {`