mirror of
https://github.com/github/codeql.git
synced 2026-05-02 12:15:17 +02:00
Add direct field access support
This commit is contained in:
Tamas Vajk
@@ -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)
|
||||
|
||||
@@ -113,6 +113,7 @@
|
||||
| exprs.kt:64:9:64:18 | ...=... | exprs.kt:64:1:66:1 | <obinit> | AssignExpr |
|
||||
| exprs.kt:64:9:64:18 | n | exprs.kt:64:1:66:1 | <obinit> | VarAccess |
|
||||
| exprs.kt:64:9:64:18 | n | exprs.kt:64:1:66:1 | <obinit> | VarAccess |
|
||||
| exprs.kt:64:9:64:18 | n | exprs.kt:64:9:64:18 | <get-n> | VarAccess |
|
||||
| exprs.kt:65:27:65:31 | new C(...) | exprs.kt:65:5:65:33 | foo | ClassInstanceExpr |
|
||||
| exprs.kt:65:29:65:30 | 42 | exprs.kt:65:5:65:33 | foo | IntegerLiteral |
|
||||
| exprs.kt:68:1:68:18 | <obinit>(...) | exprs.kt:68:6:68:18 | Root | MethodAccess |
|
||||
@@ -148,34 +149,40 @@
|
||||
| exprs.kt:78:31:78:31 | 2 | exprs.kt:72:1:79:1 | typeTests | IntegerLiteral |
|
||||
| exprs.kt:78:42:78:42 | ...=... | exprs.kt:72:1:79:1 | typeTests | AssignExpr |
|
||||
| exprs.kt:78:46:78:46 | 3 | exprs.kt:72:1:79:1 | typeTests | IntegerLiteral |
|
||||
| exprs.kt:82:5:82:25 | r | exprs.kt:81:1:86:1 | foo | LocalVariableDeclExpr |
|
||||
| exprs.kt:82:13:82:13 | p | exprs.kt:81:1:86:1 | foo | VarAccess |
|
||||
| exprs.kt:82:15:82:25 | getBounds(...) | exprs.kt:81:1:86:1 | foo | MethodAccess |
|
||||
| exprs.kt:83:5:85:5 | when ... | exprs.kt:81:1:86:1 | foo | WhenExpr |
|
||||
| exprs.kt:83:8:83:8 | r | exprs.kt:81:1:86:1 | foo | VarAccess |
|
||||
| exprs.kt:83:8:83:16 | ... != ... | exprs.kt:81:1:86:1 | foo | NEExpr |
|
||||
| exprs.kt:83:8:83:16 | ... != ... | exprs.kt:81:1:86:1 | foo | NEExpr |
|
||||
| exprs.kt:83:13:83:16 | null | exprs.kt:81:1:86:1 | foo | NullLiteral |
|
||||
| exprs.kt:84:9:84:29 | r2 | exprs.kt:81:1:86:1 | foo | LocalVariableDeclExpr |
|
||||
| exprs.kt:84:29:84:29 | (...)... | exprs.kt:81:1:86:1 | foo | CastExpr |
|
||||
| exprs.kt:84:29:84:29 | Rectangle | exprs.kt:81:1:86:1 | foo | TypeAccess |
|
||||
| exprs.kt:84:29:84:29 | r | exprs.kt:81:1:86:1 | foo | VarAccess |
|
||||
| exprs.kt:88:1:90:1 | <obinit>(...) | exprs.kt:88:6:90:1 | Direction | MethodAccess |
|
||||
| exprs.kt:88:1:90:1 | new Enum(...) | exprs.kt:88:6:90:1 | Direction | ClassInstanceExpr |
|
||||
| exprs.kt:92:1:96:1 | <obinit>(...) | exprs.kt:92:6:96:1 | Color | MethodAccess |
|
||||
| exprs.kt:92:1:96:1 | new Enum(...) | exprs.kt:92:6:96:1 | Color | ClassInstanceExpr |
|
||||
| exprs.kt:92:18:92:29 | ...=... | exprs.kt:92:1:96:1 | <obinit> | AssignExpr |
|
||||
| exprs.kt:92:18:92:29 | rgb | exprs.kt:92:1:96:1 | <obinit> | VarAccess |
|
||||
| exprs.kt:92:18:92:29 | rgb | exprs.kt:92:1:96:1 | <obinit> | VarAccess |
|
||||
| exprs.kt:99:5:99:31 | south | exprs.kt:98:1:101:1 | enums | LocalVariableDeclExpr |
|
||||
| exprs.kt:99:27:99:31 | SOUTH | exprs.kt:98:1:101:1 | enums | VarAccess |
|
||||
| exprs.kt:100:5:100:27 | green | exprs.kt:98:1:101:1 | enums | LocalVariableDeclExpr |
|
||||
| exprs.kt:100:23:100:27 | GREEN | exprs.kt:98:1:101:1 | enums | VarAccess |
|
||||
| file://:0:0:0:0 | Color | exprs.kt:92:6:96:1 | Color | TypeAccess |
|
||||
| file://:0:0:0:0 | Direction | exprs.kt:88:6:90:1 | Direction | TypeAccess |
|
||||
| exprs.kt:82:5:82:25 | r | exprs.kt:81:1:88:1 | foo | LocalVariableDeclExpr |
|
||||
| exprs.kt:82:13:82:13 | p | exprs.kt:81:1:88:1 | foo | VarAccess |
|
||||
| exprs.kt:82:15:82:25 | getBounds(...) | exprs.kt:81:1:88:1 | foo | MethodAccess |
|
||||
| exprs.kt:83:5:87:5 | when ... | exprs.kt:81:1:88:1 | foo | WhenExpr |
|
||||
| exprs.kt:83:8:83:8 | r | exprs.kt:81:1:88:1 | foo | VarAccess |
|
||||
| exprs.kt:83:8:83:16 | ... != ... | exprs.kt:81:1:88:1 | foo | NEExpr |
|
||||
| exprs.kt:83:8:83:16 | ... != ... | exprs.kt:81:1:88:1 | foo | NEExpr |
|
||||
| exprs.kt:83:13:83:16 | null | exprs.kt:81:1:88:1 | foo | NullLiteral |
|
||||
| exprs.kt:84:9:84:29 | r2 | exprs.kt:81:1:88:1 | foo | LocalVariableDeclExpr |
|
||||
| exprs.kt:84:29:84:29 | (...)... | exprs.kt:81:1:88:1 | foo | CastExpr |
|
||||
| exprs.kt:84:29:84:29 | Rectangle | exprs.kt:81:1:88:1 | foo | TypeAccess |
|
||||
| exprs.kt:84:29:84:29 | r | exprs.kt:81:1:88:1 | foo | VarAccess |
|
||||
| exprs.kt:85:9:85:30 | height | exprs.kt:81:1:88:1 | foo | LocalVariableDeclExpr |
|
||||
| exprs.kt:85:25:85:30 | height | exprs.kt:81:1:88:1 | foo | VarAccess |
|
||||
| exprs.kt:86:9:86:17 | ...=... | exprs.kt:81:1:88:1 | foo | AssignExpr |
|
||||
| exprs.kt:86:21:86:21 | 3 | exprs.kt:81:1:88:1 | foo | IntegerLiteral |
|
||||
| exprs.kt:90:1:92:1 | <obinit>(...) | exprs.kt:90:6:92:1 | Direction | MethodAccess |
|
||||
| exprs.kt:90:1:92:1 | new Enum(...) | exprs.kt:90:6:92:1 | Direction | ClassInstanceExpr |
|
||||
| exprs.kt:94:1:98:1 | <obinit>(...) | exprs.kt:94:6:98:1 | Color | MethodAccess |
|
||||
| exprs.kt:94:1:98:1 | new Enum(...) | exprs.kt:94:6:98:1 | Color | ClassInstanceExpr |
|
||||
| exprs.kt:94:18:94:29 | ...=... | exprs.kt:94:1:98:1 | <obinit> | AssignExpr |
|
||||
| exprs.kt:94:18:94:29 | rgb | exprs.kt:94:1:98:1 | <obinit> | VarAccess |
|
||||
| exprs.kt:94:18:94:29 | rgb | exprs.kt:94:1:98:1 | <obinit> | VarAccess |
|
||||
| exprs.kt:94:18:94:29 | rgb | exprs.kt:94:18:94:29 | <get-rgb> | VarAccess |
|
||||
| exprs.kt:101:5:101:31 | south | exprs.kt:100:1:103:1 | enums | LocalVariableDeclExpr |
|
||||
| exprs.kt:101:27:101:31 | SOUTH | exprs.kt:100:1:103:1 | enums | VarAccess |
|
||||
| exprs.kt:102:5:102:27 | green | exprs.kt:100:1:103:1 | enums | LocalVariableDeclExpr |
|
||||
| exprs.kt:102:23:102:27 | GREEN | exprs.kt:100:1:103:1 | enums | VarAccess |
|
||||
| file://:0:0:0:0 | Color | exprs.kt:94:6:98:1 | Color | TypeAccess |
|
||||
| file://:0:0:0:0 | Direction | exprs.kt:90:6:92:1 | Direction | TypeAccess |
|
||||
| file://:0:0:0:0 | height | exprs.kt:81:1:88:1 | foo | VarAccess |
|
||||
| file://:0:0:0:0 | q | exprs.kt:72:1:79:1 | typeTests | VarAccess |
|
||||
| file://:0:0:0:0 | q | exprs.kt:72:1:79:1 | typeTests | VarAccess |
|
||||
| file://:0:0:0:0 | tmp0 | exprs.kt:4:1:58:1 | topLevelMethod | LocalVariableDeclExpr |
|
||||
| file://:0:0:0:0 | variable | exprs.kt:4:1:58:1 | topLevelMethod | VarAccess |
|
||||
| file://:0:0:0:0 | void | exprs.kt:88:6:90:1 | Direction | TypeAccess |
|
||||
| file://:0:0:0:0 | void | exprs.kt:92:6:96:1 | Color | TypeAccess |
|
||||
| file://:0:0:0:0 | void | exprs.kt:90:6:92:1 | Direction | TypeAccess |
|
||||
| file://:0:0:0:0 | void | exprs.kt:94:6:98:1 | Color | TypeAccess |
|
||||
|
||||
@@ -82,6 +82,8 @@ fun foo(p: Polygon) {
|
||||
val r = p.getBounds()
|
||||
if(r != null) {
|
||||
val r2: Rectangle = r
|
||||
val height = r2.height
|
||||
r2.height = 3
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
varAcc
|
||||
| variables.kt:3:5:3:21 | prop |
|
||||
| variables.kt:3:5:3:21 | prop |
|
||||
| variables.kt:10:1:10:21 | topLevel |
|
||||
| variables.kt:16:11:16:18 | o |
|
||||
| variables.kt:16:11:16:18 | o |
|
||||
| variables.kt:16:11:16:18 | o |
|
||||
instAcc
|
||||
|
||||
Reference in New Issue
Block a user