Kotlin: Lookup getter methods based on special JVM method mapping

Author: tamasvajk

java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt

@@ -1191,20 +1191,22 @@ open class KotlinUsesExtractor(
         else
             f.parentClassOrNull?.let { parentClass ->
                 getJavaEquivalentClass(parentClass)?.let { javaClass ->
-                    if (javaClass != parentClass)
+                    if (javaClass != parentClass) {
+                        val jvmName = getSpecialJvmName(f) ?: f.name.asString()
                         // Look for an exact type match...
                         javaClass.declarations.findSubType<IrFunction> { decl ->
-                            decl.name == f.name &&
-                            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)
-                            // Differing only by nullability would also be insignificant if it came up.
-                            decl.valueParameters.zip(f.valueParameters).all { p -> p.first.type.classifierOrNull == p.second.type.classifierOrNull }
+                            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)
+                                    // Differing only by nullability would also be insignificant if it came up.
+                                    decl.valueParameters.zip(f.valueParameters)
+                                        .all { p -> p.first.type.classifierOrNull == p.second.type.classifierOrNull }
                         } ?:
                         // Or if there is none, look for the only viable overload
                         javaClass.declarations.singleOrNullSubType<IrFunction> { decl ->
-                            decl.name == f.name &&
-                            decl.valueParameters.size == f.valueParameters.size
+                            decl.name.asString() == jvmName &&
+                                    decl.valueParameters.size == f.valueParameters.size
                         } ?:
                         // Or check property accessors:
                         (f.propertyIfAccessor as? IrProperty)?.let { kotlinProp ->
@@ -1223,6 +1225,7 @@ open class KotlinUsesExtractor(
                             }
                             null
                         }
+                    }
                     else
                         null
                 }

java/kotlin-extractor/src/main/kotlin/utils/JvmNames.kt

@@ -57,7 +57,7 @@ private val specialFunctions = mapOf(
 
 private val specialFunctionShortNames = specialFunctions.keys.map { it.functionName }.toSet()
 
-private fun getSpecialJvmName(f: IrFunction): String? {
+fun getSpecialJvmName(f: IrFunction): String? {
     if (specialFunctionShortNames.contains(f.name) && f is IrSimpleFunction) {
         f.allOverriddenIncludingSelf().forEach { overriddenFunc ->
             overriddenFunc.parentClassOrNull?.fqNameWhenAvailable?.let { parentFqName ->

java/ql/test/kotlin/library-tests/special-method-getters/test.expected

@@ -1,13 +1,6 @@
 diag
-| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.CharSequence.<get-length> in java.lang.CharSequence |
-| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.collections.Collection.<get-size> in java.util.Collection |
-| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.collections.Collection.<get-size> in java.util.Collection |
-| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.collections.Map.<get-entries> in java.util.Map |
-| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.collections.Map.<get-keys> in java.util.Map |
-| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.collections.Map.<get-size> in java.util.Map |
-| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.collections.Map.<get-values> in java.util.Map |
 #select
-| test.kt:1:84:1:89 | length(...) | kotlin.CharSequence | length |
+| test.kt:1:84:1:89 | length(...) | java.lang.CharSequence | length |
 | test.kt:1:97:1:100 | size(...) | java.util.Collection<String> | size |
 | test.kt:1:108:1:111 | size(...) | java.util.Map<String,String> | size |
 | test.kt:1:119:1:122 | keySet(...) | java.util.Map<String,String> | keySet |