From 4e2067a1633aa6cbf93b7955be3490dd9e4086e9 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 18 Aug 2023 18:31:50 +0200 Subject: [PATCH] K2: reproduce KT-58579 --- ...CompilerTestFE10TestdataTestGenerated.java | 6 ++++++ ...sticCompilerFE10TestDataTestGenerated.java | 6 ++++++ ...eeOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ ...siOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../genericOnJavaWildcardBoundedByRaw.fir.kt | 19 +++++++++++++++++++ .../genericOnJavaWildcardBoundedByRaw.kt | 19 +++++++++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 ++++++ 7 files changed, 68 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/inference/genericOnJavaWildcardBoundedByRaw.fir.kt create mode 100644 compiler/testData/diagnostics/tests/inference/genericOnJavaWildcardBoundedByRaw.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 9347826c1e9..aa7a7f238b8 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 @@ -15248,6 +15248,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/inference/genericCallInThrow.kt"); } + @Test + @TestMetadata("genericOnJavaWildcardBoundedByRaw.kt") + public void testGenericOnJavaWildcardBoundedByRaw() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/genericOnJavaWildcardBoundedByRaw.kt"); + } + @Test @TestMetadata("hasErrorInConstrainingTypes.kt") public void testHasErrorInConstrainingTypes() 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 36c28c14737..09a66942332 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 @@ -15248,6 +15248,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/inference/genericCallInThrow.kt"); } + @Test + @TestMetadata("genericOnJavaWildcardBoundedByRaw.kt") + public void testGenericOnJavaWildcardBoundedByRaw() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/genericOnJavaWildcardBoundedByRaw.kt"); + } + @Test @TestMetadata("hasErrorInConstrainingTypes.kt") public void testHasErrorInConstrainingTypes() 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 7ed1dbfedc6..da54a63a64e 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 @@ -15248,6 +15248,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/inference/genericCallInThrow.kt"); } + @Test + @TestMetadata("genericOnJavaWildcardBoundedByRaw.kt") + public void testGenericOnJavaWildcardBoundedByRaw() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/genericOnJavaWildcardBoundedByRaw.kt"); + } + @Test @TestMetadata("hasErrorInConstrainingTypes.kt") public void testHasErrorInConstrainingTypes() 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 c31050bf5f7..74ccd467cc2 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 @@ -15254,6 +15254,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/inference/genericCallInThrow.kt"); } + @Test + @TestMetadata("genericOnJavaWildcardBoundedByRaw.kt") + public void testGenericOnJavaWildcardBoundedByRaw() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/genericOnJavaWildcardBoundedByRaw.kt"); + } + @Test @TestMetadata("hasErrorInConstrainingTypes.kt") public void testHasErrorInConstrainingTypes() throws Exception { diff --git a/compiler/testData/diagnostics/tests/inference/genericOnJavaWildcardBoundedByRaw.fir.kt b/compiler/testData/diagnostics/tests/inference/genericOnJavaWildcardBoundedByRaw.fir.kt new file mode 100644 index 00000000000..d58c03c3c1a --- /dev/null +++ b/compiler/testData/diagnostics/tests/inference/genericOnJavaWildcardBoundedByRaw.fir.kt @@ -0,0 +1,19 @@ +// ISSUE: KT-58579 +// FILE: Invariant.java +public class Invariant {} + +// FILE: Generic.java +public class Generic { + public class Inner {} + public static Invariant foo() { + return null; + } +} + +// FILE: Main.kt +fun main() { + val value = Generic.foo() + value.bar() +} + +fun T.bar() {} diff --git a/compiler/testData/diagnostics/tests/inference/genericOnJavaWildcardBoundedByRaw.kt b/compiler/testData/diagnostics/tests/inference/genericOnJavaWildcardBoundedByRaw.kt new file mode 100644 index 00000000000..c89720022b9 --- /dev/null +++ b/compiler/testData/diagnostics/tests/inference/genericOnJavaWildcardBoundedByRaw.kt @@ -0,0 +1,19 @@ +// ISSUE: KT-58579 +// FILE: Invariant.java +public class Invariant {} + +// FILE: Generic.java +public class Generic { + public class Inner {} + public static Invariant foo() { + return null; + } +} + +// FILE: Main.kt +fun main() { + val value = Generic.foo() + value.bar() +} + +fun T.bar() {} 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 c451f0ef756..c244a2280db 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 @@ -15254,6 +15254,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/inference/genericCallInThrow.kt"); } + @Test + @TestMetadata("genericOnJavaWildcardBoundedByRaw.kt") + public void testGenericOnJavaWildcardBoundedByRaw() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/genericOnJavaWildcardBoundedByRaw.kt"); + } + @Test @TestMetadata("hasErrorInConstrainingTypes.kt") public void testHasErrorInConstrainingTypes() throws Exception {