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

Always extract static initializers if a class has static members

Browse Source 
This may not be necessary for anonymous objects, but it is certainly unrelated to `init { ... }` blocks.
This commit is contained in:
Chris Smowton
2022-04-14 15:29:23 +01:00
committed by Ian Lynagh
parent e21a60bb4b
commit 375199508e
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,8 +98,7 @@ open class KotlinFileExtractor(
if (isExternalDeclaration(declaration)) {
extractExternalClassLater(declaration)
} else {
val extractStaticInit = declaration.declarations.none { it is IrAnonymousInitializer }
extractClassSource(declaration, true, extractStaticInit)
extractClassSource(declaration, extractDeclarations = true, extractStaticInitializer = true)
}
}
is IrFunction -> {
@@ -350,8 +349,7 @@ open class KotlinFileExtractor(
}
private fun extractLocalTypeDeclStmt(c: IrClass, callable: Label<out DbCallable>, parent: Label<out DbStmtparent>, idx: Int) {
val extractStaticInit = c.declarations.none { it is IrAnonymousInitializer }
val id = extractClassSource(c, true, extractStaticInit).cast<DbClass>()
val id = extractClassSource(c, extractDeclarations = true, extractStaticInitializer = true).cast<DbClass>()
extractLocalTypeDeclStmt(id, c, callable, parent, idx)
}