From 0f1d212fc5d21c0646dfb9843ea01465a83716c7 Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Fri, 22 Apr 2022 14:02:43 +0300 Subject: [PATCH] [FE] Fix tests --- ...irOldFrontendDiagnosticsTestGenerated.java | 18 ++++++++ ...DiagnosticsWithLightTreeTestGenerated.java | 18 ++++++++ .../FirBlackBoxCodegenTestGenerated.java | 18 -------- ...sectionTypeToFunInterfaceConversion.fir.kt | 41 +++++++++++++++++++ ...ntersectionTypeToFunInterfaceConversion.kt | 2 +- ...tersectionTypeToFunInterfaceConversion.txt | 30 ++++++++++++++ ...intersectionTypeToSubtypeConversion.fir.kt | 41 +++++++++++++++++++ .../intersectionTypeToSubtypeConversion.kt | 2 +- .../intersectionTypeToSubtypeConversion.txt | 16 ++++++++ .../emptyIntersectionTypes/kt48987.fir.kt} | 4 +- .../emptyIntersectionTypes/kt48987.kt | 12 ++++++ .../emptyIntersectionTypes/kt48987.txt | 3 ++ .../test/runners/DiagnosticTestGenerated.java | 18 ++++++++ .../codegen/BlackBoxCodegenTestGenerated.java | 12 ------ .../IrBlackBoxCodegenTestGenerated.java | 18 -------- .../LightAnalysisModeTestGenerated.java | 10 ----- .../js/test/JsCodegenBoxTestGenerated.java | 12 ------ .../test/ir/IrJsCodegenBoxTestGenerated.java | 12 ------ .../IrCodegenBoxWasmTestGenerated.java | 10 ----- .../NativeCodegenBoxTestGenerated.java | 12 ------ 20 files changed, 201 insertions(+), 108 deletions(-) create mode 100644 compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToFunInterfaceConversion.fir.kt rename compiler/testData/{codegen/box/funInterface => diagnostics/tests/inference/emptyIntersectionTypes}/intersectionTypeToFunInterfaceConversion.kt (89%) create mode 100644 compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToFunInterfaceConversion.txt create mode 100644 compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToSubtypeConversion.fir.kt rename compiler/testData/{codegen/box/coroutines/suspendConversion => diagnostics/tests/inference/emptyIntersectionTypes}/intersectionTypeToSubtypeConversion.kt (90%) create mode 100644 compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToSubtypeConversion.txt rename compiler/testData/{codegen/box/casts/kt48987.kt => diagnostics/tests/inference/emptyIntersectionTypes/kt48987.fir.kt} (54%) create mode 100644 compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.kt create mode 100644 compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.txt diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java index 6e92ab0e116..f27afecc955 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java @@ -15217,6 +15217,18 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti runTest("compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/compatibilityResolveWhenVariableHasComplexIntersectionType.kt"); } + @Test + @TestMetadata("intersectionTypeToFunInterfaceConversion.kt") + public void testIntersectionTypeToFunInterfaceConversion() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToFunInterfaceConversion.kt"); + } + + @Test + @TestMetadata("intersectionTypeToSubtypeConversion.kt") + public void testIntersectionTypeToSubtypeConversion() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToSubtypeConversion.kt"); + } + @Test @TestMetadata("kt45461.kt") public void testKt45461() throws Exception { @@ -15475,6 +15487,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti runTest("compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48935_6.kt"); } + @Test + @TestMetadata("kt48987.kt") + public void testKt48987() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.kt"); + } + @Test @TestMetadata("kt49661.kt") public void testKt49661() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java index 3eace25b4ec..6ce6eb6aadf 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java @@ -15217,6 +15217,18 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac runTest("compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/compatibilityResolveWhenVariableHasComplexIntersectionType.kt"); } + @Test + @TestMetadata("intersectionTypeToFunInterfaceConversion.kt") + public void testIntersectionTypeToFunInterfaceConversion() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToFunInterfaceConversion.kt"); + } + + @Test + @TestMetadata("intersectionTypeToSubtypeConversion.kt") + public void testIntersectionTypeToSubtypeConversion() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToSubtypeConversion.kt"); + } + @Test @TestMetadata("kt45461.kt") public void testKt45461() throws Exception { @@ -15475,6 +15487,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac runTest("compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48935_6.kt"); } + @Test + @TestMetadata("kt48987.kt") + public void testKt48987() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.kt"); + } + @Test @TestMetadata("kt49661.kt") public void testKt49661() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java index 4bb9447d088..3cddc843d46 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java @@ -4697,12 +4697,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/casts/kt48927_privateMethodOnDerivedCastToBase.kt"); } - @Test - @TestMetadata("kt48987.kt") - public void testKt48987() throws Exception { - runTest("compiler/testData/codegen/box/casts/kt48987.kt"); - } - @Test @TestMetadata("kt50577.kt") public void testKt50577() throws Exception { @@ -12566,12 +12560,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendConversion"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } - @Test - @TestMetadata("intersectionTypeToSubtypeConversion.kt") - public void testIntersectionTypeToSubtypeConversion() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendConversion/intersectionTypeToSubtypeConversion.kt"); - } - @Test @TestMetadata("onArgument.kt") public void testOnArgument() throws Exception { @@ -17583,12 +17571,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt"); } - @Test - @TestMetadata("intersectionTypeToFunInterfaceConversion.kt") - public void testIntersectionTypeToFunInterfaceConversion() throws Exception { - runTest("compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt"); - } - @Test @TestMetadata("irrelevantPrivateDeclarations.kt") public void testIrrelevantPrivateDeclarations() throws Exception { diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToFunInterfaceConversion.fir.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToFunInterfaceConversion.fir.kt new file mode 100644 index 00000000000..9898eddfcd9 --- /dev/null +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToFunInterfaceConversion.fir.kt @@ -0,0 +1,41 @@ +// IGNORE_BACKEND: WASM +// WASM_MUTE_REASON: IGNORED_IN_JS +// IGNORE_BACKEND: JS, JS_IR +// IGNORE_BACKEND: JS_IR_ES6 + +fun interface KRunnable { + fun invoke() +} + +fun interface KBoolean { + fun invoke(b: Boolean) +} + +fun useFunInterface(fn: KRunnable) { + fn.invoke() +} +fun useFunInterfacePredicate(fn: KBoolean) { + fn.invoke(true) +} + +fun testIntersection(x: T) where T : () -> Unit, T : (Boolean) -> Unit { + useFunInterface(x) + useFunInterfacePredicate(x) +} + +var result = "" + +object Test : () -> Unit, (Boolean) -> Unit { + override fun invoke() { + result += "O" + } + + override fun invoke(p1: Boolean) { + if (p1) result += "K" + } +} + +fun box(): String { + testIntersection(Test) + return result +} \ No newline at end of file diff --git a/compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToFunInterfaceConversion.kt similarity index 89% rename from compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt rename to compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToFunInterfaceConversion.kt index ceac246720a..f99a1184eb7 100644 --- a/compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToFunInterfaceConversion.kt @@ -36,6 +36,6 @@ object Test : () -> Unit, (Boolean) -> Unit { } fun box(): String { - testIntersection(Test) + testIntersection(Test) return result } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToFunInterfaceConversion.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToFunInterfaceConversion.txt new file mode 100644 index 00000000000..3fc145553f9 --- /dev/null +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToFunInterfaceConversion.txt @@ -0,0 +1,30 @@ +package + +public var result: kotlin.String +public fun box(): kotlin.String +public fun kotlin.Unit> testIntersection(/*0*/ x: T): kotlin.Unit where T : (kotlin.Boolean) -> kotlin.Unit +public fun useFunInterface(/*0*/ fn: KRunnable): kotlin.Unit +public fun useFunInterfacePredicate(/*0*/ fn: KBoolean): kotlin.Unit + +public fun interface KBoolean { + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public abstract fun invoke(/*0*/ b: kotlin.Boolean): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String +} + +public fun interface KRunnable { + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public abstract fun invoke(): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String +} + +public object Test : () -> kotlin.Unit, (kotlin.Boolean) -> kotlin.Unit { + private constructor Test() + public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ fun invoke(): kotlin.Unit + public open override /*1*/ fun invoke(/*0*/ p1: kotlin.Boolean): kotlin.Unit + public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String +} diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToSubtypeConversion.fir.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToSubtypeConversion.fir.kt new file mode 100644 index 00000000000..21eadedeee3 --- /dev/null +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToSubtypeConversion.fir.kt @@ -0,0 +1,41 @@ +// !LANGUAGE: +SuspendConversion +// WITH_STDLIB +// WITH_COROUTINES +// IGNORE_BACKEND: JVM, NATIVE, JS, JS_IR +// IGNORE_BACKEND: JS_IR_ES6 +// IGNORE_LIGHT_ANALYSIS +// IGNORE_BACKEND: WASM +// WASM_MUTE_REASON: IGNORED_IN_JS + +import helpers.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* + +fun builder(c: suspend () -> Unit) { + c.startCoroutine(EmptyContinuation) +} + +suspend fun useSuspendFun(fn : suspend () -> String) = fn() +suspend fun useSuspendFunInt(fn: suspend (Int) -> String) = fn(42) + +suspend fun testIntersection(x: T): String where T : () -> String, T : (Int) -> String { + val a = useSuspendFun(x) + val b = useSuspendFunInt(x) + return a + b +} + +class Test : () -> String, (Int) -> String { + override fun invoke(): String = "OKEmpty" + override fun invoke(p: Int) = "OK$p" +} + +fun box(): String { + var test = "Failed" + builder { + test = testIntersection(Test()) + } + + if (test != "OKEmptyOK42") return "failed: $test" + + return "OK" +} \ No newline at end of file diff --git a/compiler/testData/codegen/box/coroutines/suspendConversion/intersectionTypeToSubtypeConversion.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToSubtypeConversion.kt similarity index 90% rename from compiler/testData/codegen/box/coroutines/suspendConversion/intersectionTypeToSubtypeConversion.kt rename to compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToSubtypeConversion.kt index 2e61031ac67..81db31612e9 100644 --- a/compiler/testData/codegen/box/coroutines/suspendConversion/intersectionTypeToSubtypeConversion.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToSubtypeConversion.kt @@ -32,7 +32,7 @@ class Test : () -> String, (Int) -> String { fun box(): String { var test = "Failed" builder { - test = testIntersection(Test()) + test = testIntersection(Test()) } if (test != "OKEmptyOK42") return "failed: $test" diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToSubtypeConversion.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToSubtypeConversion.txt new file mode 100644 index 00000000000..566d6006e75 --- /dev/null +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToSubtypeConversion.txt @@ -0,0 +1,16 @@ +package + +public fun box(): kotlin.String +public fun builder(/*0*/ c: suspend () -> kotlin.Unit): kotlin.Unit +public suspend fun kotlin.String> testIntersection(/*0*/ x: T): kotlin.String where T : (kotlin.Int) -> kotlin.String +public suspend fun useSuspendFun(/*0*/ fn: suspend () -> kotlin.String): kotlin.String +public suspend fun useSuspendFunInt(/*0*/ fn: suspend (kotlin.Int) -> kotlin.String): kotlin.String + +public final class Test : () -> kotlin.String, (kotlin.Int) -> kotlin.String { + public constructor Test() + public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ fun invoke(): kotlin.String + public open override /*1*/ fun invoke(/*0*/ p: kotlin.Int): kotlin.String + public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String +} diff --git a/compiler/testData/codegen/box/casts/kt48987.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.fir.kt similarity index 54% rename from compiler/testData/codegen/box/casts/kt48987.kt rename to compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.fir.kt index 0efb3603418..9a94ec31203 100644 --- a/compiler/testData/codegen/box/casts/kt48987.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.fir.kt @@ -4,8 +4,8 @@ fun box(): String { return try { val range1 = 0..1 - range1 as List - range1.joinToString { "" } + range1 as List + range1.joinToString { "" } } catch (e: java.lang.ClassCastException) { "OK" } diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.kt new file mode 100644 index 00000000000..c6e2f84b3da --- /dev/null +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.kt @@ -0,0 +1,12 @@ +// TARGET_BACKEND: JVM_IR +// WITH_STDLIB + +fun box(): String { + return try { + val range1 = 0..1 + range1 as List + range1.joinToString { "" } + } catch (e: java.lang.ClassCastException) { + "OK" + } +} diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.txt new file mode 100644 index 00000000000..d5942d6ca58 --- /dev/null +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.txt @@ -0,0 +1,3 @@ +package + +public fun box(): kotlin.String diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java index 0bec22ee46b..ac2d507833d 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java @@ -15223,6 +15223,18 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/compatibilityResolveWhenVariableHasComplexIntersectionType.kt"); } + @Test + @TestMetadata("intersectionTypeToFunInterfaceConversion.kt") + public void testIntersectionTypeToFunInterfaceConversion() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToFunInterfaceConversion.kt"); + } + + @Test + @TestMetadata("intersectionTypeToSubtypeConversion.kt") + public void testIntersectionTypeToSubtypeConversion() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/intersectionTypeToSubtypeConversion.kt"); + } + @Test @TestMetadata("kt45461.kt") public void testKt45461() throws Exception { @@ -15481,6 +15493,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48935_6.kt"); } + @Test + @TestMetadata("kt48987.kt") + public void testKt48987() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.kt"); + } + @Test @TestMetadata("kt49661.kt") public void testKt49661() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java index 32d6398d5a8..16b568ae00e 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java @@ -12440,12 +12440,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendConversion"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } - @Test - @TestMetadata("intersectionTypeToSubtypeConversion.kt") - public void testIntersectionTypeToSubtypeConversion() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendConversion/intersectionTypeToSubtypeConversion.kt"); - } - @Test @TestMetadata("onArgument.kt") public void testOnArgument() throws Exception { @@ -17151,12 +17145,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt"); } - @Test - @TestMetadata("intersectionTypeToFunInterfaceConversion.kt") - public void testIntersectionTypeToFunInterfaceConversion() throws Exception { - runTest("compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt"); - } - @Test @TestMetadata("irrelevantPrivateDeclarations.kt") public void testIrrelevantPrivateDeclarations() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index 29b21c03f96..5042c482e5a 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java @@ -4697,12 +4697,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/casts/kt48927_privateMethodOnDerivedCastToBase.kt"); } - @Test - @TestMetadata("kt48987.kt") - public void testKt48987() throws Exception { - runTest("compiler/testData/codegen/box/casts/kt48987.kt"); - } - @Test @TestMetadata("kt50577.kt") public void testKt50577() throws Exception { @@ -12566,12 +12560,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendConversion"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } - @Test - @TestMetadata("intersectionTypeToSubtypeConversion.kt") - public void testIntersectionTypeToSubtypeConversion() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendConversion/intersectionTypeToSubtypeConversion.kt"); - } - @Test @TestMetadata("onArgument.kt") public void testOnArgument() throws Exception { @@ -17583,12 +17571,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt"); } - @Test - @TestMetadata("intersectionTypeToFunInterfaceConversion.kt") - public void testIntersectionTypeToFunInterfaceConversion() throws Exception { - runTest("compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt"); - } - @Test @TestMetadata("irrelevantPrivateDeclarations.kt") public void testIrrelevantPrivateDeclarations() throws Exception { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 37afdd40688..941b8f2b742 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -10011,11 +10011,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class SuspendConversion extends AbstractLightAnalysisModeTest { - @TestMetadata("intersectionTypeToSubtypeConversion.kt") - public void ignoreIntersectionTypeToSubtypeConversion() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendConversion/intersectionTypeToSubtypeConversion.kt"); - } - @TestMetadata("onArgument.kt") public void ignoreOnArgument() throws Exception { runTest("compiler/testData/codegen/box/coroutines/suspendConversion/onArgument.kt"); @@ -14216,11 +14211,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt"); } - @TestMetadata("intersectionTypeToFunInterfaceConversion.kt") - public void testIntersectionTypeToFunInterfaceConversion() throws Exception { - runTest("compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt"); - } - @TestMetadata("irrelevantPrivateDeclarations.kt") public void testIrrelevantPrivateDeclarations() throws Exception { runTest("compiler/testData/codegen/box/funInterface/irrelevantPrivateDeclarations.kt"); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java index 34430f46825..19879f6b1a3 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java @@ -9310,12 +9310,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendConversion"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); } - @Test - @TestMetadata("intersectionTypeToSubtypeConversion.kt") - public void testIntersectionTypeToSubtypeConversion() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendConversion/intersectionTypeToSubtypeConversion.kt"); - } - @Test @TestMetadata("onArgument.kt") public void testOnArgument() throws Exception { @@ -13211,12 +13205,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { runTest("compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt"); } - @Test - @TestMetadata("intersectionTypeToFunInterfaceConversion.kt") - public void testIntersectionTypeToFunInterfaceConversion() throws Exception { - runTest("compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt"); - } - @Test @TestMetadata("irrelevantPrivateDeclarations.kt") public void testIrrelevantPrivateDeclarations() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java index 9ca64771247..3f0c1bb5c51 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java @@ -9352,12 +9352,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendConversion"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } - @Test - @TestMetadata("intersectionTypeToSubtypeConversion.kt") - public void testIntersectionTypeToSubtypeConversion() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendConversion/intersectionTypeToSubtypeConversion.kt"); - } - @Test @TestMetadata("onArgument.kt") public void testOnArgument() throws Exception { @@ -13253,12 +13247,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt"); } - @Test - @TestMetadata("intersectionTypeToFunInterfaceConversion.kt") - public void testIntersectionTypeToFunInterfaceConversion() throws Exception { - runTest("compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt"); - } - @Test @TestMetadata("irrelevantPrivateDeclarations.kt") public void testIrrelevantPrivateDeclarations() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java index 4f6537f41fa..016cc50cb73 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java @@ -8161,11 +8161,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendConversion"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); } - @TestMetadata("intersectionTypeToSubtypeConversion.kt") - public void testIntersectionTypeToSubtypeConversion() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendConversion/intersectionTypeToSubtypeConversion.kt"); - } - @TestMetadata("onArgument.kt") public void testOnArgument() throws Exception { runTest("compiler/testData/codegen/box/coroutines/suspendConversion/onArgument.kt"); @@ -11083,11 +11078,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest runTest("compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt"); } - @TestMetadata("intersectionTypeToFunInterfaceConversion.kt") - public void testIntersectionTypeToFunInterfaceConversion() throws Exception { - runTest("compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt"); - } - @TestMetadata("irrelevantPrivateDeclarations.kt") public void testIrrelevantPrivateDeclarations() throws Exception { runTest("compiler/testData/codegen/box/funInterface/irrelevantPrivateDeclarations.kt"); diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java index f688fe8bc61..33980891d1e 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java @@ -10248,12 +10248,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/coroutines/suspendConversion"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); } - @Test - @TestMetadata("intersectionTypeToSubtypeConversion.kt") - public void testIntersectionTypeToSubtypeConversion() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/suspendConversion/intersectionTypeToSubtypeConversion.kt"); - } - @Test @TestMetadata("onArgument.kt") public void testOnArgument() throws Exception { @@ -14263,12 +14257,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/funInterface/inlinedSamWrapper.kt"); } - @Test - @TestMetadata("intersectionTypeToFunInterfaceConversion.kt") - public void testIntersectionTypeToFunInterfaceConversion() throws Exception { - runTest("compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt"); - } - @Test @TestMetadata("irrelevantPrivateDeclarations.kt") public void testIrrelevantPrivateDeclarations() throws Exception {