[NI] Restore missing smart casts after another smart cast in call

Expression type serves as a part of a key for retrieving smart cast info.
Rewriting expression type with SmartCastManager leads to incorrect processing of following smartcasts for same expression, therefore it was removed.

KT-32507 Fixed
KT-32358 Fixed

compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java

@@ -17663,6 +17663,11 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirOldFronte
             runTest("compiler/testData/diagnostics/tests/regressions/kt32205.kt");
         }
 
+        @TestMetadata("kt32507.kt")
+        public void testKt32507() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/regressions/kt32507.kt");
+        }
+
         @TestMetadata("kt328.kt")
         public void testKt328() throws Exception {
             runTest("compiler/testData/diagnostics/tests/regressions/kt328.kt");

compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt

@@ -232,7 +232,7 @@ class DiagnosticReporterByTrackingStrategy(
                 val call = if (call.callElement is KtBinaryExpression) null else call
                 smartCastManager.checkAndRecordPossibleCast(
                     dataFlowValue, smartCastDiagnostic.smartCastType, argumentExpression, context, call,
-                    recordExpressionType = true
+                    recordExpressionType = false
                 )
             }
             is ReceiverExpressionKotlinCallArgument -> {

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.fir.kt

@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -DEBUG_INFO_SMARTCAST
-// !WITH_NEW_INFERENCE
 fun bar(x: Int) = x + 1
 
 fun foo() {

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.kt

@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -DEBUG_INFO_SMARTCAST
-// !WITH_NEW_INFERENCE
 fun bar(x: Int) = x + 1
 
 fun foo() {
@@ -13,17 +12,17 @@ fun foo() {
             if (1 > 2) bar(x)
         }
         if (<!SENSELESS_COMPARISON!>x == null<!>) {
-            <!NI;UNREACHABLE_CODE!>bar(<!>x<!NI;UNREACHABLE_CODE!>)<!>
+            bar(x)
         }
-        if (<!SENSELESS_COMPARISON!>x == null<!>) <!NI;UNREACHABLE_CODE!>bar(<!>x<!NI;UNREACHABLE_CODE!>)<!> else bar(x)
+        if (<!SENSELESS_COMPARISON!>x == null<!>) bar(x) else bar(x)
         bar(bar(x))
     } else if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>x<!> == null<!>) {
         bar(<!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>x<!>)
         if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>x<!> != null<!>) {
-            <!NI;UNREACHABLE_CODE!>bar(<!>x<!NI;UNREACHABLE_CODE!>)<!>
+            bar(x)
-            <!NI;UNREACHABLE_CODE!>if (<!SENSELESS_COMPARISON!>x == null<!>) bar(x)<!>
+            if (<!SENSELESS_COMPARISON!>x == null<!>) bar(x)
-            <!NI;UNREACHABLE_CODE!>if (<!SENSELESS_COMPARISON!>x == null<!>) bar(x) else bar(x)<!>
+            if (<!SENSELESS_COMPARISON!>x == null<!>) bar(x) else bar(x)
-            <!NI;UNREACHABLE_CODE!>bar(bar(x) + bar(x))<!>
+            bar(bar(x) + bar(x))
         } else if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>x<!> == null<!>) {
             bar(<!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>x<!>)
         }

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.fir.kt

@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun bar(x: Int): Int = x + 1
 
 fun foo() {

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.kt

@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun bar(x: Int): Int = x + 1
 
 fun foo() {
@@ -11,7 +10,7 @@ fun foo() {
         bar(<!DEBUG_INFO_SMARTCAST!>x<!>)
         for (q in a) {
             bar(<!DEBUG_INFO_SMARTCAST!>x<!>)
-            if (<!SENSELESS_COMPARISON!>x == null<!>) <!NI;UNREACHABLE_CODE!>bar(<!><!DEBUG_INFO_SMARTCAST!>x<!><!NI;UNREACHABLE_CODE!>)<!>
+            if (<!SENSELESS_COMPARISON!>x == null<!>) bar(<!DEBUG_INFO_SMARTCAST!>x<!>)
         }
     }
 

compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/dataFlowInfoAfterExclExcl.fir.kt

@@ -1,5 +1,3 @@
-// !WITH_NEW_INFERENCE
-
 fun foo(d: Any?) {
     if (d is String?) {
         d!!

compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/dataFlowInfoAfterExclExcl.kt

@@ -1,9 +1,7 @@
-// !WITH_NEW_INFERENCE
-
 fun foo(d: Any?) {
     if (d is String?) {
         <!DEBUG_INFO_SMARTCAST!>d<!>!!
-        doString(<!NI;TYPE_MISMATCH, OI;DEBUG_INFO_SMARTCAST!>d<!>)
+        doString(<!DEBUG_INFO_SMARTCAST!>d<!>)
     }
 }
 

compiler/testData/diagnostics/tests/regressions/kt32507.fir.kt

@@ -0,0 +1,7 @@
+// !LANGUAGE: +NewInference
+
+fun foo(bar: Any?): Int {
+    bar as String?
+    bar ?: throw IllegalStateException()
+    return bar.length
+}

compiler/testData/diagnostics/tests/regressions/kt32507.kt

@@ -0,0 +1,7 @@
+// !LANGUAGE: +NewInference
+
+fun foo(bar: Any?): Int {
+    bar as String?
+    <!DEBUG_INFO_SMARTCAST!>bar<!> ?: throw IllegalStateException()
+    return <!DEBUG_INFO_SMARTCAST!>bar<!>.length
+}

compiler/testData/diagnostics/tests/regressions/kt32507.txt

@@ -0,0 +1,3 @@
+package
+
+public fun foo(/*0*/ bar: kotlin.Any?): kotlin.Int

compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java

@@ -17675,6 +17675,11 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                 runTest("compiler/testData/diagnostics/tests/regressions/kt32205.kt");
             }
 
+            @TestMetadata("kt32507.kt")
+            public void testKt32507() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/regressions/kt32507.kt");
+            }
+
             @TestMetadata("kt328.kt")
             public void testKt328() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/regressions/kt328.kt");

compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java

@@ -17665,6 +17665,11 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                 runTest("compiler/testData/diagnostics/tests/regressions/kt32205.kt");
             }
 
+            @TestMetadata("kt32507.kt")
+            public void testKt32507() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/regressions/kt32507.kt");
+            }
+
             @TestMetadata("kt328.kt")
             public void testKt328() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/regressions/kt328.kt");