hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 19:26:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin: Recognise + etc for Double

Browse Source
This commit is contained in:
Ian Lynagh
2021-11-22 13:41:55 +00:00
parent 5b5a6042a9
commit 1b40f78b9c
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -606,6 +606,11 @@ open class KotlinFileExtractor(
return true
}
fun isNumericFunction(fName: String): Boolean {
return isFunction("kotlin", "Int", fName) ||
isFunction("kotlin", "Double", fName)
}
fun binopDisp(id: Label<out DbExpr>) {
val locId = tw.getLocation(c)
tw.writeHasLocation(id, locId)
@@ -635,25 +640,25 @@ open class KotlinFileExtractor(
val dr = c.dispatchReceiver
when {
c.origin == IrStatementOrigin.PLUS &&
(isFunction("kotlin", "Int", "plus") || isFunction("kotlin", "String", "plus")) -> {
(isNumericFunction("plus") || isFunction("kotlin", "String", "plus")) -> {
val id = tw.getFreshIdLabel<DbAddexpr>()
val type = useType(c.type)
tw.writeExprs_addexpr(id, type.javaResult.id, type.kotlinResult.id, parent, idx)
binopDisp(id)
}
c.origin == IrStatementOrigin.MINUS && isFunction("kotlin", "Int", "minus") -> {
c.origin == IrStatementOrigin.MINUS && isNumericFunction("minus") -> {
val id = tw.getFreshIdLabel<DbSubexpr>()
val type = useType(c.type)
tw.writeExprs_subexpr(id, type.javaResult.id, type.kotlinResult.id, parent, idx)
binopDisp(id)
}
c.origin == IrStatementOrigin.DIV && isFunction("kotlin", "Int", "div") -> {
c.origin == IrStatementOrigin.DIV && isNumericFunction("div") -> {
val id = tw.getFreshIdLabel<DbDivexpr>()
val type = useType(c.type)
tw.writeExprs_divexpr(id, type.javaResult.id, type.kotlinResult.id, parent, idx)
binopDisp(id)
}
c.origin == IrStatementOrigin.PERC && isFunction("kotlin", "Int", "rem") -> {
c.origin == IrStatementOrigin.PERC && isNumericFunction("rem") -> {
val id = tw.getFreshIdLabel<DbRemexpr>()
val type = useType(c.type)
tw.writeExprs_remexpr(id, type.javaResult.id, type.kotlinResult.id, parent, idx)
@@ -1456,4 +1461,4 @@ open class KotlinFileExtractor(
private val IrType.isAnonymous: Boolean
get() = ((this as? IrSimpleType)?.classifier?.owner as? IrClass)?.isAnonymousObject ?: false
}
}

4
java/ql/test/kotlin/library-tests/exprs/binop.expected
View File

@@ -10,6 +10,10 @@
| exprs.kt:22:15:22:20 | ... >= ... | exprs.kt:22:15:22:15 | x | exprs.kt:22:20:22:20 | y |
| exprs.kt:23:15:23:21 | ... == ... | exprs.kt:23:15:23:15 | x | exprs.kt:23:21:23:21 | y |
| exprs.kt:24:15:24:21 | ... != ... | exprs.kt:24:15:24:15 | x | exprs.kt:24:21:24:21 | y |
| exprs.kt:32:14:32:20 | ... + ... | exprs.kt:32:14:32:15 | dx | exprs.kt:32:19:32:20 | dy |
| exprs.kt:33:14:33:20 | ... - ... | exprs.kt:33:14:33:15 | dx | exprs.kt:33:19:33:20 | dy |
| exprs.kt:34:14:34:20 | ... / ... | exprs.kt:34:14:34:15 | dx | exprs.kt:34:19:34:20 | dy |
| exprs.kt:35:14:35:20 | ... % ... | exprs.kt:35:14:35:15 | dx | exprs.kt:35:19:35:20 | dy |
| exprs.kt:36:14:36:21 | ... == ... | exprs.kt:36:14:36:15 | dx | exprs.kt:36:20:36:21 | dy |
| exprs.kt:37:14:37:21 | ... != ... | exprs.kt:37:14:37:15 | dx | exprs.kt:37:20:37:21 | dy |
| exprs.kt:38:14:38:20 | ... < ... | exprs.kt:38:14:38:15 | dx | exprs.kt:38:19:38:20 | dy |

8
java/ql/test/kotlin/library-tests/exprs/exprs.expected
View File

@@ -79,19 +79,19 @@
| exprs.kt:31:14:31:16 | 1.0 | exprs.kt:4:1:70:1 | topLevelMethod | DoubleLiteral |
| exprs.kt:32:5:32:20 | d2 | exprs.kt:4:1:70:1 | topLevelMethod | LocalVariableDeclExpr |
| exprs.kt:32:14:32:15 | dx | exprs.kt:4:1:70:1 | topLevelMethod | VarAccess |
| exprs.kt:32:14:32:20 | plus(...) | exprs.kt:4:1:70:1 | topLevelMethod | MethodAccess |
| exprs.kt:32:14:32:20 | ... + ... | exprs.kt:4:1:70:1 | topLevelMethod | AddExpr |
| exprs.kt:32:19:32:20 | dy | exprs.kt:4:1:70:1 | topLevelMethod | VarAccess |
| exprs.kt:33:5:33:20 | d3 | exprs.kt:4:1:70:1 | topLevelMethod | LocalVariableDeclExpr |
| exprs.kt:33:14:33:15 | dx | exprs.kt:4:1:70:1 | topLevelMethod | VarAccess |
| exprs.kt:33:14:33:20 | minus(...) | exprs.kt:4:1:70:1 | topLevelMethod | MethodAccess |
| exprs.kt:33:14:33:20 | ... - ... | exprs.kt:4:1:70:1 | topLevelMethod | SubExpr |
| exprs.kt:33:19:33:20 | dy | exprs.kt:4:1:70:1 | topLevelMethod | VarAccess |
| exprs.kt:34:5:34:20 | d4 | exprs.kt:4:1:70:1 | topLevelMethod | LocalVariableDeclExpr |
| exprs.kt:34:14:34:15 | dx | exprs.kt:4:1:70:1 | topLevelMethod | VarAccess |
| exprs.kt:34:14:34:20 | div(...) | exprs.kt:4:1:70:1 | topLevelMethod | MethodAccess |
| exprs.kt:34:14:34:20 | ... / ... | exprs.kt:4:1:70:1 | topLevelMethod | DivExpr |
| exprs.kt:34:19:34:20 | dy | exprs.kt:4:1:70:1 | topLevelMethod | VarAccess |
| exprs.kt:35:5:35:20 | d5 | exprs.kt:4:1:70:1 | topLevelMethod | LocalVariableDeclExpr |
| exprs.kt:35:14:35:15 | dx | exprs.kt:4:1:70:1 | topLevelMethod | VarAccess |
| exprs.kt:35:14:35:20 | rem(...) | exprs.kt:4:1:70:1 | topLevelMethod | MethodAccess |
| exprs.kt:35:14:35:20 | ... % ... | exprs.kt:4:1:70:1 | topLevelMethod | RemExpr |
| exprs.kt:35:19:35:20 | dy | exprs.kt:4:1:70:1 | topLevelMethod | VarAccess |
| exprs.kt:36:5:36:21 | d6 | exprs.kt:4:1:70:1 | topLevelMethod | LocalVariableDeclExpr |
| exprs.kt:36:14:36:15 | dx | exprs.kt:4:1:70:1 | topLevelMethod | VarAccess |