diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java index fc4ba5a0929..0fec67f2b95 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java @@ -23106,6 +23106,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag runTest("compiler/testData/diagnostics/tests/override/kt4785.kt"); } + @Test + @TestMetadata("kt53408.kt") + public void testKt53408() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/kt53408.kt"); + } + @Test @TestMetadata("kt6014.kt") public void testKt6014() throws Exception { 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 78d350054e7..d87541b50b0 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 @@ -23106,6 +23106,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti runTest("compiler/testData/diagnostics/tests/override/kt4785.kt"); } + @Test + @TestMetadata("kt53408.kt") + public void testKt53408() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/kt53408.kt"); + } + @Test @TestMetadata("kt6014.kt") public void testKt6014() 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 ca053f1c8c4..afb8cab5d36 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 @@ -23106,6 +23106,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac runTest("compiler/testData/diagnostics/tests/override/kt4785.kt"); } + @Test + @TestMetadata("kt53408.kt") + public void testKt53408() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/kt53408.kt"); + } + @Test @TestMetadata("kt6014.kt") public void testKt6014() throws Exception { diff --git a/compiler/testData/diagnostics/tests/override/kt53408.kt b/compiler/testData/diagnostics/tests/override/kt53408.kt new file mode 100644 index 00000000000..b96b52ba3f7 --- /dev/null +++ b/compiler/testData/diagnostics/tests/override/kt53408.kt @@ -0,0 +1,18 @@ +// FIR_IDENTICAL +interface A { + fun f() { } +} + +interface B { + fun f() { } +} + +abstract class C : A { + abstract override fun f() +} + +class D : C(), A, B { + override fun f() { + super.f() // Resolves to super.f call, but should be error + } +} diff --git a/compiler/testData/diagnostics/tests/override/kt53408.txt b/compiler/testData/diagnostics/tests/override/kt53408.txt new file mode 100644 index 00000000000..99540f41d57 --- /dev/null +++ b/compiler/testData/diagnostics/tests/override/kt53408.txt @@ -0,0 +1,31 @@ +package + +public interface A { + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open fun f(): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String +} + +public interface B { + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open fun f(): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String +} + +public abstract class C : A { + public constructor C() + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public abstract override /*1*/ fun f(): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String +} + +public final class D : C, A, B { + public constructor D() + public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open override /*3*/ fun f(): kotlin.Unit + public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*3*/ /*fake_override*/ fun toString(): 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 0d216d06b93..74a2c0c56c4 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 @@ -23112,6 +23112,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/override/kt4785.kt"); } + @Test + @TestMetadata("kt53408.kt") + public void testKt53408() throws Exception { + runTest("compiler/testData/diagnostics/tests/override/kt53408.kt"); + } + @Test @TestMetadata("kt6014.kt") public void testKt6014() throws Exception {