From 847442d54717ae998bebc78e2c1555c9d38bef4c Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 18 Oct 2023 17:24:29 +0300 Subject: [PATCH] [Test] Add regression test for KT-60876 --- ...LightTreeBlackBoxCodegenTestGenerated.java | 6 ++++ ...hIrFakeOverrideGeneratorTestGenerated.java | 6 ++++ .../FirPsiBlackBoxCodegenTestGenerated.java | 6 ++++ ...assImplementingJavaInterfaceWithDefault.kt | 29 +++++++++++++++++++ .../IrBlackBoxCodegenTestGenerated.java | 6 ++++ ...kBoxCodegenWithIrInlinerTestGenerated.java | 6 ++++ .../LightAnalysisModeTestGenerated.java | 5 ++++ 7 files changed, 64 insertions(+) create mode 100644 compiler/testData/codegen/box/delegation/valueClassImplementingJavaInterfaceWithDefault.kt 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 9ebe3f01608..a47d38a4c57 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 @@ -16293,6 +16293,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/delegation/smartCastedDelegation.kt"); } + @Test + @TestMetadata("valueClassImplementingJavaInterfaceWithDefault.kt") + public void testValueClassImplementingJavaInterfaceWithDefault() throws Exception { + runTest("compiler/testData/codegen/box/delegation/valueClassImplementingJavaInterfaceWithDefault.kt"); + } + @Test @TestMetadata("viaTypeAlias.kt") public void testViaTypeAlias() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java index fe956fe82de..e31fd686243 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java @@ -16293,6 +16293,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated runTest("compiler/testData/codegen/box/delegation/smartCastedDelegation.kt"); } + @Test + @TestMetadata("valueClassImplementingJavaInterfaceWithDefault.kt") + public void testValueClassImplementingJavaInterfaceWithDefault() throws Exception { + runTest("compiler/testData/codegen/box/delegation/valueClassImplementingJavaInterfaceWithDefault.kt"); + } + @Test @TestMetadata("viaTypeAlias.kt") public void testViaTypeAlias() throws Exception { 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 2beec329f03..de2df69c1c5 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 @@ -16293,6 +16293,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/delegation/smartCastedDelegation.kt"); } + @Test + @TestMetadata("valueClassImplementingJavaInterfaceWithDefault.kt") + public void testValueClassImplementingJavaInterfaceWithDefault() throws Exception { + runTest("compiler/testData/codegen/box/delegation/valueClassImplementingJavaInterfaceWithDefault.kt"); + } + @Test @TestMetadata("viaTypeAlias.kt") public void testViaTypeAlias() throws Exception { diff --git a/compiler/testData/codegen/box/delegation/valueClassImplementingJavaInterfaceWithDefault.kt b/compiler/testData/codegen/box/delegation/valueClassImplementingJavaInterfaceWithDefault.kt new file mode 100644 index 00000000000..cac8e2f7102 --- /dev/null +++ b/compiler/testData/codegen/box/delegation/valueClassImplementingJavaInterfaceWithDefault.kt @@ -0,0 +1,29 @@ +// TARGET_BACKEND: JVM_IR +// JVM_TARGET: 1.8 +// ISSUE: KT-60876 +// WITH_STDLIB + +// FILE: A.java +public interface A { + String foo(String value, String otherString); + + default String foo(String value ) { + return foo(value, "K"); + } +} + +// FILE: B.java +public class B implements A { + public String foo(String value , String otherString) { + return value + otherString; + } +} + +// FILE: main.kt +@JvmInline +value class C(val m: A) : A by m + +fun box(): String { + val myJava = C(B()) + return myJava.foo("O") +} 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 af4f55979d3..bce20c2d85c 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 @@ -16293,6 +16293,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/delegation/smartCastedDelegation.kt"); } + @Test + @TestMetadata("valueClassImplementingJavaInterfaceWithDefault.kt") + public void testValueClassImplementingJavaInterfaceWithDefault() throws Exception { + runTest("compiler/testData/codegen/box/delegation/valueClassImplementingJavaInterfaceWithDefault.kt"); + } + @Test @TestMetadata("viaTypeAlias.kt") public void testViaTypeAlias() throws Exception { 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 3c035fcb827..19253285129 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 @@ -16293,6 +16293,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/delegation/smartCastedDelegation.kt"); } + @Test + @TestMetadata("valueClassImplementingJavaInterfaceWithDefault.kt") + public void testValueClassImplementingJavaInterfaceWithDefault() throws Exception { + runTest("compiler/testData/codegen/box/delegation/valueClassImplementingJavaInterfaceWithDefault.kt"); + } + @Test @TestMetadata("viaTypeAlias.kt") public void testViaTypeAlias() 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 6bab582de0f..3eac74df76a 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -13420,6 +13420,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/delegation/smartCastedDelegation.kt"); } + @TestMetadata("valueClassImplementingJavaInterfaceWithDefault.kt") + public void testValueClassImplementingJavaInterfaceWithDefault() throws Exception { + runTest("compiler/testData/codegen/box/delegation/valueClassImplementingJavaInterfaceWithDefault.kt"); + } + @TestMetadata("viaTypeAlias.kt") public void testViaTypeAlias() throws Exception { runTest("compiler/testData/codegen/box/delegation/viaTypeAlias.kt");