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 #10297 from tamasvajk/kotlin-fix-kotlin-to-java-fn-names

Browse Source 
Kotlin: Lookup getter methods based on special JVM method mapping
This commit is contained in:
Tamás Vajk
2022-09-07 08:56:19 +02:00
committed by GitHub
parent 987870bb62 57f50725ba
commit b1e0d73de8
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1202,10 +1202,11 @@ open class KotlinUsesExtractor(
else
f.parentClassOrNull?.let { parentClass ->
getJavaEquivalentClass(parentClass)?.let { javaClass ->
if (javaClass != parentClass)
if (javaClass != parentClass) {
val jvmName = getJvmName(f) ?: f.name.asString()
// Look for an exact type match...
javaClass.declarations.findSubType<IrFunction> { decl ->
decl.name == f.name &&
decl.name.asString() == jvmName &&
decl.valueParameters.size == f.valueParameters.size &&
// Note matching by classifier not the whole type so that generic arguments are allowed to differ,
// as they always will for method type parameters occurring in parameter types (e.g. <T> toArray(T[] array)
@@ -1214,7 +1215,7 @@ open class KotlinUsesExtractor(
} ?:
// Or if there is none, look for the only viable overload
javaClass.declarations.singleOrNullSubType<IrFunction> { decl ->
decl.name == f.name &&
decl.name.asString() == jvmName &&
decl.valueParameters.size == f.valueParameters.size
} ?:
// Or check property accessors:
@@ -1234,6 +1235,7 @@ open class KotlinUsesExtractor(
}
null
}
}
else
null
}