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

Handle more cases of qualified this references

Browse Source
This commit is contained in:
Tamas Vajk
2022-02-11 13:10:15 +01:00
committed by Ian Lynagh
parent 7fe260c1a2
commit 616f20fa52
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1934,17 +1934,27 @@ open class KotlinFileExtractor(
tw.writeCallableEnclosingExpr(id, callable) tw.writeCallableEnclosingExpr(id, callable)
tw.writeStatementEnclosingExpr(id, exprParent.enclosingStmt) tw.writeStatementEnclosingExpr(id, exprParent.enclosingStmt)
fun extractTypeAccess(parent: IrClass){
extractTypeAccess(parent.typeWith(listOf()), locId, callable, id, 0, exprParent.enclosingStmt)
}
when(val ownerParent = owner.parent) { when(val ownerParent = owner.parent) {
is IrFunction -> { is IrFunction -> {
if (ownerParent.dispatchReceiverParameter == owner && if (ownerParent.dispatchReceiverParameter == owner &&
ownerParent.extensionReceiverParameter != null) { ownerParent.extensionReceiverParameter != null) {
logger.errorElement("Function-qualifier for this", e)
val ownerParent2 = ownerParent.parent
if (ownerParent2 is IrClass){
extractTypeAccess(ownerParent2)
} else {
logger.errorElement("Unhandled qualifier for this", e)
}
} }
} }
is IrClass -> { is IrClass -> {
if (ownerParent.thisReceiver == owner) { if (ownerParent.thisReceiver == owner) {
// TODO: Type arguments extractTypeAccess(ownerParent)
extractTypeAccess(ownerParent.typeWith(listOf()), locId, callable, id, 0, exprParent.enclosingStmt)
} }
} }
else -> { else -> {

2
java/ql/test/kotlin/library-tests/this/this.expected
View File

@@ -9,7 +9,7 @@
| this.kt:20:42:20:45 | this | file://:0:0:0:0 | <none> | | this.kt:20:42:20:45 | this | file://:0:0:0:0 | <none> |
| this.kt:24:34:24:37 | this | file://:0:0:0:0 | <none> | | this.kt:24:34:24:37 | this | file://:0:0:0:0 | <none> |
| this.kt:29:38:29:41 | this | file://:0:0:0:0 | <none> | | this.kt:29:38:29:41 | this | file://:0:0:0:0 | <none> |
| this.kt:30:29:30:38 | this | file://:0:0:0:0 | <none> | | this.kt:30:29:30:38 | Inner.this | this.kt:30:29:30:38 | Inner |
| this.kt:31:29:31:38 | Outer.this | this.kt:31:29:31:38 | Outer | | this.kt:31:29:31:38 | Outer.this | this.kt:31:29:31:38 | Outer |
| this.kt:32:38:32:54 | this | file://:0:0:0:0 | <none> | | this.kt:32:38:32:54 | this | file://:0:0:0:0 | <none> |
| this.kt:37:13:37:22 | Outer.this | this.kt:37:13:37:22 | Outer | | this.kt:37:13:37:22 | Outer.this | this.kt:37:13:37:22 | Outer |

9
java/ql/test/kotlin/library-tests/variables/variableAccesses.expected
View File

@@ -10,12 +10,15 @@ instAcc
| variables.kt:21:11:21:15 | this | | variables.kt:21:11:21:15 | this |
| variables.kt:24:9:24:9 | this | | variables.kt:24:9:24:9 | this |
| variables.kt:25:9:25:9 | this | | variables.kt:25:9:25:9 | this |
| variables.kt:26:9:26:12 | this | | variables.kt:26:9:26:12 | C2.this |
| variables.kt:27:9:27:12 | this | | variables.kt:27:9:27:12 | this |
| variables.kt:28:9:28:12 | this | | variables.kt:28:9:28:12 | this |
| variables.kt:31:9:31:15 | this | | variables.kt:31:9:31:15 | C2.this |
| variables.kt:32:9:32:15 | this | | variables.kt:32:9:32:15 | C2.this |
| variables.kt:41:13:41:16 | this | | variables.kt:41:13:41:16 | this |
| variables.kt:42:13:42:19 | C3.this | | variables.kt:42:13:42:19 | C3.this |
instAccQualifier instAccQualifier
| variables.kt:26:9:26:12 | C2.this | variables.kt:26:9:26:12 | C2 |
| variables.kt:31:9:31:15 | C2.this | variables.kt:31:9:31:15 | C2 |
| variables.kt:32:9:32:15 | C2.this | variables.kt:32:9:32:15 | C2 |
| variables.kt:42:13:42:19 | C3.this | variables.kt:42:13:42:19 | C3 | | variables.kt:42:13:42:19 | C3.this | variables.kt:42:13:42:19 | C3 |