hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-25 00:27:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

KE2: Extract binary plus on numeric types

Browse Source
This commit is contained in:
Tamas Vajk
2024-10-10 14:30:24 +02:00
parent 643419a32f
commit 7e8b20d200
2 changed files with 66 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
View File

@@ -3515,18 +3515,6 @@ OLD: KE1
isNullable: Boolean? = false
) = isFunction(target, pkgName, className, { it == className }, fName, isNullable)
private fun isNumericFunction(target: IrFunction, fName: String): Boolean {
return isFunction(target, "kotlin", "Int", fName) ||
isFunction(target, "kotlin", "Byte", fName) ||
isFunction(target, "kotlin", "Short", fName) ||
isFunction(target, "kotlin", "Long", fName) ||
isFunction(target, "kotlin", "Float", fName) ||
isFunction(target, "kotlin", "Double", fName)
}
private fun isNumericFunction(target: IrFunction, vararg fNames: String) =
fNames.any { isNumericFunction(target, it) }
private fun isArrayType(typeName: String) =
when (typeName) {
"Array" -> true
@@ -3747,11 +3735,6 @@ OLD: KE1
val type = useType(c.type)
val id: Label<out DbExpr> =
when (val targetName = target.name.asString()) {
"plus" -> {
val id = tw.getFreshIdLabel<DbAddexpr>()
tw.writeExprs_addexpr(id, type.javaResult.id, parent, idx)
id
}
"minus" -> {
val id = tw.getFreshIdLabel<DbSubexpr>()
tw.writeExprs_subexpr(id, type.javaResult.id, parent, idx)

66
java/kotlin-extractor2/src/main/kotlin/entities/Expression.kt
View File

@@ -3,6 +3,10 @@ package com.github.codeql
import com.github.codeql.KotlinFileExtractor.StmtExprParent
import org.jetbrains.kotlin.KtNodeTypes
import org.jetbrains.kotlin.analysis.api.KaSession
import org.jetbrains.kotlin.analysis.api.resolution.KaSimpleFunctionCall
import org.jetbrains.kotlin.analysis.api.resolution.KaSuccessCallInfo
import org.jetbrains.kotlin.analysis.api.resolution.symbol
import org.jetbrains.kotlin.analysis.api.symbols.KaFunctionSymbol
import org.jetbrains.kotlin.analysis.api.types.KaType
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.parsing.parseNumericLiteral
@@ -211,6 +215,64 @@ OLD: KE1
}
*/
private fun isFunction(
symbol: KaFunctionSymbol,
packageName: String,
className: String,
functionName: String
): Boolean {
return symbol.callableId?.packageName?.asString() == packageName &&
symbol.callableId?.className?.asString() == className &&
symbol.callableId?.callableName?.asString() == functionName
}
private fun isNumericFunction(target: KaFunctionSymbol, fName: String): Boolean {
return isFunction(target, "kotlin", "Int", fName) ||
isFunction(target, "kotlin", "Byte", fName) ||
isFunction(target, "kotlin", "Short", fName) ||
isFunction(target, "kotlin", "Long", fName) ||
isFunction(target, "kotlin", "Float", fName) ||
isFunction(target, "kotlin", "Double", fName)
}
context(KaSession)
private fun KotlinFileExtractor.extractBinaryExpression(
expression: KtBinaryExpression,
callable: Label<out DbCallable>,
parent: StmtExprParent
) {
val op = expression.operationToken
val target = ((expression.resolveToCall() as? KaSuccessCallInfo)?.call as? KaSimpleFunctionCall)?.symbol
when (op) {
KtTokens.PLUS -> {
if (target == null) {
TODO()
}
if (isNumericFunction(target, "plus")) {
val id = tw.getFreshIdLabel<DbAddexpr>()
val type = useType(expression.expressionType)
val exprParent = parent.expr(expression, callable)
tw.writeExprs_addexpr(id, type.javaResult.id, exprParent.parent, exprParent.idx)
tw.writeExprsKotlinType(id, type.kotlinResult.id)
extractExprContext(id, tw.getLocation(expression), callable, exprParent.enclosingStmt)
extractExpressionExpr(expression.left!!, callable, id, 0, exprParent.enclosingStmt)
extractExpressionExpr(expression.right!!, callable, id, 1, exprParent.enclosingStmt)
return
}
TODO()
}
else -> TODO()
}
}
context(KaSession)
private fun KotlinFileExtractor.extractExpression(
e: KtExpression,
@@ -225,6 +287,10 @@ private fun KotlinFileExtractor.extractExpression(
extractExpression(e.baseExpression!!, callable, parent)
}
is KtBinaryExpression -> {
extractBinaryExpression(e, callable, parent)
}
is KtIsExpression -> {
val locId = tw.getLocation(e)