FIR: make KFunctionX derived from KFunction

compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/StandardClassIds.kt

@@ -48,6 +48,7 @@ object StandardClassIds {
     val KMutableProperty1 = "KMutableProperty1".reflectId()
     val KProperty2 = "KProperty2".reflectId()
     val KMutableProperty2 = "KMutableProperty2".reflectId()
+    val KFunction = "KFunction".reflectId()
 
     val Comparable = "Comparable".baseId()
     val Number = "Number".baseId()

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirBuiltinSymbolProvider.kt

@@ -227,20 +227,28 @@ class FirBuiltinSymbolProvider(val session: FirSession, val kotlinScopeProvider:
                         }
 
                         superTypeRefs += when (kind) {
-                            FunctionClassDescriptor.Kind.Function ->
+                            FunctionClassDescriptor.Kind.Function -> listOf(
                                 buildResolvedTypeRef {
                                     type = ConeClassLikeLookupTagImpl(StandardClassIds.Function)
                                         .constructClassType(arrayOf(typeArguments.last().type), isNullable = false)
                                 }
+                            )
 
-                            FunctionClassDescriptor.Kind.SuspendFunction ->
+                            FunctionClassDescriptor.Kind.SuspendFunction -> listOf(
                                 session.builtinTypes.anyType
+                            )
 
-                            FunctionClassDescriptor.Kind.KFunction ->
+                            FunctionClassDescriptor.Kind.KFunction -> listOf(
+                                buildResolvedTypeRef {
+                                    type = ConeClassLikeLookupTagImpl(StandardClassIds.KFunction)
+                                        .constructClassType(arrayOf(typeArguments.last().type), isNullable = false)
+                                },
                                 createSuperType(FunctionClassDescriptor.Kind.Function)
+                            )
 
-                            FunctionClassDescriptor.Kind.KSuspendFunction ->
+                            FunctionClassDescriptor.Kind.KSuspendFunction -> listOf(
                                 createSuperType(FunctionClassDescriptor.Kind.SuspendFunction)
+                            )
                         }
                         addDeclaration(
                             buildSimpleFunction {

compiler/testData/codegen/box/callableReference/bound/kCallableNameIntrinsic.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // SKIP_SOURCEMAP_REMAPPING
 
 fun box(): String {

compiler/testData/codegen/box/callableReference/function/local/localFunctionName.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-
 fun box(): String {
     fun OK() {}
 

compiler/testData/codegen/box/inlineClasses/functionNameMangling/reflectionForFunctionWithMangledName.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 import kotlin.test.*
 

compiler/testData/codegen/box/reflection/call/bound/javaInstanceMethod.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TODO: investigate should it be ran for JS or not
 // TARGET_BACKEND: JVM
 

compiler/testData/codegen/box/reflection/call/callInstanceJavaMethod.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_REFLECT

compiler/testData/codegen/box/reflection/call/callStaticJavaMethod.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_REFLECT

compiler/testData/codegen/box/reflection/call/equalsHashCodeToString.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS, NATIVE

compiler/testData/codegen/box/reflection/call/simpleConstructor.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS, NATIVE

compiler/testData/codegen/box/reflection/callBy/simpleConstructor.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS, NATIVE

compiler/testData/codegen/box/reflection/constructors/constructorName.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS, NATIVE
 
 // WITH_REFLECT

compiler/testData/codegen/box/reflection/functions/enumValuesValueOf.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR, JS, NATIVE
 // WITH_REFLECT
 

compiler/testData/codegen/box/reflection/functions/javaMethodsSmokeTest.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_REFLECT

compiler/testData/codegen/box/reflection/functions/platformName.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_REFLECT

compiler/testData/codegen/box/reflection/functions/simpleNames.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_REFLECT
 
 import kotlin.test.assertEquals

compiler/testData/codegen/box/reflection/mapping/types/rawTypeArgument.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_REFLECT

compiler/testData/codegen/box/reflection/modifiers/javaVisibility.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_REFLECT

compiler/testData/codegen/box/reflection/noReflectAtRuntime/methodsFromAny/callableReferences.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS

compiler/testData/codegen/box/reflection/parameters/realParameterNames.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // SKIP_JDK6
 // TARGET_BACKEND: JVM
 // WITH_REFLECT

compiler/testData/codegen/box/reflection/parameters/synthesizedParameterNames.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // SKIP_JDK6
 // TARGET_BACKEND: JVM
 // WITH_REFLECT

compiler/testData/codegen/box/reflection/types/platformTypeToString.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_REFLECT

compiler/testData/diagnostics/tests/callableReference/function/extensionFromTopLevel.fir.kt

@@ -17,7 +17,7 @@ fun main() {
     checkSubtype<KFunction2<A, Int, Unit>>(y)
     checkSubtype<KFunction1<A, String>>(z)
 
-    <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><KFunction<Unit>>(x)
+    checkSubtype<KFunction<Unit>>(x)
-    <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><KFunction<Unit>>(y)
+    checkSubtype<KFunction<Unit>>(y)
-    <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><KFunction<String>>(z)
+    checkSubtype<KFunction<String>>(z)
 }

compiler/testData/diagnostics/tests/callableReference/function/memberFromTopLevel.fir.kt

@@ -17,7 +17,7 @@ fun main() {
     checkSubtype<KFunction2<A, Int, Unit>>(y)
     checkSubtype<KFunction1<A, String>>(z)
 
-    <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><KFunction<Unit>>(x)
+    checkSubtype<KFunction<Unit>>(x)
-    <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><KFunction<Unit>>(y)
+    checkSubtype<KFunction<Unit>>(y)
-    <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><KFunction<String>>(z)
+    checkSubtype<KFunction<String>>(z)
 }

compiler/testData/ir/irText/expressions/callableReferences/funWithDefaultParametersAsKCallableStar.fir.txt

@@ -57,17 +57,17 @@ FILE fqName:<root> fileName:/funWithDefaultParametersAsKCallableStar.kt
     BLOCK_BODY
   FUN name:testDefaultsOnlyStar visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useKCallableStar]>#' type=IrErrorType
+      CALL 'public final fun useKCallableStar (fn: kotlin.reflect.KCallable<*>): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        FUNCTION_REFERENCE 'public final fun defaultsOnly (x: kotlin.String): kotlin.Int declared in <root>' type=kotlin.reflect.KFunction0<kotlin.Int> origin=null reflectionTarget=<same>
+        fn: FUNCTION_REFERENCE 'public final fun defaultsOnly (x: kotlin.String): kotlin.Int declared in <root>' type=kotlin.reflect.KFunction0<kotlin.Int> origin=null reflectionTarget=<same>
   FUN name:testRegularAndDefaultsStar visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useKCallableStar]>#' type=IrErrorType
+      CALL 'public final fun useKCallableStar (fn: kotlin.reflect.KCallable<*>): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        FUNCTION_REFERENCE 'public final fun regularAndDefaults (x1: kotlin.String, x2: kotlin.String): kotlin.Int declared in <root>' type=kotlin.reflect.KFunction1<kotlin.String, kotlin.Int> origin=null reflectionTarget=<same>
+        fn: FUNCTION_REFERENCE 'public final fun regularAndDefaults (x1: kotlin.String, x2: kotlin.String): kotlin.Int declared in <root>' type=kotlin.reflect.KFunction1<kotlin.String, kotlin.Int> origin=null reflectionTarget=<same>
   FUN name:testVarargsStar visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useKCallableStar]>#' type=IrErrorType
+      CALL 'public final fun useKCallableStar (fn: kotlin.reflect.KCallable<*>): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        FUNCTION_REFERENCE 'public final fun varargs (vararg xs: kotlin.String): kotlin.Int declared in <root>' type=kotlin.reflect.KFunction1<kotlin.Array<out kotlin.String>, kotlin.Int> origin=null reflectionTarget=<same>
+        fn: FUNCTION_REFERENCE 'public final fun varargs (vararg xs: kotlin.String): kotlin.Int declared in <root>' type=kotlin.reflect.KFunction1<kotlin.Array<out kotlin.String>, kotlin.Int> origin=null reflectionTarget=<same>
   FUN name:testCtorStar visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useKCallableStar]>#' type=IrErrorType
+      CALL 'public final fun useKCallableStar (fn: kotlin.reflect.KCallable<*>): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        FUNCTION_REFERENCE 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.C' type=kotlin.reflect.KFunction0<<root>.C> origin=null reflectionTarget=<same>
+        fn: FUNCTION_REFERENCE 'public constructor <init> (x: kotlin.String) [primary] declared in <root>.C' type=kotlin.reflect.KFunction0<<root>.C> origin=null reflectionTarget=<same>