diff --git a/compiler/testData/codegen/box/funInterface/basicFunInterface.kt b/compiler/testData/codegen/box/funInterface/basicFunInterface.kt index f937fe65b99..299108b2b36 100644 --- a/compiler/testData/codegen/box/funInterface/basicFunInterface.kt +++ b/compiler/testData/codegen/box/funInterface/basicFunInterface.kt @@ -1,4 +1,5 @@ // !LANGUAGE: +FunctionalInterfaceConversion +// TARGET_BACKEND: JVM fun interface Foo { fun invoke(): String diff --git a/compiler/testData/codegen/box/funInterface/basicFunInterfaceConversion.kt b/compiler/testData/codegen/box/funInterface/basicFunInterfaceConversion.kt index b13d2bb2e25..0d2cf38e9bc 100644 --- a/compiler/testData/codegen/box/funInterface/basicFunInterfaceConversion.kt +++ b/compiler/testData/codegen/box/funInterface/basicFunInterfaceConversion.kt @@ -1,4 +1,7 @@ // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions +// TARGET_BACKEND: JVM +// IGNORE_BACKEND_FIR: JVM_IR +// IGNORE_BACKEND: JVM_IR fun interface Foo { fun invoke(): String diff --git a/compiler/testData/codegen/box/funInterface/castFromAny.kt b/compiler/testData/codegen/box/funInterface/castFromAny.kt index 8253e899096..f53fca36ca6 100644 --- a/compiler/testData/codegen/box/funInterface/castFromAny.kt +++ b/compiler/testData/codegen/box/funInterface/castFromAny.kt @@ -1,4 +1,7 @@ // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions +// TARGET_BACKEND: JVM +// IGNORE_BACKEND_FIR: JVM_IR +// IGNORE_BACKEND: JVM_IR fun interface KRunnable { fun invoke() diff --git a/compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt b/compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt index 30e520ea6dc..f0ef007992f 100644 --- a/compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt +++ b/compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt @@ -1,4 +1,7 @@ // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions +// TARGET_BACKEND: JVM +// IGNORE_BACKEND_FIR: JVM_IR +// IGNORE_BACKEND: JVM_IR // WITH_RUNTIME fun interface MyRunnable { diff --git a/compiler/testData/codegen/box/funInterface/nullableSam.kt b/compiler/testData/codegen/box/funInterface/nullableSam.kt index cea63cb7e88..328994b7298 100644 --- a/compiler/testData/codegen/box/funInterface/nullableSam.kt +++ b/compiler/testData/codegen/box/funInterface/nullableSam.kt @@ -1,5 +1,7 @@ // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions // TARGET_BACKEND: JVM +// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME fun interface KRunnable { diff --git a/compiler/testData/codegen/box/funInterface/partialSam.kt b/compiler/testData/codegen/box/funInterface/partialSam.kt index f33c10526c2..f7e411f2f26 100644 --- a/compiler/testData/codegen/box/funInterface/partialSam.kt +++ b/compiler/testData/codegen/box/funInterface/partialSam.kt @@ -1,4 +1,7 @@ // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions +// TARGET_BACKEND: JVM +// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME fun interface Fn { diff --git a/compiler/testData/codegen/box/funInterface/receiverEvaluatedOnce.kt b/compiler/testData/codegen/box/funInterface/receiverEvaluatedOnce.kt index f436ccc2be0..33301006563 100644 --- a/compiler/testData/codegen/box/funInterface/receiverEvaluatedOnce.kt +++ b/compiler/testData/codegen/box/funInterface/receiverEvaluatedOnce.kt @@ -1,6 +1,7 @@ // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions - // TARGET_BACKEND: JVM +// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME fun interface KRunnable { diff --git a/compiler/testData/codegen/box/funInterface/suspendFunInterfaceConversionCodegen.kt b/compiler/testData/codegen/box/funInterface/suspendFunInterfaceConversionCodegen.kt index 81845f27bb3..7674a2ef4f9 100644 --- a/compiler/testData/codegen/box/funInterface/suspendFunInterfaceConversionCodegen.kt +++ b/compiler/testData/codegen/box/funInterface/suspendFunInterfaceConversionCodegen.kt @@ -1,4 +1,7 @@ // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions +// TARGET_BACKEND: JVM +// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND_FIR: JVM_IR // WITH_COROUTINES // WITH_RUNTIME diff --git a/compiler/testData/compileKotlinAgainstKotlin/useDeserializedFunInterface.kt b/compiler/testData/compileKotlinAgainstKotlin/useDeserializedFunInterface.kt index 06c13da3428..39b3a1bebdc 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/useDeserializedFunInterface.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/useDeserializedFunInterface.kt @@ -1,4 +1,5 @@ // !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions +// IGNORE_BACKEND: JVM_IR // FILE: A.kt diff --git a/compiler/testData/diagnostics/tests/funInterface/basicFunInterfaceConversion.kt b/compiler/testData/diagnostics/tests/funInterface/basicFunInterfaceConversion.kt index bfbea8fb9da..928b723255e 100644 --- a/compiler/testData/diagnostics/tests/funInterface/basicFunInterfaceConversion.kt +++ b/compiler/testData/diagnostics/tests/funInterface/basicFunInterfaceConversion.kt @@ -9,4 +9,4 @@ fun foo(f: Foo) {} fun test() { foo {} -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/funInterface/funInterfaceSyntheticConstructors.kt b/compiler/testData/diagnostics/tests/funInterface/funInterfaceSyntheticConstructors.kt index 699fc41cc74..61997ceb8c4 100644 --- a/compiler/testData/diagnostics/tests/funInterface/funInterfaceSyntheticConstructors.kt +++ b/compiler/testData/diagnostics/tests/funInterface/funInterfaceSyntheticConstructors.kt @@ -12,4 +12,4 @@ fun foo(f: KRunnable) {} fun test() { foo(KRunnable {}) foo(KRunnableAlias {}) -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/funInterface/genericSubstitutionForFunInterface.kt b/compiler/testData/diagnostics/tests/funInterface/genericSubstitutionForFunInterface.kt index d1e450a1e9c..d056939e048 100644 --- a/compiler/testData/diagnostics/tests/funInterface/genericSubstitutionForFunInterface.kt +++ b/compiler/testData/diagnostics/tests/funInterface/genericSubstitutionForFunInterface.kt @@ -22,4 +22,4 @@ fun test( k.f_t(f_string) { it checkType { _() } } k.f_r(f_int) { it checkType { _() } } k.f_pr(f_pr) { it checkType { _>() } } -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/funInterface/severalConversionsForFunInterface.kt b/compiler/testData/diagnostics/tests/funInterface/severalConversionsForFunInterface.kt index 5a97a54eede..b7f10e7887f 100644 --- a/compiler/testData/diagnostics/tests/funInterface/severalConversionsForFunInterface.kt +++ b/compiler/testData/diagnostics/tests/funInterface/severalConversionsForFunInterface.kt @@ -30,4 +30,4 @@ fun test(j: J, r: KRunnable) { j.foo3({}, r, {}) j.foo3({}, {}, r) j.foo3({}, {}, {}) -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/funInterface/suspendFunInterfaceConversion.kt b/compiler/testData/diagnostics/tests/funInterface/suspendFunInterfaceConversion.kt index bffd4d08f24..8c60a7b0cfd 100644 --- a/compiler/testData/diagnostics/tests/funInterface/suspendFunInterfaceConversion.kt +++ b/compiler/testData/diagnostics/tests/funInterface/suspendFunInterfaceConversion.kt @@ -11,4 +11,4 @@ suspend fun bar() {} fun test() { run(::bar) -} \ No newline at end of file +} diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java index 17bb8b96850..85a09c3b579 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java @@ -348,6 +348,11 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl runTest("compiler/testData/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt"); } + @TestMetadata("useDeserializedFunInterface.kt") + public void testUseDeserializedFunInterface() throws Exception { + runTest("compiler/testData/compileKotlinAgainstKotlin/useDeserializedFunInterface.kt"); + } + @TestMetadata("compiler/testData/compileKotlinAgainstKotlin/jvm8") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstKotlinTestGenerated.java index 812b5e072ed..49a605cd0ac 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstKotlinTestGenerated.java @@ -343,6 +343,11 @@ public class IrCompileKotlinAgainstKotlinTestGenerated extends AbstractIrCompile runTest("compiler/testData/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt"); } + @TestMetadata("useDeserializedFunInterface.kt") + public void testUseDeserializedFunInterface() throws Exception { + runTest("compiler/testData/compileKotlinAgainstKotlin/useDeserializedFunInterface.kt"); + } + @TestMetadata("compiler/testData/compileKotlinAgainstKotlin/jvm8") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)