Revert "KT-53146 Don't coerce Nothing? returned from "catch" clauses"

This reverts commit 903a5d69a4.

compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java

@@ -4787,12 +4787,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/casts/kt50577.kt");
         }
 
-        @Test
-        @TestMetadata("kt53146.kt")
-        public void testKt53146() throws Exception {
-            runTest("compiler/testData/codegen/box/casts/kt53146.kt");
-        }
-
         @Test
         @TestMetadata("kt53677.kt")
         public void testKt53677() throws Exception {

compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt

@@ -1225,9 +1225,7 @@ class ExpressionCodegen(
 
             val catchResult = catchBody.accept(this, catchBlockInfo)
             if (savedValue != null) {
-                if (catchResult.irType != context.irBuiltIns.nothingNType) {
+                catchResult.materializeAt(tryAsmType, aTry.type, true)
-                    catchResult.materializeAt(tryAsmType, aTry.type, true)
-                }
                 mv.store(savedValue, tryAsmType)
             } else {
                 catchResult.discard()

compiler/testData/codegen/box/casts/kt53146.kt

@@ -1,18 +0,0 @@
-// TARGET_BACKEND: JVM_IR
-// WITH_STDLIB
-// FULL_JDK
-// CHECK_BYTECODE_TEXT
-
-class A
-
-fun box(): String {
-    val a = try {
-        A()
-    } catch (e: NoClassDefFoundError) {
-        null
-    }
-
-    return "OK"
-}
-
-// 0 CHECKCAST

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java

@@ -4787,12 +4787,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/casts/kt50577.kt");
         }
 
-        @Test
-        @TestMetadata("kt53146.kt")
-        public void testKt53146() throws Exception {
-            runTest("compiler/testData/codegen/box/casts/kt53146.kt");
-        }
-
         @Test
         @TestMetadata("kt53677.kt")
         public void testKt53677() throws Exception {