Extract the corresponding classes of enum entries, where they exist.

smowton · smowton · commit 2df1d63d1c9c · 2022-10-07T12:23:08.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -155,7 +155,7 @@ open class KotlinFileExtractor(
                 is IrEnumEntry -> {
                     val parentId = useDeclarationParent(declaration.parent, false)?.cast<DbReftype>()
                     if (parentId != null) {
-                        extractEnumEntry(declaration, parentId, extractFunctionBodies)
+                        extractEnumEntry(declaration, parentId, extractPrivateMembers, extractFunctionBodies)
                     }
                     Unit
                 }
@@ -1254,7 +1254,7 @@ open class KotlinFileExtractor(
         }
     }
 
-    private fun extractEnumEntry(ee: IrEnumEntry, parentId: Label<out DbReftype>, extractTypeAccess: Boolean) {
+    private fun extractEnumEntry(ee: IrEnumEntry, parentId: Label<out DbReftype>, extractPrivateMembers: Boolean, extractFunctionBodies: Boolean) {
         with("enum entry", ee) {
             DeclarationStackAdjuster(ee).use {
                 val id = useEnumEntry(ee)
@@ -1265,14 +1265,18 @@ open class KotlinFileExtractor(
                 tw.writeHasLocation(id, locId)
                 tw.writeIsEnumConst(id)
 
-                if (extractTypeAccess) {
+                if (extractFunctionBodies) {
                     val fieldDeclarationId = tw.getFreshIdLabel<DbFielddecl>()
                     tw.writeFielddecls(fieldDeclarationId, parentId)
                     tw.writeFieldDeclaredIn(id, fieldDeclarationId, 0)
                     tw.writeHasLocation(fieldDeclarationId, locId)
 
                     extractTypeAccess(type, locId, fieldDeclarationId, 0)
                 }
+
+                ee.correspondingClass?.let {
+                    extractDeclaration(it, extractPrivateMembers, extractFunctionBodies)
+                }
             }
         }
     }
diff --git a/java/ql/test/kotlin/library-tests/methods/clinit.expected b/java/ql/test/kotlin/library-tests/methods/clinit.expected
@@ -1,2 +1,3 @@
 | clinit.kt:0:0:0:0 | <clinit> | file://:0:0:0:0 | void |
 | enumClass.kt:0:0:0:0 | <clinit> | file://:0:0:0:0 | void |
+| enumClass.kt:0:0:0:0 | <clinit> | file://:0:0:0:0 | void |
diff --git a/java/ql/test/kotlin/library-tests/methods/enumClass.kt b/java/ql/test/kotlin/library-tests/methods/enumClass.kt
@@ -2,3 +2,15 @@ enum class EnumClass(val v: Int) {
     enum1(1),
     enum2(1)
 }
+
+enum class EnumWithFunctions {
+
+  VAL {
+    override fun f(i: Int) = i
+    override fun g(i: Int) = this.f(i) + i
+  };
+
+  abstract fun f(i: Int): Int
+  abstract fun g(i: Int): Int
+
+}
diff --git a/java/ql/test/kotlin/library-tests/methods/exprs.expected b/java/ql/test/kotlin/library-tests/methods/exprs.expected
@@ -226,6 +226,10 @@
 | enumClass.kt:0:0:0:0 | EnumClass | TypeAccess |
 | enumClass.kt:0:0:0:0 | EnumClass | TypeAccess |
 | enumClass.kt:0:0:0:0 | EnumClass[] | TypeAccess |
+| enumClass.kt:0:0:0:0 | EnumWithFunctions | TypeAccess |
+| enumClass.kt:0:0:0:0 | EnumWithFunctions | TypeAccess |
+| enumClass.kt:0:0:0:0 | EnumWithFunctions[] | TypeAccess |
+| enumClass.kt:0:0:0:0 | String | TypeAccess |
 | enumClass.kt:0:0:0:0 | String | TypeAccess |
 | enumClass.kt:1:1:4:1 | Enum<EnumClass> | TypeAccess |
 | enumClass.kt:1:1:4:1 | EnumClass | TypeAccess |
@@ -252,6 +256,33 @@
 | enumClass.kt:3:5:3:12 | EnumClass.enum2 | VarAccess |
 | enumClass.kt:3:5:3:12 | new EnumClass(...) | ClassInstanceExpr |
 | enumClass.kt:3:11:3:11 | 1 | IntegerLiteral |
+| enumClass.kt:6:1:16:1 | Enum<EnumWithFunctions> | TypeAccess |
+| enumClass.kt:6:1:16:1 | EnumWithFunctions | TypeAccess |
+| enumClass.kt:6:1:16:1 | new Enum(...) | ClassInstanceExpr |
+| enumClass.kt:8:3:11:4 | ...=... | KtInitializerAssignExpr |
+| enumClass.kt:8:3:11:4 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
+| enumClass.kt:8:3:11:4 | EnumWithFunctions | TypeAccess |
+| enumClass.kt:8:3:11:4 | EnumWithFunctions | TypeAccess |
+| enumClass.kt:8:3:11:4 | EnumWithFunctions | TypeAccess |
+| enumClass.kt:8:3:11:4 | EnumWithFunctions.VAL | VarAccess |
+| enumClass.kt:8:3:11:4 | Unit | TypeAccess |
+| enumClass.kt:8:3:11:4 | VAL | TypeAccess |
+| enumClass.kt:8:3:11:4 | new EnumWithFunctions(...) | ClassInstanceExpr |
+| enumClass.kt:8:3:11:4 | new VAL(...) | ClassInstanceExpr |
+| enumClass.kt:9:14:9:30 | int | TypeAccess |
+| enumClass.kt:9:20:9:25 | int | TypeAccess |
+| enumClass.kt:9:30:9:30 | i | VarAccess |
+| enumClass.kt:10:14:10:42 | int | TypeAccess |
+| enumClass.kt:10:20:10:25 | int | TypeAccess |
+| enumClass.kt:10:30:10:33 | this | ThisAccess |
+| enumClass.kt:10:30:10:42 | ... + ... | AddExpr |
+| enumClass.kt:10:35:10:38 | f(...) | MethodAccess |
+| enumClass.kt:10:37:10:37 | i | VarAccess |
+| enumClass.kt:10:42:10:42 | i | VarAccess |
+| enumClass.kt:13:12:13:29 | int | TypeAccess |
+| enumClass.kt:13:18:13:23 | int | TypeAccess |
+| enumClass.kt:14:12:14:29 | int | TypeAccess |
+| enumClass.kt:14:18:14:23 | int | TypeAccess |
 | methods2.kt:4:1:5:1 | Unit | TypeAccess |
 | methods2.kt:4:26:4:31 | int | TypeAccess |
 | methods2.kt:4:34:4:39 | int | TypeAccess |
diff --git a/java/ql/test/kotlin/library-tests/methods/methods.expected b/java/ql/test/kotlin/library-tests/methods/methods.expected
@@ -29,6 +29,13 @@ methods
 | enumClass.kt:1:1:4:1 | EnumClass | enumClass.kt:0:0:0:0 | valueOf | valueOf(java.lang.String) | public, static | Compiler generated |
 | enumClass.kt:1:1:4:1 | EnumClass | enumClass.kt:0:0:0:0 | values | values() | public, static | Compiler generated |
 | enumClass.kt:1:1:4:1 | EnumClass | enumClass.kt:1:22:1:31 | getV | getV() | public | Compiler generated |
+| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:0:0:0:0 | <clinit> | <clinit>() |  | Compiler generated |
+| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:0:0:0:0 | valueOf | valueOf(java.lang.String) | public, static | Compiler generated |
+| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:0:0:0:0 | values | values() | public, static | Compiler generated |
+| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:13:12:13:29 | f | f(int) | public |  |
+| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:14:12:14:29 | g | g(int) | public |  |
+| enumClass.kt:8:3:11:4 | VAL | enumClass.kt:9:14:9:30 | f | f(int) | override, public |  |
+| enumClass.kt:8:3:11:4 | VAL | enumClass.kt:10:14:10:42 | g | g(int) | override, public |  |
 | methods2.kt:0:0:0:0 | Methods2Kt | methods2.kt:4:1:5:1 | fooBarTopLevelMethod | fooBarTopLevelMethod(int,int) | public, static |  |
 | methods2.kt:7:1:10:1 | Class2 | methods2.kt:8:5:9:5 | fooBarClassMethod | fooBarClassMethod(int,int) | public |  |
 | methods3.kt:0:0:0:0 | Methods3Kt | methods3.kt:3:1:3:42 | fooBarTopLevelMethodExt | fooBarTopLevelMethodExt(int,int) | public, static |  |
@@ -56,6 +63,8 @@ constructors
 | delegates.kt:8:32:11:5 | new KMutableProperty1<MyClass,String>(...) { ... } | delegates.kt:8:32:11:5 |  |  |
 | delegates.kt:8:66:11:5 | new Function3<KProperty<?>,String,String,Unit>(...) { ... } | delegates.kt:8:66:11:5 |  |  |
 | enumClass.kt:1:1:4:1 | EnumClass | enumClass.kt:1:6:4:1 | EnumClass | EnumClass(int) |
+| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:6:6:16:1 | EnumWithFunctions | EnumWithFunctions() |
+| enumClass.kt:8:3:11:4 | VAL | enumClass.kt:8:3:11:4 | VAL | VAL() |
 | methods2.kt:7:1:10:1 | Class2 | methods2.kt:7:1:10:1 | Class2 | Class2() |
 | methods3.kt:5:1:7:1 | Class3 | methods3.kt:5:1:7:1 | Class3 | Class3() |
 | methods4.kt:3:1:11:1 | NestedTest | methods4.kt:3:1:11:1 | NestedTest | NestedTest() |
diff --git a/java/ql/test/kotlin/library-tests/methods/parameters.expected b/java/ql/test/kotlin/library-tests/methods/parameters.expected
@@ -23,6 +23,11 @@
 | delegates.kt:8:66:11:5 | invoke | delegates.kt:9:15:9:17 | old | 1 |
 | delegates.kt:8:66:11:5 | invoke | delegates.kt:9:20:9:22 | new | 2 |
 | enumClass.kt:0:0:0:0 | valueOf | enumClass.kt:0:0:0:0 | value | 0 |
+| enumClass.kt:0:0:0:0 | valueOf | enumClass.kt:0:0:0:0 | value | 0 |
+| enumClass.kt:9:14:9:30 | f | enumClass.kt:9:20:9:25 | i | 0 |
+| enumClass.kt:10:14:10:42 | g | enumClass.kt:10:20:10:25 | i | 0 |
+| enumClass.kt:13:12:13:29 | f | enumClass.kt:13:18:13:23 | i | 0 |
+| enumClass.kt:14:12:14:29 | g | enumClass.kt:14:18:14:23 | i | 0 |
 | methods2.kt:4:1:5:1 | fooBarTopLevelMethod | methods2.kt:4:26:4:31 | x | 0 |
 | methods2.kt:4:1:5:1 | fooBarTopLevelMethod | methods2.kt:4:34:4:39 | y | 1 |
 | methods2.kt:8:5:9:5 | fooBarClassMethod | methods2.kt:8:27:8:32 | x | 0 |

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ open class KotlinFileExtractor(`
`155`	`155`	`is IrEnumEntry -> {`
`156`	`156`	`val parentId = useDeclarationParent(declaration.parent, false)?.cast<DbReftype>()`
`157`	`157`	`if (parentId != null) {`
`158`		`- extractEnumEntry(declaration, parentId, extractFunctionBodies)`
	`158`	`+ extractEnumEntry(declaration, parentId, extractPrivateMembers, extractFunctionBodies)`
`159`	`159`	`}`
`160`	`160`	`Unit`
`161`	`161`	`}`
`@@ -1254,7 +1254,7 @@ open class KotlinFileExtractor(`
`1254`	`1254`	`}`
`1255`	`1255`	`}`
`1256`	`1256`
`1257`		`- private fun extractEnumEntry(ee: IrEnumEntry, parentId: Label<out DbReftype>, extractTypeAccess: Boolean) {`
	`1257`	`+ private fun extractEnumEntry(ee: IrEnumEntry, parentId: Label<out DbReftype>, extractPrivateMembers: Boolean, extractFunctionBodies: Boolean) {`
`1258`	`1258`	`with("enum entry", ee) {`
`1259`	`1259`	`DeclarationStackAdjuster(ee).use {`
`1260`	`1260`	`val id = useEnumEntry(ee)`
`@@ -1265,14 +1265,18 @@ open class KotlinFileExtractor(`
`1265`	`1265`	`tw.writeHasLocation(id, locId)`
`1266`	`1266`	`tw.writeIsEnumConst(id)`
`1267`	`1267`
`1268`		`- if (extractTypeAccess) {`
	`1268`	`+ if (extractFunctionBodies) {`
`1269`	`1269`	`val fieldDeclarationId = tw.getFreshIdLabel<DbFielddecl>()`
`1270`	`1270`	`tw.writeFielddecls(fieldDeclarationId, parentId)`
`1271`	`1271`	`tw.writeFieldDeclaredIn(id, fieldDeclarationId, 0)`
`1272`	`1272`	`tw.writeHasLocation(fieldDeclarationId, locId)`
`1273`	`1273`
`1274`	`1274`	`extractTypeAccess(type, locId, fieldDeclarationId, 0)`
`1275`	`1275`	`}`
	`1276`	`+`
	`1277`	`+ ee.correspondingClass?.let {`
	`1278`	`+ extractDeclaration(it, extractPrivateMembers, extractFunctionBodies)`
	`1279`	`+ }`
`1276`	`1280`	`}`
`1277`	`1281`	`}`
`1278`	`1282`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`\| clinit.kt:0:0:0:0 \| <clinit> \| file://:0:0:0:0 \| void \|`
`2`	`2`	`\| enumClass.kt:0:0:0:0 \| <clinit> \| file://:0:0:0:0 \| void \|`
	`3`	`+\| enumClass.kt:0:0:0:0 \| <clinit> \| file://:0:0:0:0 \| void \|`