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 c0201387857..b88cbde256b 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 @@ -16191,6 +16191,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/delegation/differentModules.kt"); } + @Test + @TestMetadata("doubleDelegationEqualsHashcode.kt") + public void testDoubleDelegationEqualsHashcode() throws Exception { + runTest("compiler/testData/codegen/box/delegation/doubleDelegationEqualsHashcode.kt"); + } + @Test @TestMetadata("genericProperty.kt") public void testGenericProperty() 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 b28f32f2d47..757b541e85e 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 @@ -16191,6 +16191,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated runTest("compiler/testData/codegen/box/delegation/differentModules.kt"); } + @Test + @TestMetadata("doubleDelegationEqualsHashcode.kt") + public void testDoubleDelegationEqualsHashcode() throws Exception { + runTest("compiler/testData/codegen/box/delegation/doubleDelegationEqualsHashcode.kt"); + } + @Test @TestMetadata("genericProperty.kt") public void testGenericProperty() 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 7320e591c69..3ec631537bb 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 @@ -16191,6 +16191,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/delegation/differentModules.kt"); } + @Test + @TestMetadata("doubleDelegationEqualsHashcode.kt") + public void testDoubleDelegationEqualsHashcode() throws Exception { + runTest("compiler/testData/codegen/box/delegation/doubleDelegationEqualsHashcode.kt"); + } + @Test @TestMetadata("genericProperty.kt") public void testGenericProperty() throws Exception { diff --git a/compiler/testData/codegen/box/delegation/doubleDelegationEqualsHashcode.kt b/compiler/testData/codegen/box/delegation/doubleDelegationEqualsHashcode.kt new file mode 100644 index 00000000000..179348bcf46 --- /dev/null +++ b/compiler/testData/codegen/box/delegation/doubleDelegationEqualsHashcode.kt @@ -0,0 +1,22 @@ +// TARGET_BACKEND: JVM +// IGNORE_BACKEND_K1: JVM, JVM_IR + +interface A { + override operator fun equals(other: Any?): Boolean + override fun hashCode(): Int +} + +class AImpl : A { + override fun equals(other: Any?) = super.equals(other) + override fun hashCode() = super.hashCode() +} + +interface B +class BImpl : B + +class Impl : A by AImpl(), B by BImpl() + +fun box(): String { + Impl() + return "OK" +} \ No newline at end of file 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 79b8de7a5b6..38820a56029 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 @@ -15831,6 +15831,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/delegation/differentModules.kt"); } + @Test + @TestMetadata("doubleDelegationEqualsHashcode.kt") + public void testDoubleDelegationEqualsHashcode() throws Exception { + runTest("compiler/testData/codegen/box/delegation/doubleDelegationEqualsHashcode.kt"); + } + @Test @TestMetadata("genericProperty.kt") public void testGenericProperty() 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 bab464c328f..aa7412dc5a1 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 @@ -16191,6 +16191,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/delegation/differentModules.kt"); } + @Test + @TestMetadata("doubleDelegationEqualsHashcode.kt") + public void testDoubleDelegationEqualsHashcode() throws Exception { + runTest("compiler/testData/codegen/box/delegation/doubleDelegationEqualsHashcode.kt"); + } + @Test @TestMetadata("genericProperty.kt") public void testGenericProperty() 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 15535cf9cc1..1e043f7dbef 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 @@ -16191,6 +16191,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/delegation/differentModules.kt"); } + @Test + @TestMetadata("doubleDelegationEqualsHashcode.kt") + public void testDoubleDelegationEqualsHashcode() throws Exception { + runTest("compiler/testData/codegen/box/delegation/doubleDelegationEqualsHashcode.kt"); + } + @Test @TestMetadata("genericProperty.kt") public void testGenericProperty() 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 220f9770df5..c3a1ed8e9a5 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -13262,6 +13262,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Delegation extends AbstractLightAnalysisModeTest { + @TestMetadata("doubleDelegationEqualsHashcode.kt") + public void ignoreDoubleDelegationEqualsHashcode() throws Exception { + runTest("compiler/testData/codegen/box/delegation/doubleDelegationEqualsHashcode.kt"); + } + private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); }