[FIR] Prohibit Nothing as catch parameter type

#KT-8322 Fixed
JetBrains · Sep 24, 2024 · 9748df7 · 9748df7
1 parent 283de17
commit 9748df7
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 1 deletion.
diff --git a/...el/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/...el/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
diff --git a/...c/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/...c/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
diff --git a/...en/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/...en/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
diff --git a/...est/runners/FirLightTreeOldFrontendDiagnosticsWithLatestLanguageVersionTestGenerated.java b/...est/runners/FirLightTreeOldFrontendDiagnosticsWithLatestLanguageVersionTestGenerated.java
diff --git a/...ests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/...ests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
diff --git a/...ers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirCatchParameterChecker.kt b/...ers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirCatchParameterChecker.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.fir.analysis.checkers.expression
 
+import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
 import org.jetbrains.kotlin.diagnostics.reportOn
 import org.jetbrains.kotlin.fir.analysis.checkers.MppCheckerKind
@@ -14,8 +15,10 @@ import org.jetbrains.kotlin.fir.analysis.checkers.isSubtypeOfThrowable
 import org.jetbrains.kotlin.fir.analysis.checkers.valOrVarKeyword
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
 import org.jetbrains.kotlin.fir.expressions.FirTryExpression
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.ConeTypeParameterType
 import org.jetbrains.kotlin.fir.types.coneType
+import org.jetbrains.kotlin.fir.types.isNothing
 import org.jetbrains.kotlin.fir.types.isTypeMismatchDueToNullability
 import org.jetbrains.kotlin.fir.types.typeContext
 
@@ -45,7 +48,7 @@ object FirCatchParameterChecker : FirTryExpressionChecker(MppCheckerKind.Common)
             }
 
             val session = context.session
-            if (!coneType.isSubtypeOfThrowable(session)) {
+            if (!coneType.isSubtypeOfThrowable(session) || isProhibitedNothing(context, coneType)) {
                 reporter.reportOn(
                     source,
                     FirErrors.THROWABLE_TYPE_MISMATCH,
@@ -59,4 +62,8 @@ object FirCatchParameterChecker : FirTryExpressionChecker(MppCheckerKind.Common)
             }
         }
     }
+
+    private fun isProhibitedNothing(context: CheckerContext, coneType: ConeKotlinType): Boolean {
+        return context.languageVersionSettings.supportsFeature(LanguageFeature.ProhibitNothingAsCatchParameter) && coneType.isNothing
+    }
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/catchOfTypeNothing.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/catchOfTypeNothing.fir.kt
@@ -0,0 +1,11 @@
+fun foo() {
+    try {
+        throw Exception()
+    } catch (<!THROWABLE_TYPE_MISMATCH!>x: Nothing<!>) {
+    }
+
+    try {
+        throw Exception()
+    } catch (<!THROWABLE_TYPE_MISMATCH!>x: Nothing?<!>) {
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/catchOfTypeNothing.kt b/compiler/testData/diagnostics/tests/controlStructures/catchOfTypeNothing.kt
@@ -0,0 +1,11 @@
+fun foo() {
+    try {
+        throw Exception()
+    } catch (x: Nothing) {
+    }
+
+    try {
+        throw Exception()
+    } catch (<!TYPE_MISMATCH!>x: Nothing?<!>) {
+    }
+}
diff --git a/...tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/...tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
diff --git a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
@@ -337,6 +337,7 @@ enum class LanguageFeature(
     AllowSuperCallToJavaInterface(KOTLIN_2_1, kind = OTHER), // KT-69729
     ProhibitJavaClassInheritingPrivateKotlinClass(KOTLIN_2_1, kind = BUG_FIX), // KT-66328
     ProhibitReturningIncorrectNullabilityValuesFromSamConstructorLambdaOfJdkInterfaces(KOTLIN_2_1, kind = BUG_FIX), // KT-57014
+    ProhibitNothingAsCatchParameter(KOTLIN_2_1, kind = BUG_FIX), // KT-8322
 
     // It's not a fully blown LF, but mostly a way to manage potential unexpected semantic changes
     // See the single usage at org.jetbrains.kotlin.fir.types.ConeTypeApproximator.fastPathSkipApproximation