hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-18 01:33:15 +01: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
}
}