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

Extract field initializers

Browse Source
This commit is contained in:
Chris Smowton
2022-04-14 14:59:11 +01:00
committed by Ian Lynagh
parent 9e8e99f4c3
commit a317dc4246
3 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -580,42 +580,49 @@ open class KotlinFileExtractor(
// Extract field initializers and init blocks (the latter can only occur in object initializers)
var idx = 0
fun extractFieldInitializer(f: IrField) {
val initializer = f.initializer
if (f.isStatic != extractStaticInitializers || initializer == null) {
return
}
val expr = initializer.expression
val declLocId = tw.getLocation(f)
val stmtId = tw.getFreshIdLabel<DbExprstmt>()
tw.writeStmts_exprstmt(stmtId, blockAndFunctionId.first, idx++, blockAndFunctionId.second)
tw.writeHasLocation(stmtId, declLocId)
val assignmentId = tw.getFreshIdLabel<DbAssignexpr>()
val type = useType(expr.type)
tw.writeExprs_assignexpr(assignmentId, type.javaResult.id, stmtId, 0)
tw.writeExprsKotlinType(assignmentId, type.kotlinResult.id)
tw.writeHasLocation(assignmentId, declLocId)
tw.writeCallableEnclosingExpr(assignmentId, blockAndFunctionId.second)
tw.writeStatementEnclosingExpr(assignmentId, stmtId)
tw.writeKtInitializerAssignment(assignmentId)
val lhsId = tw.getFreshIdLabel<DbVaraccess>()
val lhsType = useType(f.type)
tw.writeExprs_varaccess(lhsId, lhsType.javaResult.id, assignmentId, 0)
tw.writeExprsKotlinType(lhsId, lhsType.kotlinResult.id)
tw.writeHasLocation(lhsId, declLocId)
tw.writeCallableEnclosingExpr(lhsId, blockAndFunctionId.second)
tw.writeStatementEnclosingExpr(lhsId, stmtId)
val vId = useField(f)
tw.writeVariableBinding(lhsId, vId)
extractExpressionExpr(expr, blockAndFunctionId.second, assignmentId, 1, stmtId)
}
for (decl in declarations) {
when (decl) {
is IrProperty -> {
val backingField = decl.backingField
val initializer = backingField?.initializer
if (backingField == null || backingField.isStatic != extractStaticInitializers || initializer == null) {
continue
}
val expr = initializer.expression
val declLocId = tw.getLocation(decl)
val stmtId = tw.getFreshIdLabel<DbExprstmt>()
tw.writeStmts_exprstmt(stmtId, blockAndFunctionId.first, idx++, blockAndFunctionId.second)
tw.writeHasLocation(stmtId, declLocId)
val assignmentId = tw.getFreshIdLabel<DbAssignexpr>()
val type = useType(expr.type)
tw.writeExprs_assignexpr(assignmentId, type.javaResult.id, stmtId, 0)
tw.writeExprsKotlinType(assignmentId, type.kotlinResult.id)
tw.writeHasLocation(assignmentId, declLocId)
tw.writeCallableEnclosingExpr(assignmentId, blockAndFunctionId.second)
tw.writeStatementEnclosingExpr(assignmentId, stmtId)
tw.writeKtInitializerAssignment(assignmentId)
val lhsId = tw.getFreshIdLabel<DbVaraccess>()
val lhsType = useType(backingField.type)
tw.writeExprs_varaccess(lhsId, lhsType.javaResult.id, assignmentId, 0)
tw.writeExprsKotlinType(lhsId, lhsType.kotlinResult.id)
tw.writeHasLocation(lhsId, declLocId)
tw.writeCallableEnclosingExpr(lhsId, blockAndFunctionId.second)
tw.writeStatementEnclosingExpr(lhsId, stmtId)
val vId = useField(backingField)
tw.writeVariableBinding(lhsId, vId)
extractExpressionExpr(expr, blockAndFunctionId.second, assignmentId, 1, stmtId)
decl.backingField?.let { extractFieldInitializer(it) }
}
is IrField -> {
extractFieldInitializer(decl)
}
is IrAnonymousInitializer -> {
if (decl.isStatic) {

7
java/ql/test/kotlin/library-tests/interface-delegate/test.expected
View File

@@ -1,5 +1,8 @@
fields
| intfDelegate.kt:7:26:9:1 | $$delegate_0 | intfDelegate.kt:7:26:9:1 | <Stmt> |
#select
| intfDelegate.kt:0:0:0:0 | f | intfDelegate.kt:7:1:10:1 | Concrete |
| intfDelegate.kt:3:3:3:15 | f | intfDelegate.kt:1:1:5:1 | Intf |
| intfDelegate.kt:7:1:10:1 | Concrete | intfDelegate.kt:7:1:10:1 | Concrete |
| intfDelegate.kt:7:26:9:1 | | intfDelegate.kt:7:26:9:1 | |
| intfDelegate.kt:8:12:8:28 | f | intfDelegate.kt:7:26:9:1 | |
| intfDelegate.kt:7:26:9:1 | | intfDelegate.kt:7:26:9:1 | new Intf(...) { ... } |
| intfDelegate.kt:8:12:8:28 | f | intfDelegate.kt:7:26:9:1 | new Intf(...) { ... } |

4
java/ql/test/kotlin/library-tests/interface-delegate/test.ql
View File

@@ -1,5 +1,9 @@
import java
query predicate fields(Field f, Expr init) {
f.getInitializer() = init
}
from Callable c
where c.fromSource()
select c, c.getDeclaringType()