hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-18 09:43:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix property references to fake overrides

Browse Source
This commit is contained in:
Tamas Vajk
2022-03-14 16:43:32 +01:00
committed by Ian Lynagh
parent 4eb1e3a47b
commit d6feb58bfc
4 changed files with 89 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2771,7 +2771,7 @@ open class KotlinFileExtractor(
writeExpressionMetadataToTrapFile(callId, labels.methodId, retId)
val callableId = useFunction<DbCallable>(target.owner, classTypeArgsIncludingOuterClasses)
val callableId = useFunction<DbCallable>(target.owner.realOverrideTarget, classTypeArgsIncludingOuterClasses)
@Suppress("UNCHECKED_CAST")
tw.writeCallableBinding(callId as Label<out DbCaller>, callableId)
@@ -2897,7 +2897,7 @@ open class KotlinFileExtractor(
if (getter != null) {
val getterParameterTypes = parameterTypes.dropLast(1)
val getLabels = addFunctionManual(tw.getFreshIdLabel(), "get", getterParameterTypes, parameterTypes.last(), classId, locId)
val getterCallableId = useFunction<DbCallable>(getter.owner, classTypeArguments)
val getterCallableId = useFunction<DbCallable>(getter.owner.realOverrideTarget, classTypeArguments)
helper.extractCallToReflectionTarget(
getLabels,
@@ -2929,7 +2929,7 @@ open class KotlinFileExtractor(
if (setter != null) {
val setLabels = addFunctionManual(tw.getFreshIdLabel(), "set", parameterTypes, pluginContext.irBuiltIns.unitType, classId, locId)
val setterCallableId = useFunction<DbCallable>(setter.owner, classTypeArguments)
val setterCallableId = useFunction<DbCallable>(setter.owner.realOverrideTarget, classTypeArguments)
helper.extractCallToReflectionTarget(
setLabels,
@@ -3043,7 +3043,7 @@ open class KotlinFileExtractor(
dispatchReceiverIdx = -1
}
val targetCallableId = useFunction<DbCallable>(target.owner, classTypeArguments)
val targetCallableId = useFunction<DbCallable>(target.owner.realOverrideTarget, classTypeArguments)
val locId = tw.getLocation(functionReferenceExpr)
val javaResult = TypeResult(tw.getFreshIdLabel<DbClass>(), "", "")