diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt index 99b8e3d66fa..d2d05d0c441 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt @@ -27,6 +27,7 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.declarations.IrFunction import org.jetbrains.kotlin.ir.declarations.IrModuleFragment +import org.jetbrains.kotlin.ir.descriptors.IrFunctionFactory import org.jetbrains.kotlin.ir.descriptors.WrappedDeclarationDescriptor import org.jetbrains.kotlin.ir.util.DeclarationStubGenerator import org.jetbrains.kotlin.ir.util.ExternalDependenciesGenerator @@ -49,6 +50,7 @@ class JvmIrCodegenFactory(private val phaseConfig: PhaseConfig) : CodegenFactory sourceManager: PsiSourceManager, createCodegen: (IrClass, JvmBackendContext, IrFunction?) -> ClassCodegen?, ) { + irModuleFragment.irBuiltins.functionFactory = IrFunctionFactory(irModuleFragment.irBuiltins, symbolTable) val extensions = JvmGeneratorExtensions() val irProviders = generateTypicalIrProviderList( irModuleFragment.descriptor, irModuleFragment.irBuiltins, symbolTable, extensions = extensions diff --git a/compiler/testData/codegen/box/funInterface/equality/lambdaRuntimeConversion.kt b/compiler/testData/codegen/box/funInterface/equality/lambdaRuntimeConversion.kt index 4da0fbf78e3..49a8e54cf87 100644 --- a/compiler/testData/codegen/box/funInterface/equality/lambdaRuntimeConversion.kt +++ b/compiler/testData/codegen/box/funInterface/equality/lambdaRuntimeConversion.kt @@ -1,5 +1,4 @@ // IGNORE_BACKEND: JS, JS_IR, NATIVE -// IGNORE_BACKEND_FIR: JVM_IR // FILE: test.kt fun checkEqual(x: Any, y: Any) { diff --git a/compiler/testData/codegen/box/funInterface/multimodule.kt b/compiler/testData/codegen/box/funInterface/multimodule.kt index 90231c78ba5..562140724fe 100644 --- a/compiler/testData/codegen/box/funInterface/multimodule.kt +++ b/compiler/testData/codegen/box/funInterface/multimodule.kt @@ -1,6 +1,4 @@ // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions - -// IGNORE_BACKEND_FIR: JVM_IR // SKIP_DCE_DRIVEN // MODULE: m1 diff --git a/compiler/testData/codegen/box/funInterface/nullableSam.kt b/compiler/testData/codegen/box/funInterface/nullableSam.kt index 5c1e89d63a6..24671f1f00b 100644 --- a/compiler/testData/codegen/box/funInterface/nullableSam.kt +++ b/compiler/testData/codegen/box/funInterface/nullableSam.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // SKIP_DCE_DRIVEN diff --git a/compiler/testData/codegen/box/sam/equality/lambdaRuntimeConversion.kt b/compiler/testData/codegen/box/sam/equality/lambdaRuntimeConversion.kt index 8b34d3c01bb..ea23b11aca9 100644 --- a/compiler/testData/codegen/box/sam/equality/lambdaRuntimeConversion.kt +++ b/compiler/testData/codegen/box/sam/equality/lambdaRuntimeConversion.kt @@ -1,5 +1,4 @@ // TARGET_BACKEND: JVM -// IGNORE_BACKEND_FIR: JVM_IR // FILE: test.kt fun checkNotEqual(x: Any, y: Any) { diff --git a/compiler/testData/codegen/box/sam/nullableSam.kt b/compiler/testData/codegen/box/sam/nullableSam.kt index 53223695566..17c5143052e 100644 --- a/compiler/testData/codegen/box/sam/nullableSam.kt +++ b/compiler/testData/codegen/box/sam/nullableSam.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME