hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-22 11:46:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11106 from tamasvajk/kotlin-binop-ext

Browse Source 
Kotlin: Extract extension binary operators
This commit is contained in:
Tamás Vajk
2022-11-04 12:41:06 +01:00
committed by GitHub
parent 2bec4479e7 16cb4c5aaa
commit 545dd8b8d8
8 changed files with 2508 additions and 2428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2235,6 +2235,9 @@ open class KotlinFileExtractor(
result
}
private fun isFunction(target: IrFunction, pkgName: String, classNameLogged: String, classNamePredicate: (String) -> Boolean, vararg fNames: String, isNullable: Boolean? = false) =
fNames.any { isFunction(target, pkgName, classNameLogged, classNamePredicate, it, isNullable) }
private fun isFunction(target: IrFunction, pkgName: String, classNameLogged: String, classNamePredicate: (String) -> Boolean, fName: String, isNullable: Boolean? = false): Boolean {
val verbose = false
fun verboseln(s: String) { if(verbose) println(s) }
@@ -2291,7 +2294,7 @@ open class KotlinFileExtractor(
isFunction(target, "kotlin", "Double", fName)
}
private fun isNumericFunction(target: IrFunction, fNames: List<String>) = fNames.any { isNumericFunction(target, it) }
private fun isNumericFunction(target: IrFunction, vararg fNames: String) = fNames.any { isNumericFunction(target, it) }
private fun isArrayType(typeName: String) =
when(typeName) {
@@ -2428,10 +2431,18 @@ open class KotlinFileExtractor(
binopReceiver(id, c.dispatchReceiver, "Dispatch receiver")
}
fun binopExt(id: Label<out DbExpr>) {
binopReceiver(id, c.extensionReceiver, "Extension receiver")
}
fun unaryopDisp(id: Label<out DbExpr>) {
unaryopReceiver(id, c.dispatchReceiver, "Dispatch receiver")
}
fun unaryopExt(id: Label<out DbExpr>) {
unaryopReceiver(id, c.extensionReceiver, "Extension receiver")
}
val dr = c.dispatchReceiver
when {
isFunction(target, "kotlin", "String", "plus", false) -> {
@@ -2446,7 +2457,7 @@ open class KotlinFileExtractor(
extractRawMethodAccess(stringPlusFn, c, c.type, callable, parent, idx, enclosingStmt, listOf(c.extensionReceiver, c.getValueArgument(0)), null, null)
}
}
isNumericFunction(target, listOf("plus", "minus", "times", "div", "rem", "and", "or", "xor", "shl", "shr", "ushr")) -> {
isNumericFunction(target, "plus", "minus", "times", "div", "rem", "and", "or", "xor", "shl", "shr", "ushr") -> {
val type = useType(c.type)
val id: Label<out DbExpr> = when (val targetName = target.name.asString()) {
"plus" -> {
@@ -2510,7 +2521,10 @@ open class KotlinFileExtractor(
}
}
tw.writeExprsKotlinType(id, type.kotlinResult.id)
binopDisp(id)
if (isFunction(target, "kotlin", "Byte or Short", { it == "Byte" || it == "Short" }, "and", "or", "xor"))
binopExt(id)
else
binopDisp(id)
}
// != gets desugared into not and ==. Here we resugar it.
c.origin == IrStatementOrigin.EXCLEQ && isFunction(target, "kotlin", "Boolean", "not") && c.valueArgumentsCount == 0 && dr != null && dr is IrCall && isBuiltinCallInternal(dr, "EQEQ") -> {
@@ -2541,7 +2555,7 @@ open class KotlinFileExtractor(
tw.writeExprsKotlinType(id, type.kotlinResult.id)
unaryopDisp(id)
}
isNumericFunction(target, listOf("inv", "unaryMinus", "unaryPlus")) -> {
isNumericFunction(target, "inv", "unaryMinus", "unaryPlus") -> {
val type = useType(c.type)
val id: Label<out DbExpr> = when (val targetName = target.name.asString()) {
"inv" -> {
@@ -2566,7 +2580,7 @@ open class KotlinFileExtractor(
}
tw.writeExprsKotlinType(id, type.kotlinResult.id)
if (isFunction(target, "kotlin", "Byte or Short", { it == "Byte" || it == "Short" }, "inv"))
unaryopReceiver(id, c.extensionReceiver, "Extension receiver")
unaryopExt(id)
else
unaryopDisp(id)
}