diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java index 1de488a41e5..ab03a2d0f03 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java @@ -33660,6 +33660,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo runTest("compiler/testData/codegen/box/javaInterop/syntheticPropOverriddenGetter.kt"); } + @Test + @TestMetadata("triangleWithFlexibleTypeAndSubstitution4.kt") + public void testTriangleWithFlexibleTypeAndSubstitution4() { + runTest("compiler/testData/codegen/box/javaInterop/triangleWithFlexibleTypeAndSubstitution4.kt"); + } + @Test @TestMetadata("unresolvedJavaClassInDifferentFile.kt") public void testUnresolvedJavaClassInDifferentFile() { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java index c4e14a344cf..eb674d9765b 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java @@ -33660,6 +33660,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi runTest("compiler/testData/codegen/box/javaInterop/syntheticPropOverriddenGetter.kt"); } + @Test + @TestMetadata("triangleWithFlexibleTypeAndSubstitution4.kt") + public void testTriangleWithFlexibleTypeAndSubstitution4() { + runTest("compiler/testData/codegen/box/javaInterop/triangleWithFlexibleTypeAndSubstitution4.kt"); + } + @Test @TestMetadata("unresolvedJavaClassInDifferentFile.kt") public void testUnresolvedJavaClassInDifferentFile() { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java index e7647e9221c..af7e536a901 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java @@ -33529,6 +33529,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/javaInterop/syntheticPropOverriddenGetter.kt"); } + @Test + @TestMetadata("triangleWithFlexibleTypeAndSubstitution4.kt") + public void testTriangleWithFlexibleTypeAndSubstitution4() { + runTest("compiler/testData/codegen/box/javaInterop/triangleWithFlexibleTypeAndSubstitution4.kt"); + } + @Test @TestMetadata("unresolvedJavaClassInDifferentFile.kt") public void testUnresolvedJavaClassInDifferentFile() { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java index 07d4e6bc9f7..714977de870 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java @@ -33529,6 +33529,12 @@ public class FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGener runTest("compiler/testData/codegen/box/javaInterop/syntheticPropOverriddenGetter.kt"); } + @Test + @TestMetadata("triangleWithFlexibleTypeAndSubstitution4.kt") + public void testTriangleWithFlexibleTypeAndSubstitution4() { + runTest("compiler/testData/codegen/box/javaInterop/triangleWithFlexibleTypeAndSubstitution4.kt"); + } + @Test @TestMetadata("unresolvedJavaClassInDifferentFile.kt") public void testUnresolvedJavaClassInDifferentFile() { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java index add6036d0a8..b3ae3832a15 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java @@ -33529,6 +33529,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/javaInterop/syntheticPropOverriddenGetter.kt"); } + @Test + @TestMetadata("triangleWithFlexibleTypeAndSubstitution4.kt") + public void testTriangleWithFlexibleTypeAndSubstitution4() { + runTest("compiler/testData/codegen/box/javaInterop/triangleWithFlexibleTypeAndSubstitution4.kt"); + } + @Test @TestMetadata("unresolvedJavaClassInDifferentFile.kt") public void testUnresolvedJavaClassInDifferentFile() { diff --git a/compiler/testData/codegen/box/javaInterop/triangleWithFlexibleTypeAndSubstitution4.kt b/compiler/testData/codegen/box/javaInterop/triangleWithFlexibleTypeAndSubstitution4.kt new file mode 100644 index 00000000000..1f54a01e727 --- /dev/null +++ b/compiler/testData/codegen/box/javaInterop/triangleWithFlexibleTypeAndSubstitution4.kt @@ -0,0 +1,28 @@ +// TARGET_BACKEND: JVM_IR + +// IGNORE_BACKEND_K2: JVM_IR +// K2 status: KT-66529 K2: MANY_IMPL_MEMBER_NOT_IMPLEMENTED on inheriting Java member with generic type and Kotlin member with primitive type + +// FILE: A.java + +public class A { + public String foo(T x) { + return "Fail"; + } +} + +// FILE: main.kt + +interface B { + fun foo(x: T) = "OK" +} + +open class C : A() + +interface D : B + +class E : C(), D + +fun box(): String { + return E().foo(42) +} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java index 809b76538a9..64bc87e525f 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java @@ -33529,6 +33529,12 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency runTest("compiler/testData/codegen/box/javaInterop/syntheticPropOverriddenGetter.kt"); } + @Test + @TestMetadata("triangleWithFlexibleTypeAndSubstitution4.kt") + public void testTriangleWithFlexibleTypeAndSubstitution4() { + runTest("compiler/testData/codegen/box/javaInterop/triangleWithFlexibleTypeAndSubstitution4.kt"); + } + @Test @TestMetadata("unresolvedJavaClassInDifferentFile.kt") public void testUnresolvedJavaClassInDifferentFile() { 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 d2549a9919f..e8cfa85f38e 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 @@ -33529,6 +33529,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/javaInterop/syntheticPropOverriddenGetter.kt"); } + @Test + @TestMetadata("triangleWithFlexibleTypeAndSubstitution4.kt") + public void testTriangleWithFlexibleTypeAndSubstitution4() { + runTest("compiler/testData/codegen/box/javaInterop/triangleWithFlexibleTypeAndSubstitution4.kt"); + } + @Test @TestMetadata("unresolvedJavaClassInDifferentFile.kt") public void testUnresolvedJavaClassInDifferentFile() { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java index 42e49d053e8..565b3dc825e 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java @@ -33529,6 +33529,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/javaInterop/syntheticPropOverriddenGetter.kt"); } + @Test + @TestMetadata("triangleWithFlexibleTypeAndSubstitution4.kt") + public void testTriangleWithFlexibleTypeAndSubstitution4() { + runTest("compiler/testData/codegen/box/javaInterop/triangleWithFlexibleTypeAndSubstitution4.kt"); + } + @Test @TestMetadata("unresolvedJavaClassInDifferentFile.kt") public void testUnresolvedJavaClassInDifferentFile() { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java index 89244900275..ef4d5e26619 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java @@ -33529,6 +33529,12 @@ public class FirBlackBoxCodegenTestWithInlineScopesGenerated extends AbstractFir runTest("compiler/testData/codegen/box/javaInterop/syntheticPropOverriddenGetter.kt"); } + @Test + @TestMetadata("triangleWithFlexibleTypeAndSubstitution4.kt") + public void testTriangleWithFlexibleTypeAndSubstitution4() { + runTest("compiler/testData/codegen/box/javaInterop/triangleWithFlexibleTypeAndSubstitution4.kt"); + } + @Test @TestMetadata("unresolvedJavaClassInDifferentFile.kt") public void testUnresolvedJavaClassInDifferentFile() { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index ef22cddb347..dfcd26bd1ca 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -28414,6 +28414,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/javaInterop/syntheticPropOverriddenGetter.kt"); } + @TestMetadata("triangleWithFlexibleTypeAndSubstitution4.kt") + public void testTriangleWithFlexibleTypeAndSubstitution4() { + runTest("compiler/testData/codegen/box/javaInterop/triangleWithFlexibleTypeAndSubstitution4.kt"); + } + @TestMetadata("unresolvedJavaClassInDifferentFile.kt") public void testUnresolvedJavaClassInDifferentFile() { runTest("compiler/testData/codegen/box/javaInterop/unresolvedJavaClassInDifferentFile.kt");