Kotlin: find java-kotlin equivalent functions by erased parameter types

Author: tamasvajk

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

@@ -1277,10 +1277,7 @@ open class KotlinUsesExtractor(
                         javaClass.declarations.findSubType<IrFunction> { decl ->
                             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 }
+                            decl.valueParameters.zip(f.valueParameters).all { p -> erase(p.first.type) == erase(p.second.type) }
                         } ?:
                         // Or if there is none, look for the only viable overload
                         javaClass.declarations.singleOrNullSubType<IrFunction> { decl ->

java/ql/test/kotlin/library-tests/java-map-methods/test.expected

@@ -1,5 +1,4 @@
 diagnostics
-| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.collections.MutableList.remove in java.util.List |
 #select
 | Integer |
 | Object |