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

Explicitly specify whether a dispatch or an extension receiver is intended

Browse Source
This commit is contained in:
Chris Smowton
2022-02-04 16:00:05 +00:00
committed by Ian Lynagh
parent 377bd8f2e9
commit 629af664c6
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1182,16 +1182,15 @@ open class KotlinFileExtractor(
extractMethodAccess(func as IrFunction, false)
}
fun binopDisp(id: Label<out DbExpr>) {
fun binopReceiver(id: Label<out DbExpr>, receiver: IrExpression?, receiverDescription: String) {
val locId = tw.getLocation(c)
tw.writeHasLocation(id, locId)
tw.writeCallableEnclosingExpr(id, callable)
tw.writeStatementEnclosingExpr(id, enclosingStmt)
val receiver = c.dispatchReceiver ?: c.extensionReceiver
if(receiver == null) {
logger.warnElement(Severity.ErrorSevere, "Receiver not found", c)
logger.warnElement(Severity.ErrorSevere, "$receiverDescription not found", c)
} else {
extractExpressionExpr(receiver, callable, id, 0, enclosingStmt)
}
@@ -1209,6 +1208,20 @@ open class KotlinFileExtractor(
}
}
}
/**
* Populate the lhs of a binary op from this call's dispatch receiver, and the rhs from its sole argument.
*/
fun binopDisp(id: Label<out DbExpr>) {
binopReceiver(id, c.dispatchReceiver, "Dispatch receiver")
}
/**
* Populate the lhs of a binary op from this call's extension receiver, and the rhs from its sole argument.
*/
fun binopExtensionMethod(id: Label<out DbExpr>) {
binopReceiver(id, c.extensionReceiver, "Extension receiver")
}
val dr = c.dispatchReceiver
when {
@@ -1219,7 +1232,10 @@ open class KotlinFileExtractor(
val type = useType(c.type)
tw.writeExprs_addexpr(id, type.javaResult.id, parent, idx)
tw.writeExprsKotlinType(id, type.kotlinResult.id)
binopDisp(id)
if (c.extensionReceiver != null)
binopExtensionMethod(id)
else
binopDisp(id)
}
isFunction("kotlin", "String", "plus", true) -> {
findJdkIntrinsicOrWarn("stringPlus", c)?.let { stringPlusFn ->