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

Add direct field access support

Browse Source
This commit is contained in:
Tamas Vajk
2021-11-10 14:17:06 +01:00
committed by Ian Lynagh
parent b741dea100
commit d0c470dbac
4 changed files with 68 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
View File

@@ -1912,6 +1912,18 @@ open class KotlinFileExtractor(
tw.writeVariableBinding(id, vId)
}
}
is IrGetField -> {
val exprParent = parent.expr(e, callable)
val id = tw.getFreshIdLabel<DbVaraccess>()
val type = useType(e.type)
val locId = tw.getLocation(e)
tw.writeExprs_varaccess(id, type.javaResult.id, type.kotlinResult.id, exprParent.parent, exprParent.idx)
tw.writeHasLocation(id, locId)
tw.writeCallableEnclosingExpr(id, callable)
val owner = e.symbol.owner
val vId = useField(owner)
tw.writeVariableBinding(id, vId)
}
is IrGetEnumValue -> {
val exprParent = parent.expr(e, callable)
val id = tw.getFreshIdLabel<DbVaraccess>()
@@ -1924,7 +1936,8 @@ open class KotlinFileExtractor(
val vId = useEnumEntry(owner)
tw.writeVariableBinding(id, vId)
}
is IrSetValue -> {
is IrSetValue,
is IrSetField -> {
val exprParent = parent.expr(e, callable)
val id = tw.getFreshIdLabel<DbAssignexpr>()
val type = useType(e.type)
@@ -1934,14 +1947,24 @@ open class KotlinFileExtractor(
tw.writeCallableEnclosingExpr(id, callable)
val lhsId = tw.getFreshIdLabel<DbVaraccess>()
val lhsType = useType(e.symbol.owner.type)
tw.writeExprs_varaccess(lhsId, lhsType.javaResult.id, lhsType.kotlinResult.id, id, 0)
tw.writeHasLocation(id, locId)
tw.writeCallableEnclosingExpr(lhsId, callable)
val vId = useValueDeclaration(e.symbol.owner)
tw.writeVariableBinding(lhsId, vId)
extractExpressionExpr(e.value, callable, id, 1)
if (e is IrSetValue) {
val lhsType = useType(e.symbol.owner.type)
tw.writeExprs_varaccess(lhsId, lhsType.javaResult.id, lhsType.kotlinResult.id, id, 0)
val vId = useValueDeclaration(e.symbol.owner)
tw.writeVariableBinding(lhsId, vId)
extractExpressionExpr(e.value, callable, id, 1)
} else if (e is IrSetField) {
val lhsType = useType(e.symbol.owner.type)
tw.writeExprs_varaccess(lhsId, lhsType.javaResult.id, lhsType.kotlinResult.id, id, 0)
val vId = useField(e.symbol.owner)
tw.writeVariableBinding(lhsId, vId)
extractExpressionExpr(e.value, callable, id, 1)
} else {
logger.warnElement(Severity.ErrorSevere, "Unhandled IrSet* element.", e)
}
}
is IrWhen -> {
val exprParent = parent.expr(e, callable)