hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-18 18:10:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10732 from smowton/smowton/fix/kotlin-enum-corresponding-classes

Browse Source 
Koltin: Extract the corresponding classes of enum entries
This commit is contained in:
Chris Smowton
2022-10-10 15:04:02 +01:00
committed by GitHub
parent b597896bf2 2df1d63d1c
commit dfdfd39bcc
6 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
View File

@@ -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,7 +1265,7 @@ 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)
@@ -1273,6 +1273,10 @@ open class KotlinFileExtractor(
extractTypeAccess(type, locId, fieldDeclarationId, 0)
}
ee.correspondingClass?.let {
extractDeclaration(it, extractPrivateMembers, extractFunctionBodies)
}
}
}
}