From 973248f432b244c2c9237eb4e4cc498b57b73b55 Mon Sep 17 00:00:00 2001 From: Nikolay Lunyak Date: Mon, 18 Sep 2023 15:07:58 +0300 Subject: [PATCH] [FIR] Reproduce KT-57100 --- ...osticCompilerTestFE10TestdataTestGenerated.java | 6 ++++++ ...iagnosticCompilerFE10TestDataTestGenerated.java | 6 ++++++ ...ghtTreeOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../FirPsiOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../tests/suspendConflictingOverloads.fir.kt | 14 ++++++++++++++ .../tests/suspendConflictingOverloads.kt | 14 ++++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 ++++++ 7 files changed, 58 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/suspendConflictingOverloads.fir.kt create mode 100644 compiler/testData/diagnostics/tests/suspendConflictingOverloads.kt diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java index fbc452d2415..517e12931bc 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java @@ -1251,6 +1251,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/suppressInWhen.kt"); } + @Test + @TestMetadata("suspendConflictingOverloads.kt") + public void testSuspendConflictingOverloads() throws Exception { + runTest("compiler/testData/diagnostics/tests/suspendConflictingOverloads.kt"); + } + @Test @TestMetadata("suspendFunAndPrivateJava.kt") public void testSuspendFunAndPrivateJava() throws Exception { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java index e34a111ba43..e8dde6d268f 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java @@ -1251,6 +1251,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/suppressInWhen.kt"); } + @Test + @TestMetadata("suspendConflictingOverloads.kt") + public void testSuspendConflictingOverloads() throws Exception { + runTest("compiler/testData/diagnostics/tests/suspendConflictingOverloads.kt"); + } + @Test @TestMetadata("suspendFunAndPrivateJava.kt") public void testSuspendFunAndPrivateJava() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java index 34fdce56888..33685c6f9dc 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java @@ -1251,6 +1251,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/suppressInWhen.kt"); } + @Test + @TestMetadata("suspendConflictingOverloads.kt") + public void testSuspendConflictingOverloads() throws Exception { + runTest("compiler/testData/diagnostics/tests/suspendConflictingOverloads.kt"); + } + @Test @TestMetadata("suspendFunAndPrivateJava.kt") public void testSuspendFunAndPrivateJava() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java index 960ef666e38..a872a30c509 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java @@ -1251,6 +1251,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/suppressInWhen.kt"); } + @Test + @TestMetadata("suspendConflictingOverloads.kt") + public void testSuspendConflictingOverloads() throws Exception { + runTest("compiler/testData/diagnostics/tests/suspendConflictingOverloads.kt"); + } + @Test @TestMetadata("suspendFunAndPrivateJava.kt") public void testSuspendFunAndPrivateJava() throws Exception { diff --git a/compiler/testData/diagnostics/tests/suspendConflictingOverloads.fir.kt b/compiler/testData/diagnostics/tests/suspendConflictingOverloads.fir.kt new file mode 100644 index 00000000000..cf576941654 --- /dev/null +++ b/compiler/testData/diagnostics/tests/suspendConflictingOverloads.fir.kt @@ -0,0 +1,14 @@ +// ISSUE: KT-57100 +// WITH_STDLIB + +interface C07I01{ + fun some() {} +} + +interface C07I02{ + suspend fun some() {} +} + +class C07C01: C07I01, C07I02 { + override fun some() {} +} diff --git a/compiler/testData/diagnostics/tests/suspendConflictingOverloads.kt b/compiler/testData/diagnostics/tests/suspendConflictingOverloads.kt new file mode 100644 index 00000000000..fcbad256706 --- /dev/null +++ b/compiler/testData/diagnostics/tests/suspendConflictingOverloads.kt @@ -0,0 +1,14 @@ +// ISSUE: KT-57100 +// WITH_STDLIB + +interface C07I01{ + fun some() {} +} + +interface C07I02{ + suspend fun some() {} +} + +class C07C01: C07I01, C07I02 { + override fun some() {} +} 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 e355219543a..2e826a0178d 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 @@ -1251,6 +1251,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/suppressInWhen.kt"); } + @Test + @TestMetadata("suspendConflictingOverloads.kt") + public void testSuspendConflictingOverloads() throws Exception { + runTest("compiler/testData/diagnostics/tests/suspendConflictingOverloads.kt"); + } + @Test @TestMetadata("suspendFunAndPrivateJava.kt") public void testSuspendFunAndPrivateJava() throws Exception {