From 676e350b6f0bbbc3dcdacd00396141c6be5532b4 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 13 Dec 2023 14:39:24 +0100 Subject: [PATCH] K1/K2: add test to confirm behavior of KT-63243 --- ...icCompilerTestFE10TestdataTestGenerated.java | 6 ++++++ ...nosticCompilerFE10TestDataTestGenerated.java | 6 ++++++ ...TreeOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ ...rPsiOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ ...intersectionOfPrimitiveBasedFunctions.fir.kt | 17 +++++++++++++++++ .../intersectionOfPrimitiveBasedFunctions.kt | 17 +++++++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 ++++++ 7 files changed, 64 insertions(+) create mode 100644 compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/intersectionOfPrimitiveBasedFunctions.fir.kt create mode 100644 compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/intersectionOfPrimitiveBasedFunctions.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 d8190bee13d..4eb1cdc3e19 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 @@ -44902,6 +44902,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.kt"); } + @Test + @TestMetadata("intersectionOfPrimitiveBasedFunctions.kt") + public void testIntersectionOfPrimitiveBasedFunctions() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/intersectionOfPrimitiveBasedFunctions.kt"); + } + @Test @TestMetadata("invalidFqName.kt") public void testInvalidFqName() 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 d3747129849..69e07ddaad5 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 @@ -44902,6 +44902,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.kt"); } + @Test + @TestMetadata("intersectionOfPrimitiveBasedFunctions.kt") + public void testIntersectionOfPrimitiveBasedFunctions() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/intersectionOfPrimitiveBasedFunctions.kt"); + } + @Test @TestMetadata("invalidFqName.kt") public void testInvalidFqName() 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 f11e23df79f..985441fcfe1 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 @@ -42762,6 +42762,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.kt"); } + @Test + @TestMetadata("intersectionOfPrimitiveBasedFunctions.kt") + public void testIntersectionOfPrimitiveBasedFunctions() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/intersectionOfPrimitiveBasedFunctions.kt"); + } + @Test @TestMetadata("invalidFqName.kt") public void testInvalidFqName() 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 781a5f4f94b..e3ab8da8bb9 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 @@ -42882,6 +42882,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.kt"); } + @Test + @TestMetadata("intersectionOfPrimitiveBasedFunctions.kt") + public void testIntersectionOfPrimitiveBasedFunctions() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/intersectionOfPrimitiveBasedFunctions.kt"); + } + @Test @TestMetadata("invalidFqName.kt") public void testInvalidFqName() throws Exception { diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/intersectionOfPrimitiveBasedFunctions.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/intersectionOfPrimitiveBasedFunctions.fir.kt new file mode 100644 index 00000000000..67cb673516a --- /dev/null +++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/intersectionOfPrimitiveBasedFunctions.fir.kt @@ -0,0 +1,17 @@ +// FULL_JDK +// JVM_TARGET: 1.8 +// ISSUE: KT-63243 + +abstract class MyMap : AbstractMutableMap() + +interface II { + fun replace(key: Int, value: Int): Int? = null +} + +abstract class ZI : MyMap(), II + +interface IS { + fun replace(key: String, value: String): String? = null +} + +abstract class ZS : MyMap(), IS diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/intersectionOfPrimitiveBasedFunctions.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/intersectionOfPrimitiveBasedFunctions.kt new file mode 100644 index 00000000000..02f623742b9 --- /dev/null +++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/intersectionOfPrimitiveBasedFunctions.kt @@ -0,0 +1,17 @@ +// FULL_JDK +// JVM_TARGET: 1.8 +// ISSUE: KT-63243 + +abstract class MyMap : AbstractMutableMap() + +interface II { + fun replace(key: Int, value: Int): Int? = null +} + +abstract class ZI : MyMap(), II + +interface IS { + fun replace(key: String, value: String): String? = null +} + +abstract class ZS : MyMap(), IS 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 20cdb228230..2ca82c64516 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 @@ -44960,6 +44960,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.kt"); } + @Test + @TestMetadata("intersectionOfPrimitiveBasedFunctions.kt") + public void testIntersectionOfPrimitiveBasedFunctions() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/intersectionOfPrimitiveBasedFunctions.kt"); + } + @Test @TestMetadata("invalidFqName.kt") public void testInvalidFqName() throws Exception {