From f9a7a7fda251b45e71ff5294e26c02eacc01a624 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 17 Apr 2023 18:50:41 +0200 Subject: [PATCH] K2: reproduce KT-57889 --- ...iagnosticCompilerTestFE10TestdataTestGenerated.java | 6 ++++++ ...sedDiagnosticCompilerFE10TestDataTestGenerated.java | 6 ++++++ ...irLightTreeOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../FirPsiOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../inferenceFromLambdaReturnStatement.fir.kt | 10 ++++++++++ .../inferenceFromLambdaReturnStatement.kt | 10 ++++++++++ .../kotlin/test/runners/DiagnosticTestGenerated.java | 6 ++++++ 7 files changed, 50 insertions(+) create mode 100644 compiler/testData/diagnostics/testsWithStdLib/builderInference/inferenceFromLambdaReturnStatement.fir.kt create mode 100644 compiler/testData/diagnostics/testsWithStdLib/builderInference/inferenceFromLambdaReturnStatement.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 bc2273415e6..31f182f0fd0 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 @@ -36688,6 +36688,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/testsWithStdLib/builderInference/inferCoroutineTypeInOldVersion.kt"); } + @Test + @TestMetadata("inferenceFromLambdaReturnStatement.kt") + public void testInferenceFromLambdaReturnStatement() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/builderInference/inferenceFromLambdaReturnStatement.kt"); + } + @Test @TestMetadata("inferenceFromLambdaReturnType.kt") public void testInferenceFromLambdaReturnType() 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 d47585dc12b..d414a431b46 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 @@ -36688,6 +36688,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/testsWithStdLib/builderInference/inferCoroutineTypeInOldVersion.kt"); } + @Test + @TestMetadata("inferenceFromLambdaReturnStatement.kt") + public void testInferenceFromLambdaReturnStatement() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/builderInference/inferenceFromLambdaReturnStatement.kt"); + } + @Test @TestMetadata("inferenceFromLambdaReturnType.kt") public void testInferenceFromLambdaReturnType() 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 93232e07077..b57a6aedabb 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 @@ -36688,6 +36688,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/testsWithStdLib/builderInference/inferCoroutineTypeInOldVersion.kt"); } + @Test + @TestMetadata("inferenceFromLambdaReturnStatement.kt") + public void testInferenceFromLambdaReturnStatement() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/builderInference/inferenceFromLambdaReturnStatement.kt"); + } + @Test @TestMetadata("inferenceFromLambdaReturnType.kt") public void testInferenceFromLambdaReturnType() 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 5c0241ed135..9f1117861e7 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 @@ -36784,6 +36784,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/testsWithStdLib/builderInference/inferCoroutineTypeInOldVersion.kt"); } + @Test + @TestMetadata("inferenceFromLambdaReturnStatement.kt") + public void testInferenceFromLambdaReturnStatement() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/builderInference/inferenceFromLambdaReturnStatement.kt"); + } + @Test @TestMetadata("inferenceFromLambdaReturnType.kt") public void testInferenceFromLambdaReturnType() throws Exception { diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/inferenceFromLambdaReturnStatement.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/inferenceFromLambdaReturnStatement.fir.kt new file mode 100644 index 00000000000..5a369214890 --- /dev/null +++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/inferenceFromLambdaReturnStatement.fir.kt @@ -0,0 +1,10 @@ +// ISSUE: KT-57889 + +class SafeResult + +inline fun checkNotEdt(body: (SafeResult) -> Nothing) {} + +private fun getNonEdt(): SafeResult { + checkNotEdt { return it } + return SafeResult() +} diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/inferenceFromLambdaReturnStatement.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/inferenceFromLambdaReturnStatement.kt new file mode 100644 index 00000000000..b92c4af882d --- /dev/null +++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/inferenceFromLambdaReturnStatement.kt @@ -0,0 +1,10 @@ +// ISSUE: KT-57889 + +class SafeResult + +inline fun checkNotEdt(body: (SafeResult) -> Nothing) {} + +private fun getNonEdt(): SafeResult { + checkNotEdt { return it } + return SafeResult() +} 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 d45b3908bd0..14abb6e1063 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 @@ -37550,6 +37550,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/testsWithStdLib/builderInference/inferCoroutineTypeInOldVersion.kt"); } + @Test + @TestMetadata("inferenceFromLambdaReturnStatement.kt") + public void testInferenceFromLambdaReturnStatement() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/builderInference/inferenceFromLambdaReturnStatement.kt"); + } + @Test @TestMetadata("inferenceFromLambdaReturnType.kt") public void testInferenceFromLambdaReturnType() throws Exception {