Change extracted base type of function references

tamasvajk · igfoo · commit ff5bbee75afa · 2022-05-10T19:51:18.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -2458,7 +2458,7 @@ open class KotlinFileExtractor(
             /*
              * Extract generated class:
              * ```
-             * class C : Any, kotlin.FunctionI<T0,T1, ... TI, R> {
+             * class C : kotlin.jvm.internal.FunctionReference, kotlin.FunctionI<T0,T1, ... TI, R> {
              *   private dispatchReceiver: TD
              *   private extensionReceiver: TE
              *   constructor(dispatchReceiver: TD, extensionReceiver: TE) {
@@ -2473,7 +2473,7 @@ open class KotlinFileExtractor(
              * ```
              * or in case of big arity lambdas ????
              * ```
-             * class C : Any, kotlin.FunctionN<R> {
+             * class C : kotlin.jvm.internal.FunctionReference, kotlin.FunctionN<R> {
              *   private receiver: TD
              *   constructor(receiver: TD) { super(); this.receiver = receiver; }
              *   fun invoke(vararg args: Any?): R {
@@ -2518,7 +2518,10 @@ open class KotlinFileExtractor(
             )
 
             val currentDeclaration = declarationStack.peek()
-            val id = extractGeneratedClass(ids, listOf(pluginContext.irBuiltIns.anyType, fnInterfaceType), locId, currentDeclaration)
+            val baseClass = pluginContext.referenceClass(FqName("kotlin.jvm.internal.FunctionReference"))?.owner?.typeWith()
+                ?: pluginContext.irBuiltIns.anyType
+
+            val id = extractGeneratedClass(ids, listOf(baseClass, fnInterfaceType), locId, currentDeclaration)
 
             val helper = FunctionReferenceHelper(locId, ids)
 
diff --git a/java/ql/test/kotlin/library-tests/reflection/reflection.expected b/java/ql/test/kotlin/library-tests/reflection/reflection.expected
@@ -1,5 +1,5 @@
 variableInitializerType
-| reflection.kt:5:9:5:54 | KFunction<Double> ref | file://<external>/KFunction.class:0:0:0:0 | KFunction<Double> | reflection.kt:5:49:5:54 | new Function2<Ccc,Integer,Double>(...) { ... } | file://<external>/Function2.class:0:0:0:0 | Function2<Ccc,Integer,Double> | false |
-| reflection.kt:5:9:5:54 | KFunction<Double> ref | file://<external>/KFunction.class:0:0:0:0 | KFunction<Double> | reflection.kt:5:49:5:54 | new Function2<Ccc,Integer,Double>(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object | false |
+| reflection.kt:5:9:5:54 | KFunction<Double> ref | file://<external>/KFunction.class:0:0:0:0 | KFunction<Double> | reflection.kt:5:49:5:54 | new Function2<Ccc,Integer,Double>(...) { ... } | file://<external>/Function2.class:0:0:0:0 | Function2<Ccc,Integer,Double> | true |
+| reflection.kt:5:9:5:54 | KFunction<Double> ref | file://<external>/KFunction.class:0:0:0:0 | KFunction<Double> | reflection.kt:5:49:5:54 | new Function2<Ccc,Integer,Double>(...) { ... } | file://<external>/FunctionReference.class:0:0:0:0 | FunctionReference | true |
 invocation
 | reflection.kt:6:21:6:24 | getName(...) | file://<external>/KCallable.class:0:0:0:0 | getName |
