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

Fix local function reference extraction

Browse Source
This commit is contained in:
Tamas Vajk
2022-03-17 09:25:41 +01:00
committed by Ian Lynagh
parent 62d9b85b46
commit 222f2415e2
6 changed files with 138 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1075,6 +1075,17 @@ open class KotlinFileExtractor(
}
}
private fun extractNewExprForLocalFunction(
ids: LocallyVisibleFunctionLabels,
parent: Label<out DbExprparent>,
locId: Label<DbLocation>,
enclosingCallable: Label<out DbCallable>,
enclosingStmt: Label<out DbStmt>) {
val idNewexpr = extractNewExpr(ids.constructor, ids.type, locId, parent, -1, enclosingCallable, enclosingStmt)
extractTypeAccessRecursive(pluginContext.irBuiltIns.anyType, locId, idNewexpr, -3, enclosingCallable, enclosingStmt)
}
fun extractRawMethodAccess(
syntacticCallTarget: IrFunction,
callsite: IrCall,
@@ -1107,9 +1118,7 @@ open class KotlinFileExtractor(
val methodId = ids.function
tw.writeCallableBinding(id, methodId)
val idNewexpr = extractNewExpr(ids.constructor, ids.type, locId, id, -1, enclosingCallable, enclosingStmt)
extractTypeAccessRecursive(pluginContext.irBuiltIns.anyType, locId, idNewexpr, -3, enclosingCallable, enclosingStmt)
extractNewExprForLocalFunction(ids, id, locId, enclosingCallable, enclosingStmt)
} else {
// Returns true if type is C<T1, T2, ...> where C is declared `class C<T1, T2, ...> { ... }`
fun isUnspecialised(type: IrSimpleType) =
@@ -2797,7 +2806,14 @@ open class KotlinFileExtractor(
useFirstArgAsDispatch = false
} else {
useFirstArgAsDispatch = target.owner.dispatchReceiverParameter != null
if (target.owner.isLocalFunction()) {
val ids = getLocallyVisibleFunctionLabels(target.owner)
extractNewExprForLocalFunction(ids, callId, locId, labels.methodId, retId)
useFirstArgAsDispatch = false
}
else {
useFirstArgAsDispatch = target.owner.dispatchReceiverParameter != null
}
}
val extensionIdxOffset: Int