FIR DFA: workaround KT-46826

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/PersistentLogicSystem.kt

@@ -134,7 +134,7 @@ abstract class PersistentLogicSystem(context: ConeInferenceContext) : LogicSyste
 
         val variables = flows.flatMap { it.approvedTypeStatements.keys }.toSet()
         for (variable in variables) {
-            val info = mergeOperation(flows.map { it.getApprovedTypeStatements(variable, commonFlow) }) ?: continue
+            val info = mergeOperation(flows.map { it.getApprovedTypeStatements(variable) }) ?: continue
             removeTypeStatementsAboutVariable(commonFlow, variable)
             val thereWereReassignments = variable.hasDifferentReassignments(flows)
             if (thereWereReassignments) {
@@ -210,23 +210,13 @@ abstract class PersistentLogicSystem(context: ConeInferenceContext) : LogicSyste
     }
 
     @OptIn(DfaInternals::class)
-    private fun PersistentFlow.getApprovedTypeStatements(variable: RealVariable, parentFlow: PersistentFlow): MutableTypeStatement {
+    private fun PersistentFlow.getApprovedTypeStatements(variable: RealVariable): MutableTypeStatement {
         var flow = this
         val result = MutableTypeStatement(variable)
         val variableUnderAlias = directAliasMap[variable]
         if (variableUnderAlias == null) {
-            // get approved type statement even though the starting flow == parent flow
+            flow.approvedTypeStatements[variable]?.let {
-            if (flow == parentFlow) {
+                result += it
-                flow.approvedTypeStatements[variable]?.let {
-                    result += it
-                }
-            } else {
-                while (flow != parentFlow) {
-                    flow.approvedTypeStatements[variable]?.let {
-                        result += it
-                    }
-                    flow = flow.previousFlow!!
-                }
             }
         } else {
             result.exactType.addIfNotNull(variableUnderAlias.originalType)

compiler/testData/diagnostics/testsWithStdLib/smartcasts/letChangesToNull.fir.kt

@@ -4,6 +4,6 @@ fun foo(y: String?) {
     var x: String? = ""
     if (x != null) {
         y?.let { x = null }
-        x.length // Smart cast is not possible
+        x<!UNSAFE_CALL!>.<!>length // Smart cast is not possible
     }
 }