FIR. Refactor smart-cast representation in FIR tree

Make smart-casts non-transparent expression without delegation
to underlying FirQualifiedAccessExpression, as children delegation in
fir tree has unclear semantics
Remove two different kinds of tree nodes for smart-casts

analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/callResolver/Fe10IdeNormalAnalysisSourceModuleResolveCallTestGenerated.java

@@ -832,6 +832,12 @@ public class Fe10IdeNormalAnalysisSourceModuleResolveCallTestGenerated extends A
         runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.kt");
     }
 
+    @Test
+    @TestMetadata("whenSelectorSmartCast.kt")
+    public void testWhenSelectorSmartCast() throws Exception {
+        runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/whenSelectorSmartCast.kt");
+    }
+
     @Nested
     @TestMetadata("analysis/analysis-api/testData/components/callResolver/resolveCall/assignments")
     @TestDataPath("$PROJECT_ROOT")

analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/smartCastProvider/Fe10IdeNormalAnalysisSourceModuleHLSmartCastInfoTestGenerated.java

@@ -46,6 +46,12 @@ public class Fe10IdeNormalAnalysisSourceModuleHLSmartCastInfoTestGenerated exten
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo"), Pattern.compile("^(.+)\\.kt$"), null, true);
     }
 
+    @Test
+    @TestMetadata("bothImplicitReceiversSmartCast.kt")
+    public void testBothImplicitReceiversSmartCast() throws Exception {
+        runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/bothImplicitReceiversSmartCast.kt");
+    }
+
     @Test
     @TestMetadata("multiSmartcastAsReceiver_stable.kt")
     public void testMultiSmartcastAsReceiver_stable() throws Exception {

analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java

@@ -460,6 +460,18 @@ public class Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exte
         runTest("analysis/analysis-api/testData/referenceResolve/SeveralOverrides.kt");
     }
 
+    @Test
+    @TestMetadata("smartCastExpression.kt")
+    public void testSmartCastExpression() throws Exception {
+        runTest("analysis/analysis-api/testData/referenceResolve/smartCastExpression.kt");
+    }
+
+    @Test
+    @TestMetadata("smartCastInvokeReceiver.kt")
+    public void testSmartCastInvokeReceiver() throws Exception {
+        runTest("analysis/analysis-api/testData/referenceResolve/smartCastInvokeReceiver.kt");
+    }
+
     @Test
     @TestMetadata("SuperTypePrimaryConstructor.kt")
     public void testSuperTypePrimaryConstructor() throws Exception {

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt

@@ -201,6 +201,9 @@ internal class KtFirCallResolver(
                 resolveCalleeExpressionOfFunctionCall,
                 resolveFragmentOfCall
             )
+            is FirSmartCastExpression -> originalExpression.toKtCallInfo(
+                psi, resolveCalleeExpressionOfFunctionCall, resolveFragmentOfCall
+            )
             else -> null
         }
     }
@@ -465,7 +468,7 @@ internal class KtFirCallResolver(
                     isImplicitInvoke
                 )
             }
-            is FirExpressionWithSmartcast -> createKtCall(psi, fir.originalExpression, candidate, resolveFragmentOfCall)
+            is FirSmartCastExpression -> (fir.originalExpression as? FirResolvable)?.let { createKtCall(psi, it, candidate, resolveFragmentOfCall) }
             else -> null
         }
     }
@@ -707,7 +710,7 @@ internal class KtFirCallResolver(
     private fun FirExpression.toKtReceiverValue(): KtReceiverValue? {
         val psi = psi
         return when (this) {
-            is FirExpressionWithSmartcast -> {
+            is FirSmartCastExpression -> {
                 val result = originalExpression.toKtReceiverValue()
                 if (result != null && isStable) {
                     KtSmartCastedReceiverValue(result, smartcastType.coneType.asKtType())

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirExpressionTypeProvider.kt

@@ -231,11 +231,12 @@ internal class KtFirExpressionTypeProvider(
         }
 
         when (val fir = expression.getOrBuildFir(analysisSession.firResolveSession)) {
-            is FirExpressionWithSmartcastToNothing -> if (fir.isStable) {
+            is FirSmartCastExpression -> if (fir.isStable) {
-                return DefiniteNullability.DEFINITELY_NULL
+                if (fir.smartcastTypeWithoutNullableNothing != null) {
-            }
+                    return DefiniteNullability.DEFINITELY_NULL
-            is FirExpressionWithSmartcast -> if (fir.isStable && fir.isNotNullable()) {
+                } else if (fir.isNotNullable()) {
-                return DefiniteNullability.DEFINITELY_NOT_NULL
+                    return DefiniteNullability.DEFINITELY_NOT_NULL
+                }
             }
             is FirExpression -> if (fir.isNotNullable()) {
                 return DefiniteNullability.DEFINITELY_NOT_NULL

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSmartcastProvider.kt

@@ -12,10 +12,7 @@ import org.jetbrains.kotlin.analysis.api.components.KtSmartCastProvider
 import org.jetbrains.kotlin.analysis.api.fir.KtFirAnalysisSession
 import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
 import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFir
-import org.jetbrains.kotlin.fir.expressions.FirExpressionWithSmartcast
+import org.jetbrains.kotlin.fir.expressions.*
-import org.jetbrains.kotlin.fir.expressions.FirImplicitInvokeCall
-import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression
-import org.jetbrains.kotlin.fir.expressions.FirSafeCallExpression
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.coneTypeSafe
 import org.jetbrains.kotlin.fir.types.isStableSmartcast
@@ -45,15 +42,15 @@ internal class KtFirSmartcastProvider(
                     this is KtParenthesizedExpression
         }
 
-    private fun getMatchingFirExpressionWithSmartCast(expression: KtExpression): FirExpressionWithSmartcast? {
+    private fun getMatchingFirExpressionWithSmartCast(expression: KtExpression): FirSmartCastExpression? {
         if (!expression.isExplicitSmartCastInfoTarget) return null
 
         val possibleFunctionCall = expression.getPossiblyQualifiedCallExpressionForCallee() ?: expression
 
         return when (val firExpression = possibleFunctionCall.getOrBuildFir(analysisSession.firResolveSession)) {
-            is FirExpressionWithSmartcast -> firExpression
+            is FirSmartCastExpression -> firExpression
-            is FirSafeCallExpression -> firExpression.selector as? FirExpressionWithSmartcast
+            is FirSafeCallExpression -> firExpression.selector as? FirSmartCastExpression
-            is FirImplicitInvokeCall -> firExpression.explicitReceiver as? FirExpressionWithSmartcast
+            is FirImplicitInvokeCall -> firExpression.explicitReceiver as? FirSmartCastExpression
             else -> null
         }
     }
@@ -63,7 +60,7 @@ internal class KtFirSmartcastProvider(
         return getSmartCastedInfo(firSmartCastExpression)
     }
 
-    private fun getSmartCastedInfo(expression: FirExpressionWithSmartcast): KtSmartCastInfo? {
+    private fun getSmartCastedInfo(expression: FirSmartCastExpression): KtSmartCastInfo? {
         val type = expression.smartcastType.coneTypeSafe<ConeKotlinType>()?.asKtType() ?: return null
         return KtSmartCastInfo(type, expression.isStable, token)
     }
@@ -82,6 +79,7 @@ internal class KtFirSmartcastProvider(
         return when (val firExpression = wholeExpression.getOrBuildFir(analysisSession.firResolveSession)) {
             is FirQualifiedAccessExpression -> firExpression
             is FirSafeCallExpression -> firExpression.selector as? FirQualifiedAccessExpression
+            is FirSmartCastExpression -> firExpression.originalExpression as? FirQualifiedAccessExpression
             else -> null
         }
     }

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/FirReferenceResolveHelper.kt

@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
 import org.jetbrains.kotlin.fir.types.*
+import org.jetbrains.kotlin.fir.resolve.dfa.unwrapSmartcastExpression
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
@@ -188,7 +189,10 @@ internal object FirReferenceResolveHelper {
         if (expression.isSyntheticOperatorReference()) return emptyList()
         val symbolBuilder = analysisSession.firSymbolBuilder
         val adjustedResolutionExpression = adjustResolutionExpression(expression)
-        val fir = adjustedResolutionExpression.getOrBuildFir(analysisSession.firResolveSession)
+        val fir = when (val baseFir = adjustedResolutionExpression.getOrBuildFir(analysisSession.firResolveSession)) {
+            is FirSmartCastExpression -> baseFir.originalExpression
+            else -> baseFir
+        }
         val session = analysisSession.firResolveSession.useSiteFirSession
         return when (fir) {
             is FirResolvedTypeRef -> getSymbolsForResolvedTypeRef(fir, expression, session, symbolBuilder)
@@ -361,7 +365,7 @@ internal object FirReferenceResolveHelper {
             return listOfNotNull((fir.dispatchReceiver.typeRef as? FirResolvedTypeRef)?.toTargetSymbol(session, symbolBuilder))
         }
         val implicitInvokeReceiver = if (fir is FirImplicitInvokeCall) {
-            fir.explicitReceiver as? FirQualifiedAccessExpression
+            fir.explicitReceiver?.unwrapSmartcastExpression() as? FirQualifiedAccessExpression
         } else {
             null
         }

analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/callResolver/FirIdeNormalAnalysisSourceModuleResolveCallTestGenerated.java

@@ -832,6 +832,12 @@ public class FirIdeNormalAnalysisSourceModuleResolveCallTestGenerated extends Ab
         runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.kt");
     }
 
+    @Test
+    @TestMetadata("whenSelectorSmartCast.kt")
+    public void testWhenSelectorSmartCast() throws Exception {
+        runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/whenSelectorSmartCast.kt");
+    }
+
     @Nested
     @TestMetadata("analysis/analysis-api/testData/components/callResolver/resolveCall/assignments")
     @TestDataPath("$PROJECT_ROOT")

analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/smartCastProvider/FirIdeDependentAnalysisSourceModuleHLSmartCastInfoTestGenerated.java

@@ -46,6 +46,12 @@ public class FirIdeDependentAnalysisSourceModuleHLSmartCastInfoTestGenerated ext
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo"), Pattern.compile("^(.+)\\.kt$"), null, true);
     }
 
+    @Test
+    @TestMetadata("bothImplicitReceiversSmartCast.kt")
+    public void testBothImplicitReceiversSmartCast() throws Exception {
+        runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/bothImplicitReceiversSmartCast.kt");
+    }
+
     @Test
     @TestMetadata("multiSmartcastAsReceiver_stable.kt")
     public void testMultiSmartcastAsReceiver_stable() throws Exception {

analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/smartCastProvider/FirIdeNormalAnalysisSourceModuleHLSmartCastInfoTestGenerated.java

@@ -46,6 +46,12 @@ public class FirIdeNormalAnalysisSourceModuleHLSmartCastInfoTestGenerated extend
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo"), Pattern.compile("^(.+)\\.kt$"), null, true);
     }
 
+    @Test
+    @TestMetadata("bothImplicitReceiversSmartCast.kt")
+    public void testBothImplicitReceiversSmartCast() throws Exception {
+        runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/bothImplicitReceiversSmartCast.kt");
+    }
+
     @Test
     @TestMetadata("multiSmartcastAsReceiver_stable.kt")
     public void testMultiSmartcastAsReceiver_stable() throws Exception {

analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java

@@ -460,6 +460,18 @@ public class FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated ex
         runTest("analysis/analysis-api/testData/referenceResolve/SeveralOverrides.kt");
     }
 
+    @Test
+    @TestMetadata("smartCastExpression.kt")
+    public void testSmartCastExpression() throws Exception {
+        runTest("analysis/analysis-api/testData/referenceResolve/smartCastExpression.kt");
+    }
+
+    @Test
+    @TestMetadata("smartCastInvokeReceiver.kt")
+    public void testSmartCastInvokeReceiver() throws Exception {
+        runTest("analysis/analysis-api/testData/referenceResolve/smartCastInvokeReceiver.kt");
+    }
+
     @Test
     @TestMetadata("SuperTypePrimaryConstructor.kt")
     public void testSuperTypePrimaryConstructor() throws Exception {

analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerated.java

@@ -460,6 +460,18 @@ public class FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerate
         runTest("analysis/analysis-api/testData/referenceResolve/SeveralOverrides.kt");
     }
 
+    @Test
+    @TestMetadata("smartCastExpression.kt")
+    public void testSmartCastExpression() throws Exception {
+        runTest("analysis/analysis-api/testData/referenceResolve/smartCastExpression.kt");
+    }
+
+    @Test
+    @TestMetadata("smartCastInvokeReceiver.kt")
+    public void testSmartCastInvokeReceiver() throws Exception {
+        runTest("analysis/analysis-api/testData/referenceResolve/smartCastInvokeReceiver.kt");
+    }
+
     @Test
     @TestMetadata("SuperTypePrimaryConstructor.kt")
     public void testSuperTypePrimaryConstructor() throws Exception {

analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java

@@ -460,6 +460,18 @@ public class FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exten
         runTest("analysis/analysis-api/testData/referenceResolve/SeveralOverrides.kt");
     }
 
+    @Test
+    @TestMetadata("smartCastExpression.kt")
+    public void testSmartCastExpression() throws Exception {
+        runTest("analysis/analysis-api/testData/referenceResolve/smartCastExpression.kt");
+    }
+
+    @Test
+    @TestMetadata("smartCastInvokeReceiver.kt")
+    public void testSmartCastInvokeReceiver() throws Exception {
+        runTest("analysis/analysis-api/testData/referenceResolve/smartCastInvokeReceiver.kt");
+    }
+
     @Test
     @TestMetadata("SuperTypePrimaryConstructor.kt")
     public void testSuperTypePrimaryConstructor() throws Exception {

analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/smartCastProvider/AbstractHLSmartCastInfoTest.kt

@@ -24,6 +24,12 @@ abstract class AbstractHLSmartCastInfoTest : AbstractAnalysisApiSingleFileTest()
                     appendLine("expression: ${expression.text}")
                     appendLine("isStable: ${smartCastInfo?.isStable}")
                     appendLine("smartCastType: ${smartCastInfo?.smartCastType?.render()}")
+
+                    val receiverSmartCasts = expression.getImplicitReceiverSmartCast()
+                    for (receiverSmartCast in receiverSmartCasts) {
+                        appendLine("receiver: ${receiverSmartCast.kind}")
+                        appendLine("    smartCastType: ${receiverSmartCast.type.render()}")
+                    }
                 }
             }
         }

analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/callResolver/FirStandaloneNormalAnalysisSourceModuleResolveCallTestGenerated.java

@@ -832,6 +832,12 @@ public class FirStandaloneNormalAnalysisSourceModuleResolveCallTestGenerated ext
         runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/variableWithMemberInvoke.kt");
     }
 
+    @Test
+    @TestMetadata("whenSelectorSmartCast.kt")
+    public void testWhenSelectorSmartCast() throws Exception {
+        runTest("analysis/analysis-api/testData/components/callResolver/resolveCall/whenSelectorSmartCast.kt");
+    }
+
     @Nested
     @TestMetadata("analysis/analysis-api/testData/components/callResolver/resolveCall/assignments")
     @TestDataPath("$PROJECT_ROOT")

analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/smartCastProvider/FirStandaloneNormalAnalysisSourceModuleHLSmartCastInfoTestGenerated.java

@@ -46,6 +46,12 @@ public class FirStandaloneNormalAnalysisSourceModuleHLSmartCastInfoTestGenerated
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo"), Pattern.compile("^(.+)\\.kt$"), null, true);
     }
 
+    @Test
+    @TestMetadata("bothImplicitReceiversSmartCast.kt")
+    public void testBothImplicitReceiversSmartCast() throws Exception {
+        runTest("analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/bothImplicitReceiversSmartCast.kt");
+    }
+
     @Test
     @TestMetadata("multiSmartcastAsReceiver_stable.kt")
     public void testMultiSmartcastAsReceiver_stable() throws Exception {

analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java

@@ -460,6 +460,18 @@ public class FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerate
         runTest("analysis/analysis-api/testData/referenceResolve/SeveralOverrides.kt");
     }
 
+    @Test
+    @TestMetadata("smartCastExpression.kt")
+    public void testSmartCastExpression() throws Exception {
+        runTest("analysis/analysis-api/testData/referenceResolve/smartCastExpression.kt");
+    }
+
+    @Test
+    @TestMetadata("smartCastInvokeReceiver.kt")
+    public void testSmartCastInvokeReceiver() throws Exception {
+        runTest("analysis/analysis-api/testData/referenceResolve/smartCastInvokeReceiver.kt");
+    }
+
     @Test
     @TestMetadata("SuperTypePrimaryConstructor.kt")
     public void testSuperTypePrimaryConstructor() throws Exception {

analysis/analysis-api/testData/components/callResolver/resolveCall/whenSelectorSmartCast.kt

@@ -0,0 +1,7 @@
+fun test(obj: Any): String {
+    return when {
+        obj !is Iterable<*> -> "not iterable"
+        <expr>obj</expr> !is Collection<*> -> "not collection"
+        else -> "unknown"
+    }
+}

analysis/analysis-api/testData/components/callResolver/resolveCall/whenSelectorSmartCast.txt

@@ -0,0 +1,14 @@
+KtSuccessCallInfo:
+  call = KtSimpleVariableAccessCall:
+    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
+      dispatchReceiver = null
+      extensionReceiver = null
+      signature = KtVariableLikeSignature:
+        name = obj
+        receiverType = null
+        returnType = kotlin.Any
+        symbol = obj: kotlin.Any
+        callableIdIfNonLocal = null
+    simpleAccess = Read:
+
+    typeArgumentsMapping = {}

analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/bothImplicitReceiversSmartCast.kt

@@ -0,0 +1,18 @@
+interface Foo {
+    fun Bar.foo()
+}
+
+interface Bar {}
+
+inline fun <T, R> myWith(argument: T, lambda: T.() -> R): R {
+    argument.lambda()
+}
+
+fun Any.action(other: Any) {
+    if (this is Foo) {
+        with(other) {
+            this as Bar
+            <expr>foo</expr>()
+        }
+    }
+}

analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/bothImplicitReceiversSmartCast.txt

@@ -0,0 +1,7 @@
+expression: foo
+isStable: null
+smartCastType: null
+receiver: DISPATCH
+    smartCastType: Foo
+receiver: EXTENSION
+    smartCastType: Bar

analysis/analysis-api/testData/referenceResolve/smartCastExpression.kt

@@ -0,0 +1,9 @@
+interface Foo {
+    fun function()
+}
+
+fun foo(parameter: Any) {
+    if (parameter is Foo) {
+        <caret>parameter.function()
+    }
+}

analysis/analysis-api/testData/referenceResolve/smartCastExpression.txt

@@ -0,0 +1,2 @@
+Resolved to:
+0: parameter: kotlin.Any

analysis/analysis-api/testData/referenceResolve/smartCastInvokeReceiver.kt

@@ -0,0 +1,9 @@
+interface WithInvoke {
+    operator fun invoke() {}
+}
+
+fun foo(parameter: Any) {
+    if (parameter is WithInvoke) {
+        <caret>parameter()
+    }
+}

analysis/analysis-api/testData/referenceResolve/smartCastInvokeReceiver.txt

@@ -0,0 +1,2 @@
+Resolved to:
+0: parameter: kotlin.Any

analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FirElementsRecorder.kt

@@ -9,10 +9,7 @@ import org.jetbrains.kotlin.*
 import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.DuplicatedFirSourceElementsException
 import org.jetbrains.kotlin.analysis.low.level.api.fir.util.isErrorElement
 import org.jetbrains.kotlin.fir.FirElement
-import org.jetbrains.kotlin.fir.expressions.FirConstExpression
+import org.jetbrains.kotlin.fir.expressions.*
-import org.jetbrains.kotlin.fir.expressions.FirFunctionCall
-import org.jetbrains.kotlin.fir.expressions.FirPropertyAccessExpression
-import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment
 import org.jetbrains.kotlin.fir.expressions.builder.buildConstExpression
 import org.jetbrains.kotlin.fir.references.*
 import org.jetbrains.kotlin.fir.types.FirErrorTypeRef
@@ -115,6 +112,7 @@ internal open class FirElementsRecorder : FirVisitor<Unit, MutableMap<KtElement,
                         it.kind == KtFakeSourceElementKind.ImplicitConstructor ||
                         it.kind == KtFakeSourceElementKind.DesugaredPrefixNameReference ||
                         it.kind == KtFakeSourceElementKind.DesugaredPostfixNameReference ||
+                        it.kind == KtFakeSourceElementKind.SmartCastExpression ||
                         it.isSourceForCompoundAccess(element)
             }.psi as? KtElement
             ?: return

analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java

@@ -4111,6 +4111,12 @@ public class DiagnosisCompilerFirTestdataTestGenerated extends AbstractDiagnosis
                 public void testSafeCalls() throws Exception {
                     runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.kt");
                 }
+
+                @Test
+                @TestMetadata("unstableSmartCastOnSafeCallArgument.kt")
+                public void testUnstableSmartCastOnSafeCallArgument() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/unstableSmartCastOnSafeCallArgument.kt");
+                }
             }
 
             @Nested

compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java

@@ -3652,6 +3652,11 @@ public class LazyBodyIsNotTouchedTilContractsPhaseTestGenerated extends Abstract
             public void testSafeCalls() throws Exception {
                 runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.kt");
             }
+
+            @TestMetadata("unstableSmartCastOnSafeCallArgument.kt")
+            public void testUnstableSmartCastOnSafeCallArgument() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/unstableSmartCastOnSafeCallArgument.kt");
+            }
         }
 
         @TestMetadata("compiler/fir/analysis-tests/testData/resolve/smartcasts/stability")

compiler/fir/analysis-tests/testData/resolve/cfg/complex.dot

@@ -72,35 +72,36 @@ digraph complex_kt {
                                 color=blue
                                 28 [label="Enter block"];
                                 29 [label="Access variable R|<local>/cause|"];
-                                30 [label="Access variable R|<local>/closeException|"];
+                                30 [label="Smart cast: R|<local>/cause|"];
-                                31 [label="Function call: R|<local>/cause|.R|kotlin/Throwable.addSuppressed|(...)"];
+                                31 [label="Access variable R|<local>/closeException|"];
-                                32 [label="Exit block"];
+                                32 [label="Function call: R|<local>/cause|.R|kotlin/Throwable.addSuppressed|(...)"];
+                                33 [label="Exit block"];
                             }
-                            33 [label="Catch exit"];
+                            34 [label="Catch exit"];
                         }
-                        34 [label="Try expression exit"];
+                        35 [label="Try expression exit"];
                     }
-                    35 [label="Exit block"];
+                    36 [label="Exit block"];
                 }
-                36 [label="Exit when branch result"];
+                37 [label="Exit when branch result"];
-                37 [label="Enter when branch result"];
+                38 [label="Enter when branch result"];
                 subgraph cluster_14 {
                     color=blue
-                    38 [label="Enter block"];
+                    39 [label="Enter block"];
-                    39 [label="Function call: this@R|/closeFinally|.R|/AutoCloseable.close|()"];
+                    40 [label="Function call: this@R|/closeFinally|.R|/AutoCloseable.close|()"];
-                    40 [label="Exit block"];
+                    41 [label="Exit block"];
                 }
-                41 [label="Exit when branch result"];
+                42 [label="Exit when branch result"];
-                42 [label="Enter when branch result"];
+                43 [label="Enter when branch result"];
                 subgraph cluster_15 {
                     color=blue
-                    43 [label="Enter block"];
+                    44 [label="Enter block"];
-                    44 [label="Exit block"];
+                    45 [label="Exit block"];
                 }
-                45 [label="Exit when branch result"];
+                46 [label="Exit when branch result"];
-                46 [label="Exit when"];
+                47 [label="Exit when"];
             }
-            47 [label="Jump: ^closeFinally when () {
+            48 [label="Jump: ^closeFinally when () {
     ==(this@R|/closeFinally|, Null(null)) ->  {
     }
     ==(R|<local>/cause|, Null(null)) ->  {
@@ -117,10 +118,10 @@ digraph complex_kt {
     }
 }
 "];
-            48 [label="Stub" style="filled" fillcolor=gray];
+            49 [label="Stub" style="filled" fillcolor=gray];
-            49 [label="Exit block" style="filled" fillcolor=gray];
+            50 [label="Exit block" style="filled" fillcolor=gray];
         }
-        50 [label="Exit function closeFinally" style="filled" fillcolor=red];
+        51 [label="Exit function closeFinally" style="filled" fillcolor=red];
     }
     4 -> {5};
     5 -> {6};
@@ -129,12 +130,12 @@ digraph complex_kt {
     8 -> {9};
     9 -> {10};
     10 -> {11};
-    11 -> {42 12};
+    11 -> {43 12};
     12 -> {13};
     13 -> {14};
     14 -> {15};
     15 -> {16};
-    16 -> {37 17};
+    16 -> {38 17};
     17 -> {18};
     18 -> {19};
     19 -> {20};
@@ -144,9 +145,9 @@ digraph complex_kt {
     23 -> {24};
     24 -> {25};
     25 -> {26};
-    26 -> {34 27};
+    26 -> {35 27};
     27 -> {28};
-    27 -> {50}    [label=onUncaughtException];
+    27 -> {51}    [label=onUncaughtException];
     28 -> {29};
     29 -> {30};
     30 -> {31};
@@ -155,92 +156,93 @@ digraph complex_kt {
     33 -> {34};
     34 -> {35};
     35 -> {36};
-    36 -> {46};
+    36 -> {37};
-    37 -> {38};
+    37 -> {47};
     38 -> {39};
     39 -> {40};
     40 -> {41};
-    41 -> {46};
+    41 -> {42};
-    42 -> {43};
+    42 -> {47};
     43 -> {44};
     44 -> {45};
     45 -> {46};
     46 -> {47};
-    47 -> {50};
+    47 -> {48};
-    47 -> {48} [style=dotted];
+    48 -> {51};
     48 -> {49} [style=dotted];
     49 -> {50} [style=dotted];
+    50 -> {51} [style=dotted];
 
     subgraph cluster_16 {
         color=red
-        51 [label="Enter function firstIsInstanceOrNull" style="filled" fillcolor=red];
+        52 [label="Enter function firstIsInstanceOrNull" style="filled" fillcolor=red];
         subgraph cluster_17 {
             color=blue
-            52 [label="Enter block"];
+            53 [label="Enter block"];
             subgraph cluster_18 {
                 color=blue
-                53 [label="Enter block"];
+                54 [label="Enter block"];
-                54 [label="Access variable this@R|/firstIsInstanceOrNull|"];
+                55 [label="Access variable this@R|/firstIsInstanceOrNull|"];
-                55 [label="Function call: this@R|/firstIsInstanceOrNull|.R|SubstitutionOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<CapturedType(*)>|>|()"];
+                56 [label="Function call: this@R|/firstIsInstanceOrNull|.R|SubstitutionOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<CapturedType(*)>|>|()"];
-                56 [label="Variable declaration: lval <iterator>: R|kotlin/collections/Iterator<kotlin/Any?>|"];
+                57 [label="Variable declaration: lval <iterator>: R|kotlin/collections/Iterator<kotlin/Any?>|"];
                 subgraph cluster_19 {
                     color=blue
-                    57 [label="Enter while loop"];
+                    58 [label="Enter while loop"];
                     subgraph cluster_20 {
                         color=blue
-                        58 [label="Enter loop condition"];
+                        59 [label="Enter loop condition"];
-                        59 [label="Access variable R|<local>/<iterator>|"];
+                        60 [label="Access variable R|<local>/<iterator>|"];
-                        60 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.hasNext: R|kotlin/Boolean|>|()"];
+                        61 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.hasNext: R|kotlin/Boolean|>|()"];
-                        61 [label="Exit loop condition"];
+                        62 [label="Exit loop condition"];
                     }
                     subgraph cluster_21 {
                         color=blue
-                        62 [label="Enter loop block"];
+                        63 [label="Enter loop block"];
                         subgraph cluster_22 {
                             color=blue
-                            63 [label="Enter block"];
+                            64 [label="Enter block"];
-                            64 [label="Access variable R|<local>/<iterator>|"];
+                            65 [label="Access variable R|<local>/<iterator>|"];
-                            65 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|kotlin/Any?|>|()"];
+                            66 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|kotlin/Any?|>|()"];
-                            66 [label="Variable declaration: lval element: R|kotlin/Any?|"];
+                            67 [label="Variable declaration: lval element: R|kotlin/Any?|"];
                             subgraph cluster_23 {
                                 color=blue
-                                67 [label="Enter when"];
+                                68 [label="Enter when"];
                                 subgraph cluster_24 {
                                     color=blue
-                                    68 [label="Enter when branch condition "];
+                                    69 [label="Enter when branch condition "];
-                                    69 [label="Access variable R|<local>/element|"];
+                                    70 [label="Access variable R|<local>/element|"];
-                                    70 [label="Type operator: (R|<local>/element| is R|T|)"];
+                                    71 [label="Type operator: (R|<local>/element| is R|T|)"];
-                                    71 [label="Exit when branch condition"];
+                                    72 [label="Exit when branch condition"];
                                 }
-                                72 [label="Synthetic else branch"];
+                                73 [label="Synthetic else branch"];
-                                73 [label="Enter when branch result"];
+                                74 [label="Enter when branch result"];
                                 subgraph cluster_25 {
                                     color=blue
-                                    74 [label="Enter block"];
+                                    75 [label="Enter block"];
-                                    75 [label="Access variable R|<local>/element|"];
+                                    76 [label="Access variable R|<local>/element|"];
-                                    76 [label="Jump: ^firstIsInstanceOrNull R|<local>/element|"];
+                                    77 [label="Smart cast: R|<local>/element|"];
-                                    77 [label="Stub" style="filled" fillcolor=gray];
+                                    78 [label="Jump: ^firstIsInstanceOrNull R|<local>/element|"];
-                                    78 [label="Exit block" style="filled" fillcolor=gray];
+                                    79 [label="Stub" style="filled" fillcolor=gray];
+                                    80 [label="Exit block" style="filled" fillcolor=gray];
                                 }
-                                79 [label="Exit when branch result" style="filled" fillcolor=gray];
+                                81 [label="Exit when branch result" style="filled" fillcolor=gray];
-                                80 [label="Exit when"];
+                                82 [label="Exit when"];
                             }
-                            81 [label="Exit block"];
+                            83 [label="Exit block"];
                         }
-                        82 [label="Exit loop block"];
+                        84 [label="Exit loop block"];
                     }
-                    83 [label="Exit whileloop"];
+                    85 [label="Exit whileloop"];
                 }
-                84 [label="Exit block"];
+                86 [label="Exit block"];
             }
-            85 [label="Const: Null(null)"];
+            87 [label="Const: Null(null)"];
-            86 [label="Jump: ^firstIsInstanceOrNull Null(null)"];
+            88 [label="Jump: ^firstIsInstanceOrNull Null(null)"];
-            87 [label="Stub" style="filled" fillcolor=gray];
+            89 [label="Stub" style="filled" fillcolor=gray];
-            88 [label="Exit block" style="filled" fillcolor=gray];
+            90 [label="Exit block" style="filled" fillcolor=gray];
         }
-        89 [label="Exit function firstIsInstanceOrNull" style="filled" fillcolor=red];
+        91 [label="Exit function firstIsInstanceOrNull" style="filled" fillcolor=red];
     }
-    51 -> {52};
     52 -> {53};
     53 -> {54};
     54 -> {55};
@@ -250,8 +252,8 @@ digraph complex_kt {
     58 -> {59};
     59 -> {60};
     60 -> {61};
-    61 -> {83 62};
+    61 -> {62};
-    62 -> {63};
+    62 -> {85 63};
     63 -> {64};
     64 -> {65};
     65 -> {66};
@@ -260,25 +262,27 @@ digraph complex_kt {
     68 -> {69};
     69 -> {70};
     70 -> {71};
-    71 -> {73 72};
+    71 -> {72};
-    72 -> {80};
+    72 -> {74 73};
-    73 -> {74};
+    73 -> {82};
     74 -> {75};
     75 -> {76};
-    76 -> {89};
+    76 -> {77};
-    76 -> {77} [style=dotted];
+    77 -> {78};
-    77 -> {78} [style=dotted];
+    78 -> {91};
     78 -> {79} [style=dotted];
     79 -> {80} [style=dotted];
-    80 -> {81};
+    80 -> {81} [style=dotted];
-    81 -> {82};
+    81 -> {82} [style=dotted];
-    82 -> {58} [color=green style=dashed];
+    82 -> {83};
     83 -> {84};
-    84 -> {85};
+    84 -> {59} [color=green style=dashed];
     85 -> {86};
-    86 -> {89};
+    86 -> {87};
-    86 -> {87} [style=dotted];
+    87 -> {88};
-    87 -> {88} [style=dotted];
+    88 -> {91};
     88 -> {89} [style=dotted];
+    89 -> {90} [style=dotted];
+    90 -> {91} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot

@@ -118,117 +118,122 @@ digraph flowFromInplaceLambda_kt {
             38 [label="Postponed enter to lambda"];
             subgraph cluster_12 {
                 color=blue
-                46 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                47 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_13 {
                     color=blue
-                    47 [label="Enter block"];
+                    48 [label="Enter block"];
-                    48 [label="Access variable R|<local>/x|"];
+                    49 [label="Access variable R|<local>/x|"];
-                    49 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
+                    50 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
-                    50 [label="Exit block"];
+                    51 [label="Exit block"];
                 }
-                51 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                52 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
             39 [label="Call arguments union" style="filled" fillcolor=yellow];
             40 [label="Postponed exit from lambda"];
             41 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
             42 [label="Access variable R|<local>/x|"];
-            43 [label="Function call: R|/takeInt|(...)"];
+            43 [label="Smart cast: R|<local>/x|"];
-            44 [label="Exit block"];
+            44 [label="Function call: R|/takeInt|(...)"];
+            45 [label="Exit block"];
         }
-        45 [label="Exit function test_1" style="filled" fillcolor=red];
+        46 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     36 -> {37};
     37 -> {38};
-    38 -> {46};
+    38 -> {47};
     38 -> {40} [color=red];
-    38 -> {46} [style=dashed];
+    38 -> {47} [style=dashed];
     39 -> {41} [color=red];
     40 -> {41} [color=green];
     41 -> {42};
     42 -> {43};
     43 -> {44};
     44 -> {45};
-    46 -> {47};
+    45 -> {46};
     47 -> {48};
     48 -> {49};
     49 -> {50};
     50 -> {51};
-    51 -> {39} [color=red];
+    51 -> {52};
-    51 -> {40} [color=green];
+    52 -> {39} [color=red];
+    52 -> {40} [color=green];
 
     subgraph cluster_14 {
         color=red
-        52 [label="Enter function test_2" style="filled" fillcolor=red];
+        53 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_15 {
             color=blue
-            53 [label="Enter block"];
+            54 [label="Enter block"];
-            54 [label="Postponed enter to lambda"];
+            55 [label="Postponed enter to lambda"];
             subgraph cluster_16 {
                 color=blue
-                75 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                78 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_17 {
                     color=blue
-                    76 [label="Enter block"];
+                    79 [label="Enter block"];
-                    77 [label="Access variable R|<local>/y|"];
+                    80 [label="Access variable R|<local>/y|"];
-                    78 [label="Function call: R|<local>/y|.<Unresolved name: inc>#()"];
+                    81 [label="Function call: R|<local>/y|.<Unresolved name: inc>#()"];
-                    79 [label="Access variable R|<local>/x|"];
+                    82 [label="Access variable R|<local>/x|"];
-                    80 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
+                    83 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
-                    81 [label="Exit block"];
+                    84 [label="Exit block"];
                 }
-                82 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                85 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            55 [label="Postponed exit from lambda"];
+            56 [label="Postponed exit from lambda"];
-            56 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
+            57 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
-            57 [label="Call arguments union" style="filled" fillcolor=yellow];
+            58 [label="Call arguments union" style="filled" fillcolor=yellow];
-            58 [label="Function call: R|/id|<R|kotlin/Int|>(...)"];
+            59 [label="Function call: R|/id|<R|kotlin/Int|>(...)"];
-            59 [label="Access variable R|<local>/y|"];
+            60 [label="Access variable R|<local>/y|"];
-            60 [label="Type operator: (R|<local>/y| as R|kotlin/Int|)"];
+            61 [label="Type operator: (R|<local>/y| as R|kotlin/Int|)"];
-            61 [label="Postponed enter to lambda"];
+            62 [label="Postponed enter to lambda"];
             subgraph cluster_18 {
                 color=blue
-                83 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                86 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_19 {
                     color=blue
-                    84 [label="Enter block"];
+                    87 [label="Enter block"];
-                    85 [label="Access variable R|<local>/x|"];
+                    88 [label="Access variable R|<local>/x|"];
-                    86 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+                    89 [label="Smart cast: R|<local>/x|"];
-                    87 [label="Access variable R|<local>/y|"];
+                    90 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
-                    88 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
+                    91 [label="Access variable R|<local>/y|"];
-                    89 [label="Const: Int(1)"];
+                    92 [label="Smart cast: R|<local>/y|"];
-                    90 [label="Exit block"];
+                    93 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
+                    94 [label="Const: Int(1)"];
+                    95 [label="Exit block"];
                 }
-                91 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                96 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            62 [label="Postponed exit from lambda"];
+            63 [label="Postponed exit from lambda"];
-            63 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
+            64 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
-            64 [label="Call arguments union" style="filled" fillcolor=yellow];
+            65 [label="Call arguments union" style="filled" fillcolor=yellow];
-            65 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
+            66 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
-            66 [label="Variable declaration: lval a: R|kotlin/Int|"];
+            67 [label="Variable declaration: lval a: R|kotlin/Int|"];
-            67 [label="Access variable R|<local>/x|"];
+            68 [label="Access variable R|<local>/x|"];
-            68 [label="Function call: R|/takeInt|(...)"];
+            69 [label="Smart cast: R|<local>/x|"];
-            69 [label="Access variable R|<local>/y|"];
             70 [label="Function call: R|/takeInt|(...)"];
-            71 [label="Access variable R|<local>/a|"];
+            71 [label="Access variable R|<local>/y|"];
-            72 [label="Function call: R|/takeInt|(...)"];
+            72 [label="Smart cast: R|<local>/y|"];
-            73 [label="Exit block"];
+            73 [label="Function call: R|/takeInt|(...)"];
+            74 [label="Access variable R|<local>/a|"];
+            75 [label="Function call: R|/takeInt|(...)"];
+            76 [label="Exit block"];
         }
-        74 [label="Exit function test_2" style="filled" fillcolor=red];
+        77 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    52 -> {53};
     53 -> {54};
-    54 -> {75};
+    54 -> {55};
-    54 -> {55} [color=red];
+    55 -> {78};
-    54 -> {75} [style=dashed];
+    55 -> {56} [color=red];
-    55 -> {56};
+    55 -> {78} [style=dashed];
     56 -> {57};
     57 -> {58};
     58 -> {59};
     59 -> {60};
     60 -> {61};
-    61 -> {83};
+    61 -> {62};
-    61 -> {62} [color=red];
+    62 -> {86};
-    61 -> {83} [style=dashed];
+    62 -> {63} [color=red];
-    62 -> {63};
+    62 -> {86} [style=dashed];
     63 -> {64};
     64 -> {65};
     65 -> {66};
@@ -240,100 +245,103 @@ digraph flowFromInplaceLambda_kt {
     71 -> {72};
     72 -> {73};
     73 -> {74};
+    74 -> {75};
     75 -> {76};
     76 -> {77};
-    77 -> {78};
     78 -> {79};
     79 -> {80};
     80 -> {81};
     81 -> {82};
-    82 -> {57} [color=red];
+    82 -> {83};
-    82 -> {55} [color=green];
     83 -> {84};
     84 -> {85};
-    85 -> {86};
+    85 -> {58} [color=red];
+    85 -> {56} [color=green];
     86 -> {87};
     87 -> {88};
     88 -> {89};
     89 -> {90};
     90 -> {91};
-    91 -> {64} [color=red];
+    91 -> {92};
-    91 -> {62} [color=green];
+    92 -> {93};
+    93 -> {94};
+    94 -> {95};
+    95 -> {96};
+    96 -> {65} [color=red];
+    96 -> {63} [color=green];
 
     subgraph cluster_20 {
         color=red
-        92 [label="Enter function test_3" style="filled" fillcolor=red];
+        97 [label="Enter function test_3" style="filled" fillcolor=red];
         subgraph cluster_21 {
             color=blue
-            93 [label="Enter block"];
+            98 [label="Enter block"];
-            94 [label="Postponed enter to lambda"];
+            99 [label="Postponed enter to lambda"];
             subgraph cluster_22 {
                 color=blue
-                112 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                119 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_23 {
                     color=blue
-                    113 [label="Enter block"];
+                    120 [label="Enter block"];
-                    114 [label="Access variable R|<local>/y|"];
+                    121 [label="Access variable R|<local>/y|"];
-                    115 [label="Function call: R|<local>/y|.<Unresolved name: inc>#()"];
+                    122 [label="Function call: R|<local>/y|.<Unresolved name: inc>#()"];
-                    116 [label="Access variable R|<local>/x|"];
+                    123 [label="Access variable R|<local>/x|"];
-                    117 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
+                    124 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
-                    118 [label="Function call: R|/materialize|<R|kotlin/Int|>()"];
+                    125 [label="Function call: R|/materialize|<R|kotlin/Int|>()"];
-                    119 [label="Exit block"];
+                    126 [label="Exit block"];
                 }
-                120 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                127 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            95 [label="Postponed exit from lambda"];
+            100 [label="Postponed exit from lambda"];
-            96 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
+            101 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
-            97 [label="Function call: R|/id|<R|kotlin/Int|>(...)"];
+            102 [label="Function call: R|/id|<R|kotlin/Int|>(...)"];
-            98 [label="Postponed enter to lambda"];
+            103 [label="Postponed enter to lambda"];
             subgraph cluster_24 {
                 color=blue
-                121 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                128 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_25 {
                     color=blue
-                    122 [label="Enter block"];
+                    129 [label="Enter block"];
-                    123 [label="Access variable R|<local>/y|"];
+                    130 [label="Access variable R|<local>/y|"];
-                    124 [label="Type operator: (R|<local>/y| as R|kotlin/Int|)"];
+                    131 [label="Type operator: (R|<local>/y| as R|kotlin/Int|)"];
-                    125 [label="Access variable R|<local>/x|"];
+                    132 [label="Access variable R|<local>/x|"];
-                    126 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()"];
+                    133 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()"];
-                    127 [label="Access variable R|<local>/y|"];
+                    134 [label="Access variable R|<local>/y|"];
-                    128 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
+                    135 [label="Smart cast: R|<local>/y|"];
-                    129 [label="Const: Int(1)"];
+                    136 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
-                    130 [label="Exit block"];
+                    137 [label="Const: Int(1)"];
+                    138 [label="Exit block"];
                 }
-                131 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                139 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            99 [label="Postponed exit from lambda"];
+            104 [label="Postponed exit from lambda"];
-            100 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
+            105 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
-            101 [label="Call arguments union" style="filled" fillcolor=yellow];
+            106 [label="Call arguments union" style="filled" fillcolor=yellow];
-            102 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
+            107 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
-            103 [label="Variable declaration: lval a: R|kotlin/Int|"];
+            108 [label="Variable declaration: lval a: R|kotlin/Int|"];
-            104 [label="Access variable R|<local>/x|"];
+            109 [label="Access variable R|<local>/x|"];
-            105 [label="Function call: R|/takeInt|(...)"];
+            110 [label="Smart cast: R|<local>/x|"];
-            106 [label="Access variable R|<local>/y|"];
+            111 [label="Function call: R|/takeInt|(...)"];
-            107 [label="Function call: R|/takeInt|(...)"];
+            112 [label="Access variable R|<local>/y|"];
-            108 [label="Access variable R|<local>/a|"];
+            113 [label="Smart cast: R|<local>/y|"];
-            109 [label="Function call: R|/takeInt|(...)"];
+            114 [label="Function call: R|/takeInt|(...)"];
-            110 [label="Exit block"];
+            115 [label="Access variable R|<local>/a|"];
+            116 [label="Function call: R|/takeInt|(...)"];
+            117 [label="Exit block"];
         }
-        111 [label="Exit function test_3" style="filled" fillcolor=red];
+        118 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    92 -> {93};
-    93 -> {94};
-    94 -> {112};
-    94 -> {95} [color=red];
-    94 -> {112} [style=dashed];
-    95 -> {96};
-    96 -> {97};
     97 -> {98};
-    98 -> {121};
+    98 -> {99};
-    98 -> {99} [color=red];
+    99 -> {119};
-    98 -> {121} [style=dashed];
+    99 -> {100} [color=red];
-    99 -> {100};
+    99 -> {119} [style=dashed];
     100 -> {101};
     101 -> {102};
     102 -> {103};
-    103 -> {104};
+    103 -> {128};
+    103 -> {104} [color=red];
+    103 -> {128} [style=dashed];
     104 -> {105};
     105 -> {106};
     106 -> {107};
@@ -341,107 +349,110 @@ digraph flowFromInplaceLambda_kt {
     108 -> {109};
     109 -> {110};
     110 -> {111};
+    111 -> {112};
     112 -> {113};
     113 -> {114};
     114 -> {115};
     115 -> {116};
     116 -> {117};
     117 -> {118};
-    118 -> {119};
     119 -> {120};
-    120 -> {101} [color=red];
+    120 -> {121};
-    120 -> {95} [color=green];
     121 -> {122};
     122 -> {123};
     123 -> {124};
     124 -> {125};
     125 -> {126};
     126 -> {127};
-    127 -> {128};
+    127 -> {106} [color=red];
+    127 -> {100} [color=green];
     128 -> {129};
     129 -> {130};
     130 -> {131};
-    131 -> {101} [color=red];
+    131 -> {132};
-    131 -> {99} [color=green];
-
-    subgraph cluster_26 {
-        color=red
-        132 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_27 {
-            color=blue
-            133 [label="Enter block"];
-            134 [label="Postponed enter to lambda"];
-            subgraph cluster_28 {
-                color=blue
-                153 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                subgraph cluster_29 {
-                    color=blue
-                    154 [label="Enter block"];
-                    155 [label="Access variable R|<local>/y|"];
-                    156 [label="Function call: R|<local>/y|.<Unresolved name: inc>#()"];
-                    157 [label="Access variable R|<local>/x|"];
-                    158 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
-                    159 [label="Exit block"];
-                }
-                160 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-            }
-            135 [label="Postponed exit from lambda"];
-            136 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
-            137 [label="Function call: R|/id|<R|kotlin/Int|>(...)"];
-            138 [label="Access variable R|<local>/y|"];
-            139 [label="Type operator: (R|<local>/y| as R|kotlin/Int|)"];
-            140 [label="Postponed enter to lambda"];
-            subgraph cluster_30 {
-                color=blue
-                161 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                subgraph cluster_31 {
-                    color=blue
-                    162 [label="Enter block"];
-                    163 [label="Access variable R|<local>/x|"];
-                    164 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()"];
-                    165 [label="Access variable R|<local>/y|"];
-                    166 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
-                    167 [label="Const: Int(1)"];
-                    168 [label="Exit block"];
-                }
-                169 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-            }
-            141 [label="Postponed exit from lambda"];
-            142 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
-            143 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
-            144 [label="Variable declaration: lval a: R|kotlin/Int|"];
-            145 [label="Access variable R|<local>/x|"];
-            146 [label="Function call: <Inapplicable(INAPPLICABLE): /takeInt>#(...)"];
-            147 [label="Access variable R|<local>/y|"];
-            148 [label="Function call: R|/takeInt|(...)"];
-            149 [label="Access variable R|<local>/a|"];
-            150 [label="Function call: R|/takeInt|(...)"];
-            151 [label="Exit block"];
-        }
-        152 [label="Exit function test_4" style="filled" fillcolor=red];
-    }
     132 -> {133};
     133 -> {134};
-    134 -> {135 153};
+    134 -> {135};
-    134 -> {153} [style=dashed];
     135 -> {136};
     136 -> {137};
     137 -> {138};
     138 -> {139};
-    139 -> {140};
+    139 -> {106} [color=red];
-    140 -> {141 161};
+    139 -> {104} [color=green];
-    140 -> {161} [style=dashed];
+
+    subgraph cluster_26 {
+        color=red
+        140 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_27 {
+            color=blue
+            141 [label="Enter block"];
+            142 [label="Postponed enter to lambda"];
+            subgraph cluster_28 {
+                color=blue
+                162 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_29 {
+                    color=blue
+                    163 [label="Enter block"];
+                    164 [label="Access variable R|<local>/y|"];
+                    165 [label="Function call: R|<local>/y|.<Unresolved name: inc>#()"];
+                    166 [label="Access variable R|<local>/x|"];
+                    167 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
+                    168 [label="Exit block"];
+                }
+                169 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            143 [label="Postponed exit from lambda"];
+            144 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
+            145 [label="Function call: R|/id|<R|kotlin/Int|>(...)"];
+            146 [label="Access variable R|<local>/y|"];
+            147 [label="Type operator: (R|<local>/y| as R|kotlin/Int|)"];
+            148 [label="Postponed enter to lambda"];
+            subgraph cluster_30 {
+                color=blue
+                170 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_31 {
+                    color=blue
+                    171 [label="Enter block"];
+                    172 [label="Access variable R|<local>/x|"];
+                    173 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()"];
+                    174 [label="Access variable R|<local>/y|"];
+                    175 [label="Smart cast: R|<local>/y|"];
+                    176 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
+                    177 [label="Const: Int(1)"];
+                    178 [label="Exit block"];
+                }
+                179 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            149 [label="Postponed exit from lambda"];
+            150 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
+            151 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
+            152 [label="Variable declaration: lval a: R|kotlin/Int|"];
+            153 [label="Access variable R|<local>/x|"];
+            154 [label="Function call: <Inapplicable(INAPPLICABLE): /takeInt>#(...)"];
+            155 [label="Access variable R|<local>/y|"];
+            156 [label="Smart cast: R|<local>/y|"];
+            157 [label="Function call: R|/takeInt|(...)"];
+            158 [label="Access variable R|<local>/a|"];
+            159 [label="Function call: R|/takeInt|(...)"];
+            160 [label="Exit block"];
+        }
+        161 [label="Exit function test_4" style="filled" fillcolor=red];
+    }
+    140 -> {141};
     141 -> {142};
-    142 -> {143};
+    142 -> {143 162};
+    142 -> {162} [style=dashed];
     143 -> {144};
     144 -> {145};
     145 -> {146};
     146 -> {147};
     147 -> {148};
-    148 -> {149};
+    148 -> {149 170};
+    148 -> {170} [style=dashed];
     149 -> {150};
     150 -> {151};
     151 -> {152};
+    152 -> {153};
     153 -> {154};
     154 -> {155};
     155 -> {156};
@@ -449,7 +460,7 @@ digraph flowFromInplaceLambda_kt {
     157 -> {158};
     158 -> {159};
     159 -> {160};
-    161 -> {162};
+    160 -> {161};
     162 -> {163};
     163 -> {164};
     164 -> {165};
@@ -457,141 +468,150 @@ digraph flowFromInplaceLambda_kt {
     166 -> {167};
     167 -> {168};
     168 -> {169};
-
-    subgraph cluster_32 {
-        color=red
-        170 [label="Enter function test_5" style="filled" fillcolor=red];
-        subgraph cluster_33 {
-            color=blue
-            171 [label="Enter block"];
-            172 [label="Postponed enter to lambda"];
-            subgraph cluster_34 {
-                color=blue
-                185 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                subgraph cluster_35 {
-                    color=blue
-                    186 [label="Enter block"];
-                    187 [label="Function call: R|/materialize|<R|kotlin/Int|>()"];
-                    188 [label="Exit block"];
-                }
-                189 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-            }
-            173 [label="Postponed exit from lambda"];
-            174 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
-            175 [label="Postponed enter to lambda"];
-            subgraph cluster_36 {
-                color=blue
-                190 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                subgraph cluster_37 {
-                    color=blue
-                    191 [label="Enter block"];
-                    192 [label="Function call: R|/materialize|<R|kotlin/Int|>()"];
-                    193 [label="Exit block"];
-                }
-                194 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-            }
-            176 [label="Postponed exit from lambda"];
-            177 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
-            178 [label="Call arguments union" style="filled" fillcolor=yellow];
-            179 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
-            180 [label="Variable declaration: lval x: R|kotlin/Int|"];
-            181 [label="Access variable R|<local>/x|"];
-            182 [label="Function call: R|/takeInt|(...)"];
-            183 [label="Exit block"];
-        }
-        184 [label="Exit function test_5" style="filled" fillcolor=red];
-    }
     170 -> {171};
     171 -> {172};
-    172 -> {185};
+    172 -> {173};
-    172 -> {173} [color=red];
-    172 -> {185} [style=dashed];
     173 -> {174};
     174 -> {175};
-    175 -> {190};
+    175 -> {176};
-    175 -> {176} [color=red];
-    175 -> {190} [style=dashed];
     176 -> {177};
     177 -> {178};
     178 -> {179};
-    179 -> {180};
+
+    subgraph cluster_32 {
+        color=red
+        180 [label="Enter function test_5" style="filled" fillcolor=red];
+        subgraph cluster_33 {
+            color=blue
+            181 [label="Enter block"];
+            182 [label="Postponed enter to lambda"];
+            subgraph cluster_34 {
+                color=blue
+                195 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_35 {
+                    color=blue
+                    196 [label="Enter block"];
+                    197 [label="Function call: R|/materialize|<R|kotlin/Int|>()"];
+                    198 [label="Exit block"];
+                }
+                199 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            183 [label="Postponed exit from lambda"];
+            184 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
+            185 [label="Postponed enter to lambda"];
+            subgraph cluster_36 {
+                color=blue
+                200 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_37 {
+                    color=blue
+                    201 [label="Enter block"];
+                    202 [label="Function call: R|/materialize|<R|kotlin/Int|>()"];
+                    203 [label="Exit block"];
+                }
+                204 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            186 [label="Postponed exit from lambda"];
+            187 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
+            188 [label="Call arguments union" style="filled" fillcolor=yellow];
+            189 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
+            190 [label="Variable declaration: lval x: R|kotlin/Int|"];
+            191 [label="Access variable R|<local>/x|"];
+            192 [label="Function call: R|/takeInt|(...)"];
+            193 [label="Exit block"];
+        }
+        194 [label="Exit function test_5" style="filled" fillcolor=red];
+    }
     180 -> {181};
     181 -> {182};
-    182 -> {183};
+    182 -> {195};
+    182 -> {183} [color=red];
+    182 -> {195} [style=dashed];
     183 -> {184};
-    185 -> {186};
+    184 -> {185};
+    185 -> {200};
+    185 -> {186} [color=red];
+    185 -> {200} [style=dashed];
     186 -> {187};
     187 -> {188};
     188 -> {189};
-    189 -> {178} [color=red];
+    189 -> {190};
-    189 -> {173} [color=green];
     190 -> {191};
     191 -> {192};
     192 -> {193};
     193 -> {194};
-    194 -> {178} [color=red];
-    194 -> {176} [color=green];
-
-    subgraph cluster_38 {
-        color=red
-        195 [label="Enter function test_6" style="filled" fillcolor=red];
-        subgraph cluster_39 {
-            color=blue
-            196 [label="Enter block"];
-            197 [label="Postponed enter to lambda"];
-            subgraph cluster_40 {
-                color=blue
-                204 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                subgraph cluster_41 {
-                    color=blue
-                    205 [label="Enter block"];
-                    206 [label="Postponed enter to lambda"];
-                    subgraph cluster_42 {
-                        color=blue
-                        211 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                        subgraph cluster_43 {
-                            color=blue
-                            212 [label="Enter block"];
-                            213 [label="Function call: R|/materialize|<R|kotlin/String|>()"];
-                            214 [label="Exit block"];
-                        }
-                        215 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-                    }
-                    207 [label="Postponed exit from lambda"];
-                    208 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)"];
-                    209 [label="Exit block"];
-                }
-                210 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-            }
-            198 [label="Postponed exit from lambda"];
-            199 [label="Function call: R|/myRun|<R|kotlin/String|>(...)"];
-            200 [label="Function call: R|/id|<R|kotlin/String|>(...)"];
-            201 [label="Variable declaration: lval x: R|kotlin/String|"];
-            202 [label="Exit block"];
-        }
-        203 [label="Exit function test_6" style="filled" fillcolor=red];
-    }
     195 -> {196};
     196 -> {197};
-    197 -> {198 204};
+    197 -> {198};
-    197 -> {204} [style=dashed];
     198 -> {199};
-    199 -> {200};
+    199 -> {188} [color=red];
+    199 -> {183} [color=green];
     200 -> {201};
     201 -> {202};
     202 -> {203};
-    204 -> {205};
+    203 -> {204};
+    204 -> {188} [color=red];
+    204 -> {186} [color=green];
+
+    subgraph cluster_38 {
+        color=red
+        205 [label="Enter function test_6" style="filled" fillcolor=red];
+        subgraph cluster_39 {
+            color=blue
+            206 [label="Enter block"];
+            207 [label="Postponed enter to lambda"];
+            subgraph cluster_40 {
+                color=blue
+                214 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_41 {
+                    color=blue
+                    215 [label="Enter block"];
+                    216 [label="Postponed enter to lambda"];
+                    subgraph cluster_42 {
+                        color=blue
+                        221 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                        subgraph cluster_43 {
+                            color=blue
+                            222 [label="Enter block"];
+                            223 [label="Function call: R|/materialize|<R|kotlin/String|>()"];
+                            224 [label="Exit block"];
+                        }
+                        225 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                    }
+                    217 [label="Postponed exit from lambda"];
+                    218 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)"];
+                    219 [label="Exit block"];
+                }
+                220 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            208 [label="Postponed exit from lambda"];
+            209 [label="Function call: R|/myRun|<R|kotlin/String|>(...)"];
+            210 [label="Function call: R|/id|<R|kotlin/String|>(...)"];
+            211 [label="Variable declaration: lval x: R|kotlin/String|"];
+            212 [label="Exit block"];
+        }
+        213 [label="Exit function test_6" style="filled" fillcolor=red];
+    }
     205 -> {206};
-    206 -> {211};
+    206 -> {207};
-    206 -> {207} [color=red];
+    207 -> {208 214};
-    206 -> {211} [style=dashed];
+    207 -> {214} [style=dashed];
-    207 -> {208};
     208 -> {209};
     209 -> {210};
+    210 -> {211};
     211 -> {212};
     212 -> {213};
-    213 -> {214};
     214 -> {215};
-    215 -> {207} [color=green];
+    215 -> {216};
+    216 -> {221};
+    216 -> {217} [color=red];
+    216 -> {221} [style=dashed];
+    217 -> {218};
+    218 -> {219};
+    219 -> {220};
+    221 -> {222};
+    222 -> {223};
+    223 -> {224};
+    224 -> {225};
+    225 -> {217} [color=green];
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda3.dot

@@ -75,29 +75,32 @@ digraph flowFromInplaceLambda3_kt {
             22 [label="Const: String()"];
             23 [label="Assignment: R|<local>/x|"];
             24 [label="Access variable R|<local>/x|"];
-            25 [label="Access variable R|kotlin/String.length|"];
+            25 [label="Smart cast: R|<local>/x|"];
-            26 [label="Postponed enter to lambda"];
+            26 [label="Access variable R|kotlin/String.length|"];
+            27 [label="Postponed enter to lambda"];
             subgraph cluster_10 {
                 color=blue
-                35 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                38 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_11 {
                     color=blue
-                    36 [label="Enter block"];
+                    39 [label="Enter block"];
-                    37 [label="Const: Int(1)"];
+                    40 [label="Const: Int(1)"];
-                    38 [label="Assignment: R|<local>/x|"];
+                    41 [label="Assignment: R|<local>/x|"];
-                    39 [label="Exit block"];
+                    42 [label="Exit block"];
                 }
-                40 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                43 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            27 [label="Postponed exit from lambda"];
+            28 [label="Postponed exit from lambda"];
-            28 [label="Function call: R|/unknown|(...)"];
+            29 [label="Function call: R|/unknown|(...)"];
-            29 [label="Access variable R|<local>/x|"];
+            30 [label="Access variable R|<local>/x|"];
-            30 [label="Access variable <Unresolved name: length>#"];
+            31 [label="Smart cast: R|<local>/x|"];
-            31 [label="Access variable R|<local>/x|"];
+            32 [label="Access variable <Unresolved name: length>#"];
-            32 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()"];
+            33 [label="Access variable R|<local>/x|"];
-            33 [label="Exit block"];
+            34 [label="Smart cast: R|<local>/x|"];
+            35 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()"];
+            36 [label="Exit block"];
         }
-        34 [label="Exit function test1" style="filled" fillcolor=red];
+        37 [label="Exit function test1" style="filled" fillcolor=red];
     }
     19 -> {20};
     20 -> {21};
@@ -106,202 +109,223 @@ digraph flowFromInplaceLambda3_kt {
     23 -> {24};
     24 -> {25};
     25 -> {26};
-    26 -> {27 35};
+    26 -> {27};
-    26 -> {35} [style=dashed];
+    27 -> {28 38};
-    27 -> {28};
+    27 -> {38} [style=dashed];
     28 -> {29};
     29 -> {30};
     30 -> {31};
     31 -> {32};
     32 -> {33};
     33 -> {34};
-    35 -> {40 36};
+    34 -> {35};
+    35 -> {36};
     36 -> {37};
-    37 -> {38};
+    38 -> {43 39};
-    38 -> {39};
     39 -> {40};
-    40 -> {27};
+    40 -> {41};
-    40 -> {35} [color=green style=dashed];
+    41 -> {42};
+    42 -> {43};
+    43 -> {28};
+    43 -> {38} [color=green style=dashed];
 
     subgraph cluster_12 {
         color=red
-        41 [label="Enter function test2" style="filled" fillcolor=red];
+        44 [label="Enter function test2" style="filled" fillcolor=red];
         subgraph cluster_13 {
             color=blue
-            42 [label="Enter block"];
+            45 [label="Enter block"];
-            43 [label="Variable declaration: lvar x: R|kotlin/Any?|"];
+            46 [label="Variable declaration: lvar x: R|kotlin/Any?|"];
-            44 [label="Const: String()"];
+            47 [label="Const: String()"];
-            45 [label="Assignment: R|<local>/x|"];
+            48 [label="Assignment: R|<local>/x|"];
-            46 [label="Access variable R|<local>/x|"];
+            49 [label="Access variable R|<local>/x|"];
-            47 [label="Access variable R|kotlin/String.length|"];
+            50 [label="Smart cast: R|<local>/x|"];
-            48 [label="Postponed enter to lambda"];
+            51 [label="Access variable R|kotlin/String.length|"];
+            52 [label="Postponed enter to lambda"];
             subgraph cluster_14 {
                 color=blue
-                58 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                64 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_15 {
                     color=blue
-                    59 [label="Enter block"];
+                    65 [label="Enter block"];
-                    60 [label="Const: Int(1)"];
+                    66 [label="Const: Int(1)"];
-                    61 [label="Assignment: R|<local>/x|"];
+                    67 [label="Assignment: R|<local>/x|"];
-                    62 [label="Exit block"];
+                    68 [label="Exit block"];
                 }
-                63 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                69 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            49 [label="Call arguments union" style="filled" fillcolor=yellow];
+            53 [label="Call arguments union" style="filled" fillcolor=yellow];
-            50 [label="Postponed exit from lambda"];
+            54 [label="Postponed exit from lambda"];
-            51 [label="Function call: R|/atLeastOnce|(...)"];
+            55 [label="Function call: R|/atLeastOnce|(...)"];
-            52 [label="Access variable R|<local>/x|"];
+            56 [label="Access variable R|<local>/x|"];
-            53 [label="Access variable <Unresolved name: length>#"];
+            57 [label="Smart cast: R|<local>/x|"];
-            54 [label="Access variable R|<local>/x|"];
+            58 [label="Access variable <Unresolved name: length>#"];
-            55 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+            59 [label="Access variable R|<local>/x|"];
-            56 [label="Exit block"];
+            60 [label="Smart cast: R|<local>/x|"];
+            61 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+            62 [label="Exit block"];
         }
-        57 [label="Exit function test2" style="filled" fillcolor=red];
+        63 [label="Exit function test2" style="filled" fillcolor=red];
     }
-    41 -> {42};
-    42 -> {43};
-    43 -> {44};
     44 -> {45};
     45 -> {46};
     46 -> {47};
     47 -> {48};
-    48 -> {58};
+    48 -> {49};
-    48 -> {50} [color=red];
+    49 -> {50};
-    48 -> {58} [style=dashed];
+    50 -> {51};
-    49 -> {51} [color=red];
-    50 -> {51} [color=green];
     51 -> {52};
-    52 -> {53};
+    52 -> {64};
-    53 -> {54};
+    52 -> {54} [color=red];
-    54 -> {55};
+    52 -> {64} [style=dashed];
+    53 -> {55} [color=red];
+    54 -> {55} [color=green];
     55 -> {56};
     56 -> {57};
+    57 -> {58};
     58 -> {59};
     59 -> {60};
     60 -> {61};
     61 -> {62};
     62 -> {63};
-    63 -> {49} [color=red];
-    63 -> {50} [color=green];
-    63 -> {58} [color=green style=dashed];
-
-    subgraph cluster_16 {
-        color=red
-        64 [label="Enter function test3" style="filled" fillcolor=red];
-        subgraph cluster_17 {
-            color=blue
-            65 [label="Enter block"];
-            66 [label="Variable declaration: lvar x: R|kotlin/Any?|"];
-            67 [label="Const: String()"];
-            68 [label="Assignment: R|<local>/x|"];
-            69 [label="Access variable R|<local>/x|"];
-            70 [label="Access variable R|kotlin/String.length|"];
-            71 [label="Postponed enter to lambda"];
-            subgraph cluster_18 {
-                color=blue
-                81 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                subgraph cluster_19 {
-                    color=blue
-                    82 [label="Enter block"];
-                    83 [label="Const: Int(1)"];
-                    84 [label="Assignment: R|<local>/x|"];
-                    85 [label="Exit block"];
-                }
-                86 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-            }
-            72 [label="Call arguments union" style="filled" fillcolor=yellow];
-            73 [label="Postponed exit from lambda"];
-            74 [label="Function call: R|/exactlyOnce|(...)"];
-            75 [label="Access variable R|<local>/x|"];
-            76 [label="Access variable <Unresolved name: length>#"];
-            77 [label="Access variable R|<local>/x|"];
-            78 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
-            79 [label="Exit block"];
-        }
-        80 [label="Exit function test3" style="filled" fillcolor=red];
-    }
     64 -> {65};
     65 -> {66};
     66 -> {67};
     67 -> {68};
     68 -> {69};
-    69 -> {70};
+    69 -> {53} [color=red];
+    69 -> {54} [color=green];
+    69 -> {64} [color=green style=dashed];
+
+    subgraph cluster_16 {
+        color=red
+        70 [label="Enter function test3" style="filled" fillcolor=red];
+        subgraph cluster_17 {
+            color=blue
+            71 [label="Enter block"];
+            72 [label="Variable declaration: lvar x: R|kotlin/Any?|"];
+            73 [label="Const: String()"];
+            74 [label="Assignment: R|<local>/x|"];
+            75 [label="Access variable R|<local>/x|"];
+            76 [label="Smart cast: R|<local>/x|"];
+            77 [label="Access variable R|kotlin/String.length|"];
+            78 [label="Postponed enter to lambda"];
+            subgraph cluster_18 {
+                color=blue
+                90 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_19 {
+                    color=blue
+                    91 [label="Enter block"];
+                    92 [label="Const: Int(1)"];
+                    93 [label="Assignment: R|<local>/x|"];
+                    94 [label="Exit block"];
+                }
+                95 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            79 [label="Call arguments union" style="filled" fillcolor=yellow];
+            80 [label="Postponed exit from lambda"];
+            81 [label="Function call: R|/exactlyOnce|(...)"];
+            82 [label="Access variable R|<local>/x|"];
+            83 [label="Smart cast: R|<local>/x|"];
+            84 [label="Access variable <Unresolved name: length>#"];
+            85 [label="Access variable R|<local>/x|"];
+            86 [label="Smart cast: R|<local>/x|"];
+            87 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+            88 [label="Exit block"];
+        }
+        89 [label="Exit function test3" style="filled" fillcolor=red];
+    }
     70 -> {71};
-    71 -> {81};
+    71 -> {72};
-    71 -> {73} [color=red];
+    72 -> {73};
-    71 -> {81} [style=dashed];
+    73 -> {74};
-    72 -> {74} [color=red];
-    73 -> {74} [color=green];
     74 -> {75};
     75 -> {76};
     76 -> {77};
     77 -> {78};
-    78 -> {79};
+    78 -> {90};
-    79 -> {80};
+    78 -> {80} [color=red];
+    78 -> {90} [style=dashed];
+    79 -> {81} [color=red];
+    80 -> {81} [color=green];
     81 -> {82};
     82 -> {83};
     83 -> {84};
     84 -> {85};
     85 -> {86};
-    86 -> {72} [color=red];
+    86 -> {87};
-    86 -> {73} [color=green];
-    86 -> {81} [color=green style=dashed];
-
-    subgraph cluster_20 {
-        color=red
-        87 [label="Enter function test4" style="filled" fillcolor=red];
-        subgraph cluster_21 {
-            color=blue
-            88 [label="Enter block"];
-            89 [label="Variable declaration: lvar x: R|kotlin/Any?|"];
-            90 [label="Const: String()"];
-            91 [label="Assignment: R|<local>/x|"];
-            92 [label="Access variable R|<local>/x|"];
-            93 [label="Access variable R|kotlin/String.length|"];
-            94 [label="Postponed enter to lambda"];
-            subgraph cluster_22 {
-                color=blue
-                103 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                subgraph cluster_23 {
-                    color=blue
-                    104 [label="Enter block"];
-                    105 [label="Const: Int(1)"];
-                    106 [label="Assignment: R|<local>/x|"];
-                    107 [label="Exit block"];
-                }
-                108 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-            }
-            95 [label="Postponed exit from lambda"];
-            96 [label="Function call: R|/atMostOnce|(...)"];
-            97 [label="Access variable R|<local>/x|"];
-            98 [label="Access variable <Unresolved name: length>#"];
-            99 [label="Access variable R|<local>/x|"];
-            100 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()"];
-            101 [label="Exit block"];
-        }
-        102 [label="Exit function test4" style="filled" fillcolor=red];
-    }
     87 -> {88};
     88 -> {89};
-    89 -> {90};
     90 -> {91};
     91 -> {92};
     92 -> {93};
     93 -> {94};
-    94 -> {95 103};
+    94 -> {95};
-    94 -> {103} [style=dashed];
+    95 -> {79} [color=red];
-    95 -> {96};
+    95 -> {80} [color=green];
+    95 -> {90} [color=green style=dashed];
+
+    subgraph cluster_20 {
+        color=red
+        96 [label="Enter function test4" style="filled" fillcolor=red];
+        subgraph cluster_21 {
+            color=blue
+            97 [label="Enter block"];
+            98 [label="Variable declaration: lvar x: R|kotlin/Any?|"];
+            99 [label="Const: String()"];
+            100 [label="Assignment: R|<local>/x|"];
+            101 [label="Access variable R|<local>/x|"];
+            102 [label="Smart cast: R|<local>/x|"];
+            103 [label="Access variable R|kotlin/String.length|"];
+            104 [label="Postponed enter to lambda"];
+            subgraph cluster_22 {
+                color=blue
+                115 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_23 {
+                    color=blue
+                    116 [label="Enter block"];
+                    117 [label="Const: Int(1)"];
+                    118 [label="Assignment: R|<local>/x|"];
+                    119 [label="Exit block"];
+                }
+                120 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            105 [label="Postponed exit from lambda"];
+            106 [label="Function call: R|/atMostOnce|(...)"];
+            107 [label="Access variable R|<local>/x|"];
+            108 [label="Smart cast: R|<local>/x|"];
+            109 [label="Access variable <Unresolved name: length>#"];
+            110 [label="Access variable R|<local>/x|"];
+            111 [label="Smart cast: R|<local>/x|"];
+            112 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()"];
+            113 [label="Exit block"];
+        }
+        114 [label="Exit function test4" style="filled" fillcolor=red];
+    }
     96 -> {97};
     97 -> {98};
     98 -> {99};
     99 -> {100};
     100 -> {101};
     101 -> {102};
-    103 -> {108 104};
+    102 -> {103};
-    104 -> {105};
+    103 -> {104};
+    104 -> {105 115};
+    104 -> {115} [style=dashed];
     105 -> {106};
     106 -> {107};
     107 -> {108};
-    108 -> {95};
+    108 -> {109};
+    109 -> {110};
+    110 -> {111};
+    111 -> {112};
+    112 -> {113};
+    113 -> {114};
+    115 -> {120 116};
+    116 -> {117};
+    117 -> {118};
+    118 -> {119};
+    119 -> {120};
+    120 -> {105};
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/flowFromTwoInplaceLambdas.dot

@@ -89,11 +89,12 @@ digraph flowFromTwoInplaceLambdas_kt {
                             color=blue
                             47 [label="Enter block"];
                             48 [label="Access variable R|<local>/p|"];
-                            49 [label="Access variable <Inapplicable(UNSTABLE_SMARTCAST): kotlin/String.length>#"];
+                            49 [label="Smart cast: R|<local>/p|"];
-                            50 [label="Const: Int(123)"];
+                            50 [label="Access variable <Inapplicable(UNSTABLE_SMARTCAST): kotlin/String.length>#"];
-                            51 [label="Exit block"];
+                            51 [label="Const: Int(123)"];
+                            52 [label="Exit block"];
                         }
-                        52 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                        53 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
                     }
                     27 [label="Call arguments union" style="filled" fillcolor=yellow];
                     30 [label="Postponed exit from lambda"];
@@ -152,77 +153,78 @@ digraph flowFromTwoInplaceLambdas_kt {
     49 -> {50};
     50 -> {51};
     51 -> {52};
-    52 -> {27} [color=red];
+    52 -> {53};
-    52 -> {30} [color=green];
+    53 -> {27} [color=red];
+    53 -> {30} [color=green];
 
     subgraph cluster_13 {
         color=red
-        53 [label="Enter function test1_tail" style="filled" fillcolor=red];
+        54 [label="Enter function test1_tail" style="filled" fillcolor=red];
         subgraph cluster_14 {
             color=blue
-            54 [label="Enter block"];
+            55 [label="Enter block"];
-            55 [label="Access variable R|<local>/x|"];
+            56 [label="Access variable R|<local>/x|"];
-            56 [label="Variable declaration: lvar p: R|kotlin/String?|"];
+            57 [label="Variable declaration: lvar p: R|kotlin/String?|"];
             subgraph cluster_15 {
                 color=blue
-                57 [label="Enter when"];
+                58 [label="Enter when"];
                 subgraph cluster_16 {
                     color=blue
-                    58 [label="Enter when branch condition "];
+                    59 [label="Enter when branch condition "];
-                    59 [label="Access variable R|<local>/p|"];
+                    60 [label="Access variable R|<local>/p|"];
-                    60 [label="Const: Null(null)"];
+                    61 [label="Const: Null(null)"];
-                    61 [label="Equality operator !="];
+                    62 [label="Equality operator !="];
-                    62 [label="Exit when branch condition"];
+                    63 [label="Exit when branch condition"];
                 }
-                63 [label="Synthetic else branch"];
+                64 [label="Synthetic else branch"];
-                64 [label="Enter when branch result"];
+                65 [label="Enter when branch result"];
                 subgraph cluster_17 {
                     color=blue
-                    65 [label="Enter block"];
+                    66 [label="Enter block"];
-                    66 [label="Postponed enter to lambda"];
+                    67 [label="Postponed enter to lambda"];
                     subgraph cluster_18 {
                         color=blue
-                        86 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                        87 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                         subgraph cluster_19 {
                             color=blue
-                            87 [label="Enter block"];
+                            88 [label="Enter block"];
-                            88 [label="Access variable R|<local>/p|"];
+                            89 [label="Access variable R|<local>/p|"];
-                            89 [label="Access variable <Inapplicable(UNSTABLE_SMARTCAST): kotlin/String.length>#"];
+                            90 [label="Smart cast: R|<local>/p|"];
-                            90 [label="Const: Int(123)"];
+                            91 [label="Access variable <Inapplicable(UNSTABLE_SMARTCAST): kotlin/String.length>#"];
-                            91 [label="Exit block"];
+                            92 [label="Const: Int(123)"];
+                            93 [label="Exit block"];
                         }
-                        92 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                        94 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
                     }
-                    68 [label="Postponed exit from lambda"];
+                    69 [label="Postponed exit from lambda"];
-                    69 [label="Postponed enter to lambda"];
+                    70 [label="Postponed enter to lambda"];
                     subgraph cluster_20 {
                         color=blue
-                        79 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                        80 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                         subgraph cluster_21 {
                             color=blue
-                            80 [label="Enter block"];
+                            81 [label="Enter block"];
-                            81 [label="Const: Null(null)"];
+                            82 [label="Const: Null(null)"];
-                            82 [label="Assignment: R|<local>/p|"];
+                            83 [label="Assignment: R|<local>/p|"];
-                            83 [label="Function call: R|/n|<R|kotlin/Int?|>()"];
+                            84 [label="Function call: R|/n|<R|kotlin/Int?|>()"];
-                            84 [label="Exit block"];
+                            85 [label="Exit block"];
                         }
-                        85 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                        86 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
                     }
-                    67 [label="Call arguments union" style="filled" fillcolor=yellow];
+                    68 [label="Call arguments union" style="filled" fillcolor=yellow];
-                    70 [label="Postponed exit from lambda"];
+                    71 [label="Postponed exit from lambda"];
-                    71 [label="Function call: R|/run2|<R|kotlin/Int?|>(...)"];
+                    72 [label="Function call: R|/run2|<R|kotlin/Int?|>(...)"];
-                    72 [label="Access variable R|<local>/p|"];
+                    73 [label="Access variable R|<local>/p|"];
-                    73 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
+                    74 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
-                    74 [label="Exit block"];
+                    75 [label="Exit block"];
                 }
-                75 [label="Exit when branch result"];
+                76 [label="Exit when branch result"];
-                76 [label="Exit when"];
+                77 [label="Exit when"];
             }
-            77 [label="Exit block"];
+            78 [label="Exit block"];
         }
-        78 [label="Exit function test1_tail" style="filled" fillcolor=red];
+        79 [label="Exit function test1_tail" style="filled" fillcolor=red];
     }
-    53 -> {54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
@@ -231,316 +233,325 @@ digraph flowFromTwoInplaceLambdas_kt {
     59 -> {60};
     60 -> {61};
     61 -> {62};
-    62 -> {64 63};
+    62 -> {63};
-    63 -> {76};
+    63 -> {65 64};
-    64 -> {65};
+    64 -> {77};
     65 -> {66};
-    66 -> {86};
+    66 -> {67};
-    66 -> {68} [color=red];
+    67 -> {87};
-    66 -> {86} [style=dashed];
+    67 -> {69} [color=red];
-    67 -> {71} [color=red];
+    67 -> {87} [style=dashed];
-    68 -> {69};
+    68 -> {72} [color=red];
-    69 -> {79};
+    69 -> {70};
-    69 -> {70} [color=red];
+    70 -> {80};
-    69 -> {79} [style=dashed];
+    70 -> {71} [color=red];
-    70 -> {71} [color=green];
+    70 -> {80} [style=dashed];
-    71 -> {72};
+    71 -> {72} [color=green];
     72 -> {73};
     73 -> {74};
     74 -> {75};
     75 -> {76};
     76 -> {77};
     77 -> {78};
-    79 -> {80};
+    78 -> {79};
     80 -> {81};
     81 -> {82};
     82 -> {83};
     83 -> {84};
     84 -> {85};
-    85 -> {67} [color=red];
+    85 -> {86};
-    85 -> {70} [color=green];
+    86 -> {68} [color=red];
-    86 -> {87};
+    86 -> {71} [color=green];
     87 -> {88};
     88 -> {89};
     89 -> {90};
     90 -> {91};
     91 -> {92};
-    92 -> {67} [color=red];
+    92 -> {93};
-    92 -> {68} [color=green];
+    93 -> {94};
+    94 -> {68} [color=red];
+    94 -> {69} [color=green];
 
     subgraph cluster_22 {
         color=red
-        93 [label="Enter function test2" style="filled" fillcolor=red];
+        95 [label="Enter function test2" style="filled" fillcolor=red];
         subgraph cluster_23 {
             color=blue
-            94 [label="Enter block"];
+            96 [label="Enter block"];
-            95 [label="Access variable R|<local>/x|"];
+            97 [label="Access variable R|<local>/x|"];
-            96 [label="Variable declaration: lvar p: R|kotlin/Any?|"];
+            98 [label="Variable declaration: lvar p: R|kotlin/Any?|"];
-            97 [label="Access variable R|<local>/p|"];
+            99 [label="Access variable R|<local>/p|"];
-            98 [label="Access variable <Unresolved name: length>#"];
+            100 [label="Access variable <Unresolved name: length>#"];
-            99 [label="Postponed enter to lambda"];
+            101 [label="Postponed enter to lambda"];
             subgraph cluster_24 {
                 color=blue
-                113 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                117 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_25 {
                     color=blue
-                    114 [label="Enter block"];
+                    118 [label="Enter block"];
-                    115 [label="Const: Null(null)"];
+                    119 [label="Const: Null(null)"];
-                    116 [label="Assignment: R|<local>/p|"];
+                    120 [label="Assignment: R|<local>/p|"];
-                    117 [label="Function call: R|/n|<R|kotlin/Int?|>()"];
+                    121 [label="Function call: R|/n|<R|kotlin/Int?|>()"];
-                    118 [label="Exit block"];
+                    122 [label="Exit block"];
                 }
-                119 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                123 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            101 [label="Postponed exit from lambda"];
+            103 [label="Postponed exit from lambda"];
-            102 [label="Postponed enter to lambda"];
+            104 [label="Postponed enter to lambda"];
             subgraph cluster_26 {
                 color=blue
-                120 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                124 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_27 {
                     color=blue
-                    121 [label="Enter block"];
+                    125 [label="Enter block"];
-                    122 [label="Access variable R|<local>/p|"];
+                    126 [label="Access variable R|<local>/p|"];
-                    123 [label="Type operator: (R|<local>/p| as R|kotlin/String|)"];
+                    127 [label="Type operator: (R|<local>/p| as R|kotlin/String|)"];
-                    124 [label="Const: Int(123)"];
+                    128 [label="Const: Int(123)"];
-                    125 [label="Exit block"];
+                    129 [label="Exit block"];
                 }
-                126 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                130 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            100 [label="Call arguments union" style="filled" fillcolor=yellow];
+            102 [label="Call arguments union" style="filled" fillcolor=yellow];
-            103 [label="Postponed exit from lambda"];
+            105 [label="Postponed exit from lambda"];
-            104 [label="Function call: R|/run2|<R|kotlin/Int?|>(...)"];
+            106 [label="Function call: R|/run2|<R|kotlin/Int?|>(...)"];
-            105 [label="Access variable R|<local>/p|"];
-            106 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
             107 [label="Access variable R|<local>/p|"];
-            108 [label="Enter safe call"];
+            108 [label="Smart cast: R|<local>/p|"];
-            109 [label="Access variable R|kotlin/String.length|"];
+            109 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
-            110 [label="Exit safe call"];
+            110 [label="Access variable R|<local>/p|"];
-            111 [label="Exit block"];
+            111 [label="Smart cast: R|<local>/p|"];
+            112 [label="Enter safe call"];
+            113 [label="Access variable R|kotlin/String.length|"];
+            114 [label="Exit safe call"];
+            115 [label="Exit block"];
         }
-        112 [label="Exit function test2" style="filled" fillcolor=red];
+        116 [label="Exit function test2" style="filled" fillcolor=red];
     }
-    93 -> {94};
-    94 -> {95};
     95 -> {96};
     96 -> {97};
     97 -> {98};
     98 -> {99};
-    99 -> {113};
+    99 -> {100};
-    99 -> {101} [color=red];
+    100 -> {101};
-    99 -> {113} [style=dashed];
+    101 -> {117};
-    100 -> {104} [color=red];
+    101 -> {103} [color=red];
-    101 -> {102};
+    101 -> {117} [style=dashed];
-    102 -> {120};
+    102 -> {106} [color=red];
-    102 -> {103} [color=red];
+    103 -> {104};
-    102 -> {120} [style=dashed];
+    104 -> {124};
-    103 -> {104} [color=green];
+    104 -> {105} [color=red];
-    104 -> {105};
+    104 -> {124} [style=dashed];
-    105 -> {106};
+    105 -> {106} [color=green];
     106 -> {107};
-    107 -> {108 110};
+    107 -> {108};
     108 -> {109};
     109 -> {110};
     110 -> {111};
-    111 -> {112};
+    111 -> {112 114};
+    112 -> {113};
     113 -> {114};
     114 -> {115};
     115 -> {116};
-    116 -> {117};
     117 -> {118};
     118 -> {119};
-    119 -> {100} [color=red];
+    119 -> {120};
-    119 -> {101} [color=green];
     120 -> {121};
     121 -> {122};
     122 -> {123};
-    123 -> {124};
+    123 -> {102} [color=red];
+    123 -> {103} [color=green];
     124 -> {125};
     125 -> {126};
-    126 -> {100} [color=red];
+    126 -> {127};
-    126 -> {103} [color=green];
-
-    subgraph cluster_28 {
-        color=red
-        127 [label="Enter function test3" style="filled" fillcolor=red];
-        subgraph cluster_29 {
-            color=blue
-            128 [label="Enter block"];
-            129 [label="Access variable R|<local>/x|"];
-            130 [label="Variable declaration: lvar p: R|kotlin/Any?|"];
-            131 [label="Access variable R|<local>/p|"];
-            132 [label="Access variable <Unresolved name: length>#"];
-            133 [label="Postponed enter to lambda"];
-            subgraph cluster_30 {
-                color=blue
-                147 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                subgraph cluster_31 {
-                    color=blue
-                    148 [label="Enter block"];
-                    149 [label="Const: Null(null)"];
-                    150 [label="Assignment: R|<local>/p|"];
-                    151 [label="Function call: R|/n|<R|kotlin/Int?|>()"];
-                    152 [label="Exit block"];
-                }
-                153 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-            }
-            135 [label="Postponed exit from lambda"];
-            136 [label="Postponed enter to lambda"];
-            subgraph cluster_32 {
-                color=blue
-                154 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                subgraph cluster_33 {
-                    color=blue
-                    155 [label="Enter block"];
-                    156 [label="Const: String()"];
-                    157 [label="Assignment: R|<local>/p|"];
-                    158 [label="Const: Int(123)"];
-                    159 [label="Exit block"];
-                }
-                160 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-            }
-            134 [label="Call arguments union" style="filled" fillcolor=yellow];
-            137 [label="Postponed exit from lambda"];
-            138 [label="Function call: R|/run2|<R|kotlin/Int?|>(...)"];
-            139 [label="Access variable R|<local>/p|"];
-            140 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
-            141 [label="Access variable R|<local>/p|"];
-            142 [label="Enter safe call"];
-            143 [label="Access variable R|kotlin/String.length|"];
-            144 [label="Exit safe call"];
-            145 [label="Exit block"];
-        }
-        146 [label="Exit function test3" style="filled" fillcolor=red];
-    }
     127 -> {128};
     128 -> {129};
     129 -> {130};
-    130 -> {131};
+    130 -> {102} [color=red];
+    130 -> {105} [color=green];
+
+    subgraph cluster_28 {
+        color=red
+        131 [label="Enter function test3" style="filled" fillcolor=red];
+        subgraph cluster_29 {
+            color=blue
+            132 [label="Enter block"];
+            133 [label="Access variable R|<local>/x|"];
+            134 [label="Variable declaration: lvar p: R|kotlin/Any?|"];
+            135 [label="Access variable R|<local>/p|"];
+            136 [label="Access variable <Unresolved name: length>#"];
+            137 [label="Postponed enter to lambda"];
+            subgraph cluster_30 {
+                color=blue
+                153 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_31 {
+                    color=blue
+                    154 [label="Enter block"];
+                    155 [label="Const: Null(null)"];
+                    156 [label="Assignment: R|<local>/p|"];
+                    157 [label="Function call: R|/n|<R|kotlin/Int?|>()"];
+                    158 [label="Exit block"];
+                }
+                159 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            139 [label="Postponed exit from lambda"];
+            140 [label="Postponed enter to lambda"];
+            subgraph cluster_32 {
+                color=blue
+                160 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_33 {
+                    color=blue
+                    161 [label="Enter block"];
+                    162 [label="Const: String()"];
+                    163 [label="Assignment: R|<local>/p|"];
+                    164 [label="Const: Int(123)"];
+                    165 [label="Exit block"];
+                }
+                166 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            138 [label="Call arguments union" style="filled" fillcolor=yellow];
+            141 [label="Postponed exit from lambda"];
+            142 [label="Function call: R|/run2|<R|kotlin/Int?|>(...)"];
+            143 [label="Access variable R|<local>/p|"];
+            144 [label="Smart cast: R|<local>/p|"];
+            145 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
+            146 [label="Access variable R|<local>/p|"];
+            147 [label="Smart cast: R|<local>/p|"];
+            148 [label="Enter safe call"];
+            149 [label="Access variable R|kotlin/String.length|"];
+            150 [label="Exit safe call"];
+            151 [label="Exit block"];
+        }
+        152 [label="Exit function test3" style="filled" fillcolor=red];
+    }
     131 -> {132};
     132 -> {133};
-    133 -> {147};
+    133 -> {134};
-    133 -> {135} [color=red];
+    134 -> {135};
-    133 -> {147} [style=dashed];
-    134 -> {138} [color=red];
     135 -> {136};
-    136 -> {154};
+    136 -> {137};
-    136 -> {137} [color=red];
+    137 -> {153};
-    136 -> {154} [style=dashed];
+    137 -> {139} [color=red];
-    137 -> {138} [color=green];
+    137 -> {153} [style=dashed];
-    138 -> {139};
+    138 -> {142} [color=red];
     139 -> {140};
-    140 -> {141};
+    140 -> {160};
-    141 -> {142 144};
+    140 -> {141} [color=red];
+    140 -> {160} [style=dashed];
+    141 -> {142} [color=green];
     142 -> {143};
     143 -> {144};
     144 -> {145};
     145 -> {146};
-    147 -> {148};
+    146 -> {147};
+    147 -> {148 150};
     148 -> {149};
     149 -> {150};
     150 -> {151};
     151 -> {152};
-    152 -> {153};
+    153 -> {154};
-    153 -> {134} [color=red];
-    153 -> {135} [color=green];
     154 -> {155};
     155 -> {156};
     156 -> {157};
     157 -> {158};
     158 -> {159};
-    159 -> {160};
+    159 -> {138} [color=red];
-    160 -> {134} [color=red];
+    159 -> {139} [color=green];
-    160 -> {137} [color=green];
+    160 -> {161};
+    161 -> {162};
+    162 -> {163};
+    163 -> {164};
+    164 -> {165};
+    165 -> {166};
+    166 -> {138} [color=red];
+    166 -> {141} [color=green];
 
     subgraph cluster_34 {
         color=red
-        161 [label="Enter class I1" style="filled" fillcolor=red];
+        167 [label="Enter class I1" style="filled" fillcolor=red];
-        162 [label="Exit class I1" style="filled" fillcolor=red];
+        168 [label="Exit class I1" style="filled" fillcolor=red];
     }
-    161 -> {162} [color=green];
+    167 -> {168} [color=green];
 
     subgraph cluster_35 {
         color=red
-        163 [label="Enter class I2" style="filled" fillcolor=red];
+        169 [label="Enter class I2" style="filled" fillcolor=red];
-        164 [label="Exit class I2" style="filled" fillcolor=red];
+        170 [label="Exit class I2" style="filled" fillcolor=red];
     }
-    163 -> {164} [color=green];
+    169 -> {170} [color=green];
 
     subgraph cluster_36 {
         color=red
-        165 [label="Enter function test4" style="filled" fillcolor=red];
+        171 [label="Enter function test4" style="filled" fillcolor=red];
         subgraph cluster_37 {
             color=blue
-            166 [label="Enter block"];
+            172 [label="Enter block"];
-            167 [label="Access variable R|<local>/x|"];
+            173 [label="Access variable R|<local>/x|"];
-            168 [label="Access variable <Unresolved name: x>#"];
+            174 [label="Access variable <Unresolved name: x>#"];
-            169 [label="Access variable R|<local>/x|"];
+            175 [label="Access variable R|<local>/x|"];
-            170 [label="Access variable <Unresolved name: y>#"];
+            176 [label="Access variable <Unresolved name: y>#"];
-            171 [label="Postponed enter to lambda"];
+            177 [label="Postponed enter to lambda"];
             subgraph cluster_38 {
                 color=blue
-                183 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                191 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_39 {
                     color=blue
-                    184 [label="Enter block"];
+                    192 [label="Enter block"];
-                    185 [label="Access variable R|<local>/x|"];
+                    193 [label="Access variable R|<local>/x|"];
-                    186 [label="Type operator: (R|<local>/x| as R|I1|)"];
+                    194 [label="Type operator: (R|<local>/x| as R|I1|)"];
-                    187 [label="Access variable R|<local>/x|"];
+                    195 [label="Access variable R|<local>/x|"];
-                    188 [label="Access variable <Unresolved name: y>#"];
+                    196 [label="Smart cast: R|<local>/x|"];
-                    189 [label="Function call: R|/n|<R|kotlin/Int?|>()"];
+                    197 [label="Access variable <Unresolved name: y>#"];
-                    190 [label="Exit block"];
+                    198 [label="Function call: R|/n|<R|kotlin/Int?|>()"];
-                }
-                191 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-            }
-            173 [label="Postponed exit from lambda"];
-            174 [label="Postponed enter to lambda"];
-            subgraph cluster_40 {
-                color=blue
-                192 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                subgraph cluster_41 {
-                    color=blue
-                    193 [label="Enter block"];
-                    194 [label="Access variable R|<local>/x|"];
-                    195 [label="Type operator: (R|<local>/x| as R|I2|)"];
-                    196 [label="Access variable R|<local>/x|"];
-                    197 [label="Access variable <Unresolved name: x>#"];
-                    198 [label="Const: Int(123)"];
                     199 [label="Exit block"];
                 }
                 200 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            172 [label="Call arguments union" style="filled" fillcolor=yellow];
+            179 [label="Postponed exit from lambda"];
-            175 [label="Postponed exit from lambda"];
+            180 [label="Postponed enter to lambda"];
-            176 [label="Function call: R|/run2|<R|kotlin/Int?|>(...)"];
+            subgraph cluster_40 {
-            177 [label="Access variable R|<local>/x|"];
+                color=blue
-            178 [label="Access variable R|/I1.x|"];
+                201 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            179 [label="Access variable R|<local>/x|"];
+                subgraph cluster_41 {
-            180 [label="Access variable R|/I2.y|"];
+                    color=blue
-            181 [label="Exit block"];
+                    202 [label="Enter block"];
+                    203 [label="Access variable R|<local>/x|"];
+                    204 [label="Type operator: (R|<local>/x| as R|I2|)"];
+                    205 [label="Access variable R|<local>/x|"];
+                    206 [label="Smart cast: R|<local>/x|"];
+                    207 [label="Access variable <Unresolved name: x>#"];
+                    208 [label="Const: Int(123)"];
+                    209 [label="Exit block"];
+                }
+                210 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            178 [label="Call arguments union" style="filled" fillcolor=yellow];
+            181 [label="Postponed exit from lambda"];
+            182 [label="Function call: R|/run2|<R|kotlin/Int?|>(...)"];
+            183 [label="Access variable R|<local>/x|"];
+            184 [label="Smart cast: R|<local>/x|"];
+            185 [label="Access variable R|/I1.x|"];
+            186 [label="Access variable R|<local>/x|"];
+            187 [label="Smart cast: R|<local>/x|"];
+            188 [label="Access variable R|/I2.y|"];
+            189 [label="Exit block"];
         }
-        182 [label="Exit function test4" style="filled" fillcolor=red];
+        190 [label="Exit function test4" style="filled" fillcolor=red];
     }
-    165 -> {166};
+    171 -> {172};
-    166 -> {167};
+    172 -> {173};
-    167 -> {168};
-    168 -> {169};
-    169 -> {170};
-    170 -> {171};
-    171 -> {183};
-    171 -> {173} [color=red];
-    171 -> {183} [style=dashed];
-    172 -> {176} [color=red];
     173 -> {174};
-    174 -> {192};
+    174 -> {175};
-    174 -> {175} [color=red];
+    175 -> {176};
-    174 -> {192} [style=dashed];
-    175 -> {176} [color=green];
     176 -> {177};
-    177 -> {178};
+    177 -> {191};
-    178 -> {179};
+    177 -> {179} [color=red];
+    177 -> {191} [style=dashed];
+    178 -> {182} [color=red];
     179 -> {180};
-    180 -> {181};
+    180 -> {201};
-    181 -> {182};
+    180 -> {181} [color=red];
+    180 -> {201} [style=dashed];
+    181 -> {182} [color=green];
+    182 -> {183};
     183 -> {184};
     184 -> {185};
     185 -> {186};
@@ -548,9 +559,7 @@ digraph flowFromTwoInplaceLambdas_kt {
     187 -> {188};
     188 -> {189};
     189 -> {190};
-    190 -> {191};
+    191 -> {192};
-    191 -> {172} [color=red];
-    191 -> {173} [color=green];
     192 -> {193};
     193 -> {194};
     194 -> {195};
@@ -559,7 +568,18 @@ digraph flowFromTwoInplaceLambdas_kt {
     197 -> {198};
     198 -> {199};
     199 -> {200};
-    200 -> {172} [color=red];
+    200 -> {178} [color=red];
-    200 -> {175} [color=green];
+    200 -> {179} [color=green];
+    201 -> {202};
+    202 -> {203};
+    203 -> {204};
+    204 -> {205};
+    205 -> {206};
+    206 -> {207};
+    207 -> {208};
+    208 -> {209};
+    209 -> {210};
+    210 -> {178} [color=red];
+    210 -> {181} [color=green];
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot

@@ -30,29 +30,31 @@ digraph jumps_kt {
                     color=blue
                     11 [label="Enter block"];
                     12 [label="Access variable R|<local>/x|"];
-                    13 [label="Exit block"];
+                    13 [label="Smart cast: R|<local>/x|"];
+                    14 [label="Exit block"];
                 }
-                14 [label="Exit when branch result"];
+                15 [label="Exit when branch result"];
-                15 [label="Enter when branch result"];
+                16 [label="Enter when branch result"];
                 subgraph cluster_6 {
                     color=blue
-                    16 [label="Enter block"];
+                    17 [label="Enter block"];
-                    17 [label="Function call: R|java/lang/Exception.Exception|()"];
+                    18 [label="Function call: R|java/lang/Exception.Exception|()"];
-                    18 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                    19 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                    19 [label="Stub" style="filled" fillcolor=gray];
+                    20 [label="Stub" style="filled" fillcolor=gray];
-                    20 [label="Exit block" style="filled" fillcolor=gray];
+                    21 [label="Exit block" style="filled" fillcolor=gray];
                 }
-                21 [label="Exit when branch result" style="filled" fillcolor=gray];
+                22 [label="Exit when branch result" style="filled" fillcolor=gray];
-                22 [label="Exit when"];
+                23 [label="Exit when"];
             }
-            23 [label="Variable declaration: lval y: R|kotlin/Int|"];
+            24 [label="Variable declaration: lval y: R|kotlin/Int|"];
-            24 [label="Access variable R|<local>/y|"];
+            25 [label="Access variable R|<local>/y|"];
-            25 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
+            26 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
-            26 [label="Access variable R|<local>/x|"];
+            27 [label="Access variable R|<local>/x|"];
-            27 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+            28 [label="Smart cast: R|<local>/x|"];
-            28 [label="Exit block"];
+            29 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+            30 [label="Exit block"];
         }
-        29 [label="Exit function test_1" style="filled" fillcolor=red];
+        31 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     0 -> {1};
     1 -> {2};
@@ -61,95 +63,97 @@ digraph jumps_kt {
     4 -> {5};
     5 -> {6};
     6 -> {7};
-    7 -> {15 8};
+    7 -> {16 8};
     8 -> {9};
     9 -> {10};
     10 -> {11};
     11 -> {12};
     12 -> {13};
     13 -> {14};
-    14 -> {22};
+    14 -> {15};
-    15 -> {16};
+    15 -> {23};
     16 -> {17};
     17 -> {18};
-    18 -> {29}    [label=onUncaughtException];
+    18 -> {19};
-    18 -> {19} [style=dotted];
+    19 -> {31}    [label=onUncaughtException];
     19 -> {20} [style=dotted];
     20 -> {21} [style=dotted];
     21 -> {22} [style=dotted];
-    22 -> {23};
+    22 -> {23} [style=dotted];
     23 -> {24};
     24 -> {25};
     25 -> {26};
     26 -> {27};
     27 -> {28};
     28 -> {29};
+    29 -> {30};
+    30 -> {31};
 
     subgraph cluster_7 {
         color=red
-        30 [label="Enter function test_2" style="filled" fillcolor=red];
+        32 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_8 {
             color=blue
-            31 [label="Enter block"];
+            33 [label="Enter block"];
             subgraph cluster_9 {
                 color=blue
-                32 [label="Enter when"];
+                34 [label="Enter when"];
                 subgraph cluster_10 {
                     color=blue
-                    33 [label="Enter when branch condition "];
+                    35 [label="Enter when branch condition "];
-                    34 [label="Access variable R|<local>/x|"];
+                    36 [label="Access variable R|<local>/x|"];
-                    35 [label="Const: Null(null)"];
+                    37 [label="Const: Null(null)"];
-                    36 [label="Equality operator =="];
+                    38 [label="Equality operator =="];
-                    37 [label="Exit when branch condition"];
+                    39 [label="Exit when branch condition"];
                 }
                 subgraph cluster_11 {
                     color=blue
-                    38 [label="Enter when branch condition else"];
+                    40 [label="Enter when branch condition else"];
-                    39 [label="Exit when branch condition"];
+                    41 [label="Exit when branch condition"];
                 }
-                40 [label="Enter when branch result"];
+                42 [label="Enter when branch result"];
                 subgraph cluster_12 {
                     color=blue
-                    41 [label="Enter block"];
+                    43 [label="Enter block"];
-                    42 [label="Access variable R|<local>/x|"];
+                    44 [label="Access variable R|<local>/x|"];
-                    43 [label="Exit block"];
+                    45 [label="Smart cast: R|<local>/x|"];
+                    46 [label="Exit block"];
                 }
-                44 [label="Exit when branch result"];
+                47 [label="Exit when branch result"];
-                45 [label="Enter when branch result"];
+                48 [label="Enter when branch result"];
                 subgraph cluster_13 {
                     color=blue
-                    46 [label="Enter block"];
+                    49 [label="Enter block"];
-                    47 [label="Access variable R|<local>/x|"];
+                    50 [label="Access variable R|<local>/x|"];
-                    48 [label="Exit block"];
+                    51 [label="Smart cast: R|<local>/x|"];
+                    52 [label="Exit block"];
                 }
-                49 [label="Exit when branch result"];
+                53 [label="Exit when branch result"];
-                50 [label="Exit when"];
+                54 [label="Exit when"];
             }
-            51 [label="Variable declaration: lval y: R|kotlin/Int?|"];
+            55 [label="Variable declaration: lval y: R|kotlin/Int?|"];
-            52 [label="Access variable R|<local>/y|"];
+            56 [label="Access variable R|<local>/y|"];
-            53 [label="Function call: R|<local>/y|.<Inapplicable(UNSAFE_CALL): kotlin/Int.inc>#()"];
+            57 [label="Function call: R|<local>/y|.<Inapplicable(UNSAFE_CALL): kotlin/Int.inc>#()"];
-            54 [label="Exit block"];
+            58 [label="Exit block"];
         }
-        55 [label="Exit function test_2" style="filled" fillcolor=red];
+        59 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    30 -> {31};
-    31 -> {32};
     32 -> {33};
     33 -> {34};
     34 -> {35};
     35 -> {36};
     36 -> {37};
-    37 -> {45 38};
+    37 -> {38};
     38 -> {39};
-    39 -> {40};
+    39 -> {48 40};
     40 -> {41};
     41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {50};
+    44 -> {45};
     45 -> {46};
     46 -> {47};
-    47 -> {48};
+    47 -> {54};
     48 -> {49};
     49 -> {50};
     50 -> {51};
@@ -157,256 +161,264 @@ digraph jumps_kt {
     52 -> {53};
     53 -> {54};
     54 -> {55};
-
+    55 -> {56};
-    subgraph cluster_14 {
-        color=red
-        56 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_15 {
-            color=blue
-            57 [label="Enter block"];
-            subgraph cluster_16 {
-                color=blue
-                58 [label="Enter while loop"];
-                subgraph cluster_17 {
-                    color=blue
-                    59 [label="Enter loop condition"];
-                    60 [label="Const: Boolean(true)"];
-                    61 [label="Exit loop condition"];
-                }
-                subgraph cluster_18 {
-                    color=blue
-                    62 [label="Enter loop block"];
-                    subgraph cluster_19 {
-                        color=blue
-                        63 [label="Enter block"];
-                        64 [label="Access variable R|<local>/x|"];
-                        65 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
-                        66 [label="Jump: break@@@[Boolean(true)] "];
-                        67 [label="Stub" style="filled" fillcolor=gray];
-                        68 [label="Exit block" style="filled" fillcolor=gray];
-                    }
-                    69 [label="Exit loop block" style="filled" fillcolor=gray];
-                }
-                70 [label="Exit whileloop"];
-            }
-            71 [label="Access variable R|<local>/x|"];
-            72 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
-            73 [label="Exit block"];
-        }
-        74 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
     56 -> {57};
     57 -> {58};
     58 -> {59};
-    59 -> {60};
+
+    subgraph cluster_14 {
+        color=red
+        60 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_15 {
+            color=blue
+            61 [label="Enter block"];
+            subgraph cluster_16 {
+                color=blue
+                62 [label="Enter while loop"];
+                subgraph cluster_17 {
+                    color=blue
+                    63 [label="Enter loop condition"];
+                    64 [label="Const: Boolean(true)"];
+                    65 [label="Exit loop condition"];
+                }
+                subgraph cluster_18 {
+                    color=blue
+                    66 [label="Enter loop block"];
+                    subgraph cluster_19 {
+                        color=blue
+                        67 [label="Enter block"];
+                        68 [label="Access variable R|<local>/x|"];
+                        69 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
+                        70 [label="Jump: break@@@[Boolean(true)] "];
+                        71 [label="Stub" style="filled" fillcolor=gray];
+                        72 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    73 [label="Exit loop block" style="filled" fillcolor=gray];
+                }
+                74 [label="Exit whileloop"];
+            }
+            75 [label="Access variable R|<local>/x|"];
+            76 [label="Smart cast: R|<local>/x|"];
+            77 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+            78 [label="Exit block"];
+        }
+        79 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
     60 -> {61};
     61 -> {62};
-    61 -> {70} [style=dotted];
     62 -> {63};
     63 -> {64};
     64 -> {65};
     65 -> {66};
-    66 -> {70};
+    65 -> {74} [style=dotted];
-    66 -> {67} [style=dotted];
+    66 -> {67};
-    67 -> {68} [style=dotted];
+    67 -> {68};
-    68 -> {69} [style=dotted];
+    68 -> {69};
-    69 -> {59} [color=green style=dotted];
+    69 -> {70};
-    70 -> {71};
+    70 -> {74};
-    71 -> {72};
+    70 -> {71} [style=dotted];
-    72 -> {73};
+    71 -> {72} [style=dotted];
-    73 -> {74};
+    72 -> {73} [style=dotted];
-
+    73 -> {63} [color=green style=dotted];
-    subgraph cluster_20 {
+    74 -> {75};
-        color=red
-        75 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_21 {
-            color=blue
-            76 [label="Enter block"];
-            subgraph cluster_22 {
-                color=blue
-                77 [label="Enter do-while loop"];
-                subgraph cluster_23 {
-                    color=blue
-                    78 [label="Enter loop block"];
-                    subgraph cluster_24 {
-                        color=blue
-                        79 [label="Enter block"];
-                        80 [label="Access variable R|<local>/x|"];
-                        81 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
-                        82 [label="Jump: break@@@[Boolean(true)] "];
-                        83 [label="Stub" style="filled" fillcolor=gray];
-                        84 [label="Exit block" style="filled" fillcolor=gray];
-                    }
-                    85 [label="Exit loop block" style="filled" fillcolor=gray];
-                }
-                subgraph cluster_25 {
-                    color=blue
-                    86 [label="Enter loop condition" style="filled" fillcolor=gray];
-                    87 [label="Const: Boolean(true)" style="filled" fillcolor=gray];
-                    88 [label="Exit loop condition" style="filled" fillcolor=gray];
-                }
-                89 [label="Exit do-whileloop"];
-            }
-            90 [label="Access variable R|<local>/x|"];
-            91 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
-            92 [label="Exit block"];
-        }
-        93 [label="Exit function test_4" style="filled" fillcolor=red];
-    }
     75 -> {76};
     76 -> {77};
     77 -> {78};
     78 -> {79};
-    79 -> {80};
+
+    subgraph cluster_20 {
+        color=red
+        80 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_21 {
+            color=blue
+            81 [label="Enter block"];
+            subgraph cluster_22 {
+                color=blue
+                82 [label="Enter do-while loop"];
+                subgraph cluster_23 {
+                    color=blue
+                    83 [label="Enter loop block"];
+                    subgraph cluster_24 {
+                        color=blue
+                        84 [label="Enter block"];
+                        85 [label="Access variable R|<local>/x|"];
+                        86 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
+                        87 [label="Jump: break@@@[Boolean(true)] "];
+                        88 [label="Stub" style="filled" fillcolor=gray];
+                        89 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    90 [label="Exit loop block" style="filled" fillcolor=gray];
+                }
+                subgraph cluster_25 {
+                    color=blue
+                    91 [label="Enter loop condition" style="filled" fillcolor=gray];
+                    92 [label="Const: Boolean(true)" style="filled" fillcolor=gray];
+                    93 [label="Exit loop condition" style="filled" fillcolor=gray];
+                }
+                94 [label="Exit do-whileloop"];
+            }
+            95 [label="Access variable R|<local>/x|"];
+            96 [label="Smart cast: R|<local>/x|"];
+            97 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+            98 [label="Exit block"];
+        }
+        99 [label="Exit function test_4" style="filled" fillcolor=red];
+    }
     80 -> {81};
     81 -> {82};
-    82 -> {89};
+    82 -> {83};
-    82 -> {83} [style=dotted];
+    83 -> {84};
-    83 -> {84} [style=dotted];
+    84 -> {85};
-    84 -> {85} [style=dotted];
+    85 -> {86};
-    85 -> {86} [style=dotted];
+    86 -> {87};
-    86 -> {87} [style=dotted];
+    87 -> {94};
     87 -> {88} [style=dotted];
     88 -> {89} [style=dotted];
-    88 -> {78} [color=green style=dotted];
+    89 -> {90} [style=dotted];
-    89 -> {90};
+    90 -> {91} [style=dotted];
-    90 -> {91};
+    91 -> {92} [style=dotted];
-    91 -> {92};
+    92 -> {93} [style=dotted];
-    92 -> {93};
+    93 -> {94} [style=dotted];
-
+    93 -> {83} [color=green style=dotted];
-    subgraph cluster_26 {
-        color=red
-        94 [label="Enter function test_5" style="filled" fillcolor=red];
-        subgraph cluster_27 {
-            color=blue
-            95 [label="Enter block"];
-            subgraph cluster_28 {
-                color=blue
-                96 [label="Enter while loop"];
-                subgraph cluster_29 {
-                    color=blue
-                    97 [label="Enter loop condition"];
-                    98 [label="Access variable R|<local>/b|"];
-                    99 [label="Exit loop condition"];
-                }
-                subgraph cluster_30 {
-                    color=blue
-                    100 [label="Enter loop block"];
-                    subgraph cluster_31 {
-                        color=blue
-                        101 [label="Enter block"];
-                        subgraph cluster_32 {
-                            color=blue
-                            102 [label="Enter when"];
-                            subgraph cluster_33 {
-                                color=blue
-                                103 [label="Enter when branch condition "];
-                                104 [label="Access variable R|<local>/b|"];
-                                105 [label="Exit when branch condition"];
-                            }
-                            106 [label="Synthetic else branch"];
-                            107 [label="Enter when branch result"];
-                            subgraph cluster_34 {
-                                color=blue
-                                108 [label="Enter block"];
-                                109 [label="Jump: continue@@@[R|<local>/b|] "];
-                                110 [label="Stub" style="filled" fillcolor=gray];
-                                111 [label="Exit block" style="filled" fillcolor=gray];
-                            }
-                            112 [label="Exit when branch result" style="filled" fillcolor=gray];
-                            113 [label="Exit when"];
-                        }
-                        114 [label="Exit block"];
-                    }
-                    115 [label="Exit loop block"];
-                }
-                116 [label="Exit whileloop"];
-            }
-            117 [label="Exit block"];
-        }
-        118 [label="Exit function test_5" style="filled" fillcolor=red];
-    }
     94 -> {95};
     95 -> {96};
     96 -> {97};
     97 -> {98};
     98 -> {99};
-    99 -> {116 100};
+
+    subgraph cluster_26 {
+        color=red
+        100 [label="Enter function test_5" style="filled" fillcolor=red];
+        subgraph cluster_27 {
+            color=blue
+            101 [label="Enter block"];
+            subgraph cluster_28 {
+                color=blue
+                102 [label="Enter while loop"];
+                subgraph cluster_29 {
+                    color=blue
+                    103 [label="Enter loop condition"];
+                    104 [label="Access variable R|<local>/b|"];
+                    105 [label="Exit loop condition"];
+                }
+                subgraph cluster_30 {
+                    color=blue
+                    106 [label="Enter loop block"];
+                    subgraph cluster_31 {
+                        color=blue
+                        107 [label="Enter block"];
+                        subgraph cluster_32 {
+                            color=blue
+                            108 [label="Enter when"];
+                            subgraph cluster_33 {
+                                color=blue
+                                109 [label="Enter when branch condition "];
+                                110 [label="Access variable R|<local>/b|"];
+                                111 [label="Exit when branch condition"];
+                            }
+                            112 [label="Synthetic else branch"];
+                            113 [label="Enter when branch result"];
+                            subgraph cluster_34 {
+                                color=blue
+                                114 [label="Enter block"];
+                                115 [label="Jump: continue@@@[R|<local>/b|] "];
+                                116 [label="Stub" style="filled" fillcolor=gray];
+                                117 [label="Exit block" style="filled" fillcolor=gray];
+                            }
+                            118 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            119 [label="Exit when"];
+                        }
+                        120 [label="Exit block"];
+                    }
+                    121 [label="Exit loop block"];
+                }
+                122 [label="Exit whileloop"];
+            }
+            123 [label="Exit block"];
+        }
+        124 [label="Exit function test_5" style="filled" fillcolor=red];
+    }
     100 -> {101};
     101 -> {102};
     102 -> {103};
     103 -> {104};
     104 -> {105};
-    105 -> {107 106};
+    105 -> {122 106};
-    106 -> {113};
+    106 -> {107};
     107 -> {108};
     108 -> {109};
-    109 -> {110} [style=dotted];
+    109 -> {110};
-    109 -> {96} [color=green style=dashed];
+    110 -> {111};
-    110 -> {111} [style=dotted];
+    111 -> {113 112};
-    111 -> {112} [style=dotted];
+    112 -> {119};
-    112 -> {113} [style=dotted];
     113 -> {114};
     114 -> {115};
-    115 -> {97} [color=green style=dashed];
+    115 -> {116} [style=dotted];
-    116 -> {117};
+    115 -> {102} [color=green style=dashed];
-    117 -> {118};
+    116 -> {117} [style=dotted];
+    117 -> {118} [style=dotted];
+    118 -> {119} [style=dotted];
+    119 -> {120};
+    120 -> {121};
+    121 -> {103} [color=green style=dashed];
+    122 -> {123};
+    123 -> {124};
 
     subgraph cluster_35 {
         color=red
-        119 [label="Enter function run" style="filled" fillcolor=red];
+        125 [label="Enter function run" style="filled" fillcolor=red];
         subgraph cluster_36 {
             color=blue
-            120 [label="Enter block"];
+            126 [label="Enter block"];
-            121 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            127 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
-            122 [label="Exit block"];
+            128 [label="Exit block"];
         }
-        123 [label="Exit function run" style="filled" fillcolor=red];
+        129 [label="Exit function run" style="filled" fillcolor=red];
     }
-    119 -> {120};
+    125 -> {126};
-    120 -> {121};
+    126 -> {127};
-    121 -> {122};
+    127 -> {128};
-    122 -> {123};
+    128 -> {129};
 
     subgraph cluster_37 {
         color=red
-        124 [label="Enter function test_6" style="filled" fillcolor=red];
+        130 [label="Enter function test_6" style="filled" fillcolor=red];
         subgraph cluster_38 {
             color=blue
-            125 [label="Enter block"];
+            131 [label="Enter block"];
-            126 [label="Postponed enter to lambda"];
+            132 [label="Postponed enter to lambda"];
             subgraph cluster_39 {
                 color=blue
-                131 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                137 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_40 {
                     color=blue
-                    132 [label="Enter block"];
+                    138 [label="Enter block"];
-                    133 [label="Jump: ^@run Unit"];
+                    139 [label="Jump: ^@run Unit"];
-                    134 [label="Stub" style="filled" fillcolor=gray];
+                    140 [label="Stub" style="filled" fillcolor=gray];
-                    135 [label="Exit block" style="filled" fillcolor=gray];
+                    141 [label="Exit block" style="filled" fillcolor=gray];
                 }
-                136 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                142 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            127 [label="Postponed exit from lambda"];
+            133 [label="Postponed exit from lambda"];
-            128 [label="Function call: R|/run|(...)"];
+            134 [label="Function call: R|/run|(...)"];
-            129 [label="Exit block"];
+            135 [label="Exit block"];
         }
-        130 [label="Exit function test_6" style="filled" fillcolor=red];
+        136 [label="Exit function test_6" style="filled" fillcolor=red];
     }
-    124 -> {125};
+    130 -> {131};
-    125 -> {126};
+    131 -> {132};
-    126 -> {127 131};
+    132 -> {133 137};
-    126 -> {131} [style=dashed];
+    132 -> {137} [style=dashed];
-    127 -> {128};
+    133 -> {134};
-    128 -> {129};
+    134 -> {135};
-    129 -> {130};
+    135 -> {136};
-    131 -> {136 132};
+    137 -> {142 138};
-    132 -> {133};
+    138 -> {139};
-    133 -> {136};
+    139 -> {142};
-    133 -> {134} [style=dotted];
+    139 -> {140} [style=dotted];
-    134 -> {135} [style=dotted];
+    140 -> {141} [style=dotted];
-    135 -> {136} [style=dotted];
+    141 -> {142} [style=dotted];
-    136 -> {127};
+    142 -> {133};
-    136 -> {131} [color=green style=dashed];
+    142 -> {137} [color=green style=dashed];
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.dot

@@ -48,10 +48,11 @@ digraph lambdas_kt {
                             color=blue
                             24 [label="Enter block"];
                             25 [label="Access variable R|<local>/x|"];
-                            26 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+                            26 [label="Smart cast: R|<local>/x|"];
-                            27 [label="Exit block"];
+                            27 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+                            28 [label="Exit block"];
                         }
-                        28 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                        29 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
                     }
                     16 [label="Postponed exit from lambda"];
                     17 [label="Function call: R|/run|(...)"];
@@ -82,208 +83,211 @@ digraph lambdas_kt {
     19 -> {20};
     20 -> {21};
     21 -> {22};
-    23 -> {28 24};
+    23 -> {29 24};
     24 -> {25};
     25 -> {26};
     26 -> {27};
     27 -> {28};
-    28 -> {16};
+    28 -> {29};
-    28 -> {23} [color=green style=dashed];
+    29 -> {16};
+    29 -> {23} [color=green style=dashed];
 
     subgraph cluster_9 {
         color=red
-        29 [label="Enter function test_2" style="filled" fillcolor=red];
+        30 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_10 {
             color=blue
-            30 [label="Enter block"];
+            31 [label="Enter block"];
             subgraph cluster_11 {
                 color=blue
-                31 [label="Enter when"];
+                32 [label="Enter when"];
                 subgraph cluster_12 {
                     color=blue
-                    32 [label="Enter when branch condition "];
+                    33 [label="Enter when branch condition "];
-                    33 [label="Access variable R|<local>/x|"];
+                    34 [label="Access variable R|<local>/x|"];
-                    34 [label="Type operator: (R|<local>/x| is R|kotlin/Int|)"];
+                    35 [label="Type operator: (R|<local>/x| is R|kotlin/Int|)"];
-                    35 [label="Exit when branch condition"];
+                    36 [label="Exit when branch condition"];
                 }
-                36 [label="Synthetic else branch"];
+                37 [label="Synthetic else branch"];
-                37 [label="Enter when branch result"];
+                38 [label="Enter when branch result"];
                 subgraph cluster_13 {
                     color=blue
-                    38 [label="Enter block"];
+                    39 [label="Enter block"];
-                    39 [label="Postponed enter to lambda"];
+                    40 [label="Postponed enter to lambda"];
                     subgraph cluster_14 {
                         color=blue
-                        48 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                        49 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                         subgraph cluster_15 {
                             color=blue
-                            49 [label="Enter block"];
+                            50 [label="Enter block"];
-                            50 [label="Access variable R|<local>/x|"];
+                            51 [label="Access variable R|<local>/x|"];
-                            51 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+                            52 [label="Smart cast: R|<local>/x|"];
-                            52 [label="Exit block"];
+                            53 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+                            54 [label="Exit block"];
                         }
-                        53 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                        55 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
                     }
-                    40 [label="Postponed exit from lambda"];
+                    41 [label="Postponed exit from lambda"];
-                    41 [label="Exit anonymous function expression"];
+                    42 [label="Exit anonymous function expression"];
-                    42 [label="Variable declaration: lval lambda: R|() -> kotlin/Int|"];
+                    43 [label="Variable declaration: lval lambda: R|() -> kotlin/Int|"];
-                    43 [label="Exit block"];
+                    44 [label="Exit block"];
                 }
-                44 [label="Exit when branch result"];
+                45 [label="Exit when branch result"];
-                45 [label="Exit when"];
+                46 [label="Exit when"];
             }
-            46 [label="Exit block"];
+            47 [label="Exit block"];
         }
-        47 [label="Exit function test_2" style="filled" fillcolor=red];
+        48 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    29 -> {30};
     30 -> {31};
     31 -> {32};
     32 -> {33};
     33 -> {34};
     34 -> {35};
-    35 -> {37 36};
+    35 -> {36};
-    36 -> {45};
+    36 -> {38 37};
-    37 -> {38};
+    37 -> {46};
     38 -> {39};
-    39 -> {40 48};
+    39 -> {40};
-    39 -> {48} [style=dashed];
+    40 -> {41 49};
-    40 -> {41};
+    40 -> {49} [style=dashed];
     41 -> {42};
     42 -> {43};
     43 -> {44};
     44 -> {45};
     45 -> {46};
     46 -> {47};
-    48 -> {49};
+    47 -> {48};
     49 -> {50};
     50 -> {51};
     51 -> {52};
     52 -> {53};
+    53 -> {54};
+    54 -> {55};
 
     subgraph cluster_16 {
         color=red
-        54 [label="Enter function getInt" style="filled" fillcolor=red];
+        56 [label="Enter function getInt" style="filled" fillcolor=red];
         subgraph cluster_17 {
             color=blue
-            55 [label="Enter block"];
+            57 [label="Enter block"];
-            56 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            58 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
-            57 [label="Const: Int(1)"];
+            59 [label="Const: Int(1)"];
-            58 [label="Jump: ^getInt Int(1)"];
+            60 [label="Jump: ^getInt Int(1)"];
-            59 [label="Stub" style="filled" fillcolor=gray];
+            61 [label="Stub" style="filled" fillcolor=gray];
-            60 [label="Exit block" style="filled" fillcolor=gray];
+            62 [label="Exit block" style="filled" fillcolor=gray];
         }
-        61 [label="Exit function getInt" style="filled" fillcolor=red];
+        63 [label="Exit function getInt" style="filled" fillcolor=red];
     }
-    54 -> {55};
-    55 -> {56};
     56 -> {57};
     57 -> {58};
-    58 -> {61};
+    58 -> {59};
-    58 -> {59} [style=dotted];
+    59 -> {60};
-    59 -> {60} [style=dotted];
+    60 -> {63};
     60 -> {61} [style=dotted];
+    61 -> {62} [style=dotted];
+    62 -> {63} [style=dotted];
 
     subgraph cluster_18 {
         color=red
-        62 [label="Enter function test_3" style="filled" fillcolor=red];
+        64 [label="Enter function test_3" style="filled" fillcolor=red];
         subgraph cluster_19 {
             color=blue
-            63 [label="Enter block"];
+            65 [label="Enter block"];
-            64 [label="Postponed enter to lambda"];
+            66 [label="Postponed enter to lambda"];
             subgraph cluster_20 {
                 color=blue
-                71 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                73 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_21 {
                     color=blue
-                    72 [label="Enter block"];
+                    74 [label="Enter block"];
-                    73 [label="Const: Int(1)"];
+                    75 [label="Const: Int(1)"];
-                    74 [label="Jump: ^test_3 Int(1)"];
+                    76 [label="Jump: ^test_3 Int(1)"];
-                    75 [label="Stub" style="filled" fillcolor=gray];
+                    77 [label="Stub" style="filled" fillcolor=gray];
-                    76 [label="Exit block" style="filled" fillcolor=gray];
+                    78 [label="Exit block" style="filled" fillcolor=gray];
                 }
-                77 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                79 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            65 [label="Postponed exit from lambda"];
+            67 [label="Postponed exit from lambda"];
-            66 [label="Function call: R|/getInt|(...)"];
+            68 [label="Function call: R|/getInt|(...)"];
-            67 [label="Jump: ^test_3 R|/getInt|(<L> = getInt@fun <anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
+            69 [label="Jump: ^test_3 R|/getInt|(<L> = getInt@fun <anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
     ^test_3 Int(1)
 }
 )"];
-            68 [label="Stub" style="filled" fillcolor=gray];
+            70 [label="Stub" style="filled" fillcolor=gray];
-            69 [label="Exit block" style="filled" fillcolor=gray];
+            71 [label="Exit block" style="filled" fillcolor=gray];
         }
-        70 [label="Exit function test_3" style="filled" fillcolor=red];
+        72 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    62 -> {63};
+    64 -> {65};
-    63 -> {64};
-    64 -> {65 71};
-    64 -> {71} [style=dashed];
     65 -> {66};
-    66 -> {67};
+    66 -> {67 73};
-    67 -> {70};
+    66 -> {73} [style=dashed];
-    67 -> {68} [style=dotted];
+    67 -> {68};
-    68 -> {69} [style=dotted];
+    68 -> {69};
+    69 -> {72};
     69 -> {70} [style=dotted];
-    71 -> {77 72};
+    70 -> {71} [style=dotted];
-    72 -> {73};
+    71 -> {72} [style=dotted];
-    73 -> {74};
+    73 -> {79 74};
-    74 -> {70};
+    74 -> {75};
-    74 -> {75} [style=dotted];
+    75 -> {76};
-    75 -> {76} [style=dotted];
+    76 -> {72};
     76 -> {77} [style=dotted];
-    77 -> {65};
+    77 -> {78} [style=dotted];
-    77 -> {71} [color=green style=dashed];
+    78 -> {79} [style=dotted];
+    79 -> {67};
+    79 -> {73} [color=green style=dashed];
 
     subgraph cluster_22 {
         color=red
-        78 [label="Enter function test_4" style="filled" fillcolor=red];
+        80 [label="Enter function test_4" style="filled" fillcolor=red];
         subgraph cluster_23 {
             color=blue
-            79 [label="Enter block"];
+            81 [label="Enter block"];
-            80 [label="Postponed enter to lambda"];
+            82 [label="Postponed enter to lambda"];
             subgraph cluster_24 {
                 color=blue
-                87 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                89 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_25 {
                     color=blue
-                    88 [label="Enter block"];
+                    90 [label="Enter block"];
-                    89 [label="Const: Int(1)"];
+                    91 [label="Const: Int(1)"];
-                    90 [label="Jump: ^test_4 Int(1)"];
+                    92 [label="Jump: ^test_4 Int(1)"];
-                    91 [label="Stub" style="filled" fillcolor=gray];
+                    93 [label="Stub" style="filled" fillcolor=gray];
-                    92 [label="Exit block" style="filled" fillcolor=gray];
+                    94 [label="Exit block" style="filled" fillcolor=gray];
                 }
-                93 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                95 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            81 [label="Postponed exit from lambda"];
+            83 [label="Postponed exit from lambda"];
-            82 [label="Function call: R|/getInt|(...)"];
+            84 [label="Function call: R|/getInt|(...)"];
-            83 [label="Jump: ^test_4 R|/getInt|(block = getInt@fun <anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
+            85 [label="Jump: ^test_4 R|/getInt|(block = getInt@fun <anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
     ^test_4 Int(1)
 }
 )"];
-            84 [label="Stub" style="filled" fillcolor=gray];
+            86 [label="Stub" style="filled" fillcolor=gray];
-            85 [label="Exit block" style="filled" fillcolor=gray];
+            87 [label="Exit block" style="filled" fillcolor=gray];
         }
-        86 [label="Exit function test_4" style="filled" fillcolor=red];
+        88 [label="Exit function test_4" style="filled" fillcolor=red];
     }
-    78 -> {79};
+    80 -> {81};
-    79 -> {80};
-    80 -> {81 87};
-    80 -> {87} [style=dashed];
     81 -> {82};
-    82 -> {83};
+    82 -> {83 89};
-    83 -> {86};
+    82 -> {89} [style=dashed];
-    83 -> {84} [style=dotted];
+    83 -> {84};
-    84 -> {85} [style=dotted];
+    84 -> {85};
+    85 -> {88};
     85 -> {86} [style=dotted];
-    87 -> {93 88};
+    86 -> {87} [style=dotted];
-    88 -> {89};
+    87 -> {88} [style=dotted];
-    89 -> {90};
+    89 -> {95 90};
-    90 -> {86};
+    90 -> {91};
-    90 -> {91} [style=dotted];
+    91 -> {92};
-    91 -> {92} [style=dotted];
+    92 -> {88};
     92 -> {93} [style=dotted];
-    93 -> {81};
+    93 -> {94} [style=dotted];
-    93 -> {87} [color=green style=dashed];
+    94 -> {95} [style=dotted];
+    95 -> {83};
+    95 -> {89} [color=green style=dashed];
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot

@@ -87,17 +87,17 @@ digraph localClassesWithImplicit_kt {
     19 -> {20} [style=dotted];
     20 -> {21} [style=dotted];
     21 -> {22};
-    21 -> {33 36 71 89} [color=red];
+    21 -> {33 36 73 92} [color=red];
     22 -> {23};
-    22 -> {96 99 134 152} [color=red];
+    22 -> {99 102 139 158} [color=red];
-    22 -> {33 36 71 89 29} [color=green];
+    22 -> {33 36 73 92 29} [color=green];
-    22 -> {33 36 71 89 29} [style=dashed];
+    22 -> {33 36 73 92 29} [style=dashed];
     23 -> {24} [color=red];
     23 -> {31} [color=green];
     23 -> {31} [style=dashed];
     24 -> {25};
-    24 -> {96 99 134 152} [color=green];
+    24 -> {99 102 139 158} [color=green];
-    24 -> {96 99 134 152} [style=dashed];
+    24 -> {99 102 139 158} [style=dashed];
     25 -> {26};
     26 -> {27};
     27 -> {28};
@@ -128,45 +128,47 @@ digraph localClassesWithImplicit_kt {
                     color=blue
                     46 [label="Enter block"];
                     47 [label="Access variable R|<local>/a|"];
-                    48 [label="Access variable R|kotlin/String.length|"];
+                    48 [label="Smart cast: R|<local>/a|"];
+                    49 [label="Access variable R|kotlin/String.length|"];
                     subgraph cluster_14 {
                         color=blue
-                        49 [label="Enter when"];
+                        50 [label="Enter when"];
                         subgraph cluster_15 {
                             color=blue
-                            50 [label="Enter when branch condition "];
+                            51 [label="Enter when branch condition "];
-                            51 [label="Access variable R|<local>/b|"];
+                            52 [label="Access variable R|<local>/b|"];
-                            52 [label="Type operator: (R|<local>/b| is R|kotlin/String|)"];
+                            53 [label="Type operator: (R|<local>/b| is R|kotlin/String|)"];
-                            53 [label="Exit when branch condition"];
+                            54 [label="Exit when branch condition"];
                         }
                         subgraph cluster_16 {
                             color=blue
-                            54 [label="Enter when branch condition else"];
+                            55 [label="Enter when branch condition else"];
-                            55 [label="Exit when branch condition"];
+                            56 [label="Exit when branch condition"];
                         }
-                        56 [label="Enter when branch result"];
+                        57 [label="Enter when branch result"];
                         subgraph cluster_17 {
                             color=blue
-                            57 [label="Enter block"];
+                            58 [label="Enter block"];
-                            58 [label="Const: Int(1)"];
+                            59 [label="Const: Int(1)"];
-                            59 [label="Exit block"];
+                            60 [label="Exit block"];
                         }
-                        60 [label="Exit when branch result"];
+                        61 [label="Exit when branch result"];
-                        61 [label="Enter when branch result"];
+                        62 [label="Enter when branch result"];
                         subgraph cluster_18 {
                             color=blue
-                            62 [label="Enter block"];
+                            63 [label="Enter block"];
-                            63 [label="Access variable R|<local>/b|"];
+                            64 [label="Access variable R|<local>/b|"];
-                            64 [label="Access variable R|kotlin/String.length|"];
+                            65 [label="Smart cast: R|<local>/b|"];
-                            65 [label="Function call: this@R|/A|.R|<local>/bar|()"];
+                            66 [label="Access variable R|kotlin/String.length|"];
-                            66 [label="Exit block"];
+                            67 [label="Function call: this@R|/A|.R|<local>/bar|()"];
+                            68 [label="Exit block"];
                         }
-                        67 [label="Exit when branch result"];
+                        69 [label="Exit when branch result"];
-                        68 [label="Exit when"];
+                        70 [label="Exit when"];
                     }
-                    69 [label="Exit block"];
+                    71 [label="Exit block"];
                 }
-                70 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                72 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
             39 [label="Postponed exit from lambda"];
             40 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
@@ -199,7 +201,7 @@ digraph localClassesWithImplicit_kt {
     41 -> {42} [style=dotted];
     42 -> {43} [style=dotted];
     43 -> {44} [style=dotted];
-    45 -> {70 46};
+    45 -> {72 46};
     46 -> {47};
     47 -> {48};
     48 -> {49};
@@ -207,15 +209,15 @@ digraph localClassesWithImplicit_kt {
     50 -> {51};
     51 -> {52};
     52 -> {53};
-    53 -> {61 54};
+    53 -> {54};
-    54 -> {55};
+    54 -> {62 55};
     55 -> {56};
     56 -> {57};
     57 -> {58};
     58 -> {59};
     59 -> {60};
-    60 -> {68};
+    60 -> {61};
-    61 -> {62};
+    61 -> {70};
     62 -> {63};
     63 -> {64};
     64 -> {65};
@@ -224,152 +226,158 @@ digraph localClassesWithImplicit_kt {
     67 -> {68};
     68 -> {69};
     69 -> {70};
-    70 -> {39};
+    70 -> {71};
-    70 -> {45} [color=green style=dashed];
+    71 -> {72};
+    72 -> {39};
+    72 -> {45} [color=green style=dashed];
 
     subgraph cluster_19 {
         color=red
-        71 [label="Enter function bar" style="filled" fillcolor=red];
+        73 [label="Enter function bar" style="filled" fillcolor=red];
         subgraph cluster_20 {
             color=blue
-            72 [label="Enter block"];
+            74 [label="Enter block"];
-            73 [label="Postponed enter to lambda"];
+            75 [label="Postponed enter to lambda"];
             subgraph cluster_21 {
                 color=blue
-                80 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                82 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_22 {
                     color=blue
-                    81 [label="Enter block"];
+                    83 [label="Enter block"];
-                    82 [label="Access variable R|<local>/b|"];
+                    84 [label="Access variable R|<local>/b|"];
-                    83 [label="Access variable <Unresolved name: length>#"];
+                    85 [label="Access variable <Unresolved name: length>#"];
-                    84 [label="Access variable R|<local>/a|"];
+                    86 [label="Access variable R|<local>/a|"];
-                    85 [label="Access variable R|kotlin/String.length|"];
+                    87 [label="Smart cast: R|<local>/a|"];
-                    86 [label="Function call: this@R|/A|.R|<local>/baz|()"];
+                    88 [label="Access variable R|kotlin/String.length|"];
-                    87 [label="Exit block"];
+                    89 [label="Function call: this@R|/A|.R|<local>/baz|()"];
+                    90 [label="Exit block"];
                 }
-                88 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                91 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            74 [label="Postponed exit from lambda"];
+            76 [label="Postponed exit from lambda"];
-            75 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
+            77 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
-            76 [label="Jump: ^bar R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <inline=Inline, kind=UNKNOWN>  {
+            78 [label="Jump: ^bar R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <inline=Inline, kind=UNKNOWN>  {
     R|<local>/b|.<Unresolved name: length>#
     R|<local>/a|.R|kotlin/String.length|
     ^ this@R|/A|.R|<local>/baz|()
 }
 )"];
-            77 [label="Stub" style="filled" fillcolor=gray];
+            79 [label="Stub" style="filled" fillcolor=gray];
-            78 [label="Exit block" style="filled" fillcolor=gray];
+            80 [label="Exit block" style="filled" fillcolor=gray];
         }
-        79 [label="Exit function bar" style="filled" fillcolor=red];
+        81 [label="Exit function bar" style="filled" fillcolor=red];
     }
-    71 -> {72};
+    73 -> {74};
-    72 -> {73};
-    73 -> {74 80};
-    73 -> {80} [style=dashed];
     74 -> {75};
-    75 -> {76};
+    75 -> {76 82};
-    76 -> {79};
+    75 -> {82} [style=dashed];
-    76 -> {77} [style=dotted];
+    76 -> {77};
-    77 -> {78} [style=dotted];
+    77 -> {78};
+    78 -> {81};
     78 -> {79} [style=dotted];
-    80 -> {88 81};
+    79 -> {80} [style=dotted];
-    81 -> {82};
+    80 -> {81} [style=dotted];
-    82 -> {83};
+    82 -> {91 83};
     83 -> {84};
     84 -> {85};
     85 -> {86};
     86 -> {87};
     87 -> {88};
-    88 -> {74};
+    88 -> {89};
-    88 -> {80} [color=green style=dashed];
+    89 -> {90};
+    90 -> {91};
+    91 -> {76};
+    91 -> {82} [color=green style=dashed];
 
     subgraph cluster_23 {
         color=red
-        89 [label="Enter function baz" style="filled" fillcolor=red];
+        92 [label="Enter function baz" style="filled" fillcolor=red];
         subgraph cluster_24 {
             color=blue
-            90 [label="Enter block"];
+            93 [label="Enter block"];
-            91 [label="Const: Int(1)"];
+            94 [label="Const: Int(1)"];
-            92 [label="Jump: ^baz Int(1)"];
+            95 [label="Jump: ^baz Int(1)"];
-            93 [label="Stub" style="filled" fillcolor=gray];
+            96 [label="Stub" style="filled" fillcolor=gray];
-            94 [label="Exit block" style="filled" fillcolor=gray];
+            97 [label="Exit block" style="filled" fillcolor=gray];
         }
-        95 [label="Exit function baz" style="filled" fillcolor=red];
+        98 [label="Exit function baz" style="filled" fillcolor=red];
     }
-    89 -> {90};
+    92 -> {93};
-    90 -> {91};
+    93 -> {94};
-    91 -> {92};
+    94 -> {95};
-    92 -> {95};
+    95 -> {98};
-    92 -> {93} [style=dotted];
+    95 -> {96} [style=dotted];
-    93 -> {94} [style=dotted];
+    96 -> {97} [style=dotted];
-    94 -> {95} [style=dotted];
+    97 -> {98} [style=dotted];
 
     subgraph cluster_25 {
         color=red
-        96 [label="Enter function <init>" style="filled" fillcolor=red];
+        99 [label="Enter function <init>" style="filled" fillcolor=red];
-        97 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        100 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        98 [label="Exit function <init>" style="filled" fillcolor=red];
+        101 [label="Exit function <init>" style="filled" fillcolor=red];
     }
-    96 -> {97};
+    99 -> {100};
-    97 -> {98};
+    100 -> {101};
 
     subgraph cluster_26 {
         color=red
-        99 [label="Enter function foo" style="filled" fillcolor=red];
+        102 [label="Enter function foo" style="filled" fillcolor=red];
         subgraph cluster_27 {
             color=blue
-            100 [label="Enter block"];
+            103 [label="Enter block"];
-            101 [label="Postponed enter to lambda"];
+            104 [label="Postponed enter to lambda"];
             subgraph cluster_28 {
                 color=blue
-                108 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                111 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_29 {
                     color=blue
-                    109 [label="Enter block"];
+                    112 [label="Enter block"];
-                    110 [label="Access variable R|<local>/a|"];
+                    113 [label="Access variable R|<local>/a|"];
-                    111 [label="Access variable R|kotlin/String.length|"];
+                    114 [label="Smart cast: R|<local>/a|"];
+                    115 [label="Access variable R|kotlin/String.length|"];
                     subgraph cluster_30 {
                         color=blue
-                        112 [label="Enter when"];
+                        116 [label="Enter when"];
                         subgraph cluster_31 {
                             color=blue
-                            113 [label="Enter when branch condition "];
+                            117 [label="Enter when branch condition "];
-                            114 [label="Access variable R|<local>/b|"];
+                            118 [label="Access variable R|<local>/b|"];
-                            115 [label="Type operator: (R|<local>/b| is R|kotlin/String|)"];
+                            119 [label="Type operator: (R|<local>/b| is R|kotlin/String|)"];
-                            116 [label="Exit when branch condition"];
+                            120 [label="Exit when branch condition"];
                         }
                         subgraph cluster_32 {
                             color=blue
-                            117 [label="Enter when branch condition else"];
+                            121 [label="Enter when branch condition else"];
-                            118 [label="Exit when branch condition"];
+                            122 [label="Exit when branch condition"];
                         }
-                        119 [label="Enter when branch result"];
+                        123 [label="Enter when branch result"];
                         subgraph cluster_33 {
                             color=blue
-                            120 [label="Enter block"];
+                            124 [label="Enter block"];
-                            121 [label="Const: Int(1)"];
+                            125 [label="Const: Int(1)"];
-                            122 [label="Exit block"];
+                            126 [label="Exit block"];
                         }
-                        123 [label="Exit when branch result"];
+                        127 [label="Exit when branch result"];
-                        124 [label="Enter when branch result"];
+                        128 [label="Enter when branch result"];
                         subgraph cluster_34 {
                             color=blue
-                            125 [label="Enter block"];
+                            129 [label="Enter block"];
-                            126 [label="Access variable R|<local>/b|"];
+                            130 [label="Access variable R|<local>/b|"];
-                            127 [label="Access variable R|kotlin/String.length|"];
+                            131 [label="Smart cast: R|<local>/b|"];
-                            128 [label="Function call: this@R|/<anonymous>|.R|/<anonymous>.bar|()"];
+                            132 [label="Access variable R|kotlin/String.length|"];
-                            129 [label="Exit block"];
+                            133 [label="Function call: this@R|/<anonymous>|.R|/<anonymous>.bar|()"];
+                            134 [label="Exit block"];
                         }
-                        130 [label="Exit when branch result"];
+                        135 [label="Exit when branch result"];
-                        131 [label="Exit when"];
+                        136 [label="Exit when"];
                     }
-                    132 [label="Exit block"];
+                    137 [label="Exit block"];
                 }
-                133 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                138 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            102 [label="Postponed exit from lambda"];
+            105 [label="Postponed exit from lambda"];
-            103 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
+            106 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
-            104 [label="Jump: ^foo R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <inline=Inline, kind=UNKNOWN>  {
+            107 [label="Jump: ^foo R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <inline=Inline, kind=UNKNOWN>  {
     R|<local>/a|.R|kotlin/String.length|
     ^ when () {
         (R|<local>/b| is R|kotlin/String|) ->  {
@@ -383,124 +391,128 @@ digraph localClassesWithImplicit_kt {
 
 }
 )"];
-            105 [label="Stub" style="filled" fillcolor=gray];
+            108 [label="Stub" style="filled" fillcolor=gray];
-            106 [label="Exit block" style="filled" fillcolor=gray];
+            109 [label="Exit block" style="filled" fillcolor=gray];
         }
-        107 [label="Exit function foo" style="filled" fillcolor=red];
+        110 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    99 -> {100};
-    100 -> {101};
-    101 -> {102 108};
-    101 -> {108} [style=dashed];
     102 -> {103};
     103 -> {104};
-    104 -> {107};
+    104 -> {105 111};
-    104 -> {105} [style=dotted];
+    104 -> {111} [style=dashed];
-    105 -> {106} [style=dotted];
+    105 -> {106};
-    106 -> {107} [style=dotted];
+    106 -> {107};
-    108 -> {133 109};
+    107 -> {110};
-    109 -> {110};
+    107 -> {108} [style=dotted];
-    110 -> {111};
+    108 -> {109} [style=dotted];
-    111 -> {112};
+    109 -> {110} [style=dotted];
+    111 -> {138 112};
     112 -> {113};
     113 -> {114};
     114 -> {115};
     115 -> {116};
-    116 -> {124 117};
+    116 -> {117};
     117 -> {118};
     118 -> {119};
     119 -> {120};
-    120 -> {121};
+    120 -> {128 121};
     121 -> {122};
     122 -> {123};
-    123 -> {131};
+    123 -> {124};
     124 -> {125};
     125 -> {126};
     126 -> {127};
-    127 -> {128};
+    127 -> {136};
     128 -> {129};
     129 -> {130};
     130 -> {131};
     131 -> {132};
     132 -> {133};
-    133 -> {102};
+    133 -> {134};
-    133 -> {108} [color=green style=dashed];
+    134 -> {135};
+    135 -> {136};
+    136 -> {137};
+    137 -> {138};
+    138 -> {105};
+    138 -> {111} [color=green style=dashed];
 
     subgraph cluster_35 {
         color=red
-        134 [label="Enter function bar" style="filled" fillcolor=red];
+        139 [label="Enter function bar" style="filled" fillcolor=red];
         subgraph cluster_36 {
             color=blue
-            135 [label="Enter block"];
+            140 [label="Enter block"];
-            136 [label="Postponed enter to lambda"];
+            141 [label="Postponed enter to lambda"];
             subgraph cluster_37 {
                 color=blue
-                143 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                148 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_38 {
                     color=blue
-                    144 [label="Enter block"];
+                    149 [label="Enter block"];
-                    145 [label="Access variable R|<local>/a|"];
+                    150 [label="Access variable R|<local>/a|"];
-                    146 [label="Access variable R|kotlin/String.length|"];
+                    151 [label="Smart cast: R|<local>/a|"];
-                    147 [label="Access variable R|<local>/b|"];
+                    152 [label="Access variable R|kotlin/String.length|"];
-                    148 [label="Access variable <Unresolved name: length>#"];
+                    153 [label="Access variable R|<local>/b|"];
-                    149 [label="Function call: this@R|/<anonymous>|.R|/<anonymous>.baz|()"];
+                    154 [label="Access variable <Unresolved name: length>#"];
-                    150 [label="Exit block"];
+                    155 [label="Function call: this@R|/<anonymous>|.R|/<anonymous>.baz|()"];
+                    156 [label="Exit block"];
                 }
-                151 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                157 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            137 [label="Postponed exit from lambda"];
+            142 [label="Postponed exit from lambda"];
-            138 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
+            143 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
-            139 [label="Jump: ^bar R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <inline=Inline, kind=UNKNOWN>  {
+            144 [label="Jump: ^bar R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <inline=Inline, kind=UNKNOWN>  {
     R|<local>/a|.R|kotlin/String.length|
     R|<local>/b|.<Unresolved name: length>#
     ^ this@R|/<anonymous>|.R|/<anonymous>.baz|()
 }
 )"];
-            140 [label="Stub" style="filled" fillcolor=gray];
+            145 [label="Stub" style="filled" fillcolor=gray];
-            141 [label="Exit block" style="filled" fillcolor=gray];
+            146 [label="Exit block" style="filled" fillcolor=gray];
         }
-        142 [label="Exit function bar" style="filled" fillcolor=red];
+        147 [label="Exit function bar" style="filled" fillcolor=red];
     }
-    134 -> {135};
+    139 -> {140};
-    135 -> {136};
+    140 -> {141};
-    136 -> {137 143};
+    141 -> {142 148};
-    136 -> {143} [style=dashed];
+    141 -> {148} [style=dashed];
-    137 -> {138};
+    142 -> {143};
-    138 -> {139};
+    143 -> {144};
-    139 -> {142};
+    144 -> {147};
-    139 -> {140} [style=dotted];
+    144 -> {145} [style=dotted];
-    140 -> {141} [style=dotted];
+    145 -> {146} [style=dotted];
-    141 -> {142} [style=dotted];
+    146 -> {147} [style=dotted];
-    143 -> {151 144};
+    148 -> {157 149};
-    144 -> {145};
-    145 -> {146};
-    146 -> {147};
-    147 -> {148};
-    148 -> {149};
     149 -> {150};
     150 -> {151};
-    151 -> {137};
+    151 -> {152};
-    151 -> {143} [color=green style=dashed];
-
-    subgraph cluster_39 {
-        color=red
-        152 [label="Enter function baz" style="filled" fillcolor=red];
-        subgraph cluster_40 {
-            color=blue
-            153 [label="Enter block"];
-            154 [label="Const: Int(1)"];
-            155 [label="Jump: ^baz Int(1)"];
-            156 [label="Stub" style="filled" fillcolor=gray];
-            157 [label="Exit block" style="filled" fillcolor=gray];
-        }
-        158 [label="Exit function baz" style="filled" fillcolor=red];
-    }
     152 -> {153};
     153 -> {154};
     154 -> {155};
-    155 -> {158};
+    155 -> {156};
-    155 -> {156} [style=dotted];
+    156 -> {157};
-    156 -> {157} [style=dotted];
+    157 -> {142};
-    157 -> {158} [style=dotted];
+    157 -> {148} [color=green style=dashed];
+
+    subgraph cluster_39 {
+        color=red
+        158 [label="Enter function baz" style="filled" fillcolor=red];
+        subgraph cluster_40 {
+            color=blue
+            159 [label="Enter block"];
+            160 [label="Const: Int(1)"];
+            161 [label="Jump: ^baz Int(1)"];
+            162 [label="Stub" style="filled" fillcolor=gray];
+            163 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        164 [label="Exit function baz" style="filled" fillcolor=red];
+    }
+    158 -> {159};
+    159 -> {160};
+    160 -> {161};
+    161 -> {164};
+    161 -> {162} [style=dotted];
+    162 -> {163} [style=dotted];
+    163 -> {164} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/when.dot

@@ -169,26 +169,28 @@ digraph when_kt {
                         60 [label="Exit left part of &&"];
                         61 [label="Enter right part of &&"];
                         62 [label="Access variable R|<local>/x|"];
-                        63 [label="Type operator: (R|<local>/x| is R|B|)"];
+                        63 [label="Smart cast: R|<local>/x|"];
-                        64 [label="Exit &&"];
+                        64 [label="Type operator: (R|<local>/x| is R|B|)"];
+                        65 [label="Exit &&"];
                     }
-                    65 [label="Exit when branch condition"];
+                    66 [label="Exit when branch condition"];
                 }
-                66 [label="Synthetic else branch"];
+                67 [label="Synthetic else branch"];
-                67 [label="Enter when branch result"];
+                68 [label="Enter when branch result"];
                 subgraph cluster_18 {
                     color=blue
-                    68 [label="Enter block"];
+                    69 [label="Enter block"];
-                    69 [label="Access variable R|<local>/x|"];
+                    70 [label="Access variable R|<local>/x|"];
-                    70 [label="Type operator: (R|<local>/x| is R|A|)"];
+                    71 [label="Smart cast: R|<local>/x|"];
-                    71 [label="Exit block"];
+                    72 [label="Type operator: (R|<local>/x| is R|A|)"];
+                    73 [label="Exit block"];
                 }
-                72 [label="Exit when branch result"];
+                74 [label="Exit when branch result"];
-                73 [label="Exit when"];
+                75 [label="Exit when"];
             }
-            74 [label="Exit block"];
+            76 [label="Exit block"];
         }
-        75 [label="Exit function test_2" style="filled" fillcolor=red];
+        77 [label="Exit function test_2" style="filled" fillcolor=red];
     }
     53 -> {54};
     54 -> {55};
@@ -197,14 +199,14 @@ digraph when_kt {
     57 -> {58};
     58 -> {59};
     59 -> {60};
-    60 -> {64 61};
+    60 -> {65 61};
     61 -> {62};
     62 -> {63};
     63 -> {64};
     64 -> {65};
-    65 -> {67 66};
+    65 -> {66};
-    66 -> {73};
+    66 -> {68 67};
-    67 -> {68};
+    67 -> {75};
     68 -> {69};
     69 -> {70};
     70 -> {71};
@@ -212,5 +214,7 @@ digraph when_kt {
     72 -> {73};
     73 -> {74};
     74 -> {75};
+    75 -> {76};
+    76 -> {77};
 
 }

compiler/fir/analysis-tests/testData/resolve/elvisReturnSimple.dot

@@ -38,25 +38,26 @@ digraph elvisReturnSimple_kt {
                     color=blue
                     16 [label="Enter block"];
                     17 [label="Access variable R|<local>/s|"];
-                    18 [label="Access variable R|kotlin/String.length|"];
+                    18 [label="Smart cast: R|<local>/s|"];
-                    19 [label="Jump: ^stringReturnInLeftLen R|<local>/s|.R|kotlin/String.length|"];
+                    19 [label="Access variable R|kotlin/String.length|"];
-                    20 [label="Stub" style="filled" fillcolor=gray];
+                    20 [label="Jump: ^stringReturnInLeftLen R|<local>/s|.R|kotlin/String.length|"];
-                    21 [label="Exit block" style="filled" fillcolor=gray];
+                    21 [label="Stub" style="filled" fillcolor=gray];
+                    22 [label="Exit block" style="filled" fillcolor=gray];
                 }
-                22 [label="Exit when branch result" style="filled" fillcolor=gray];
+                23 [label="Exit when branch result" style="filled" fillcolor=gray];
-                23 [label="Exit when"];
+                24 [label="Exit when"];
             }
-            24 [label="Exit lhs of ?:"];
+            25 [label="Exit lhs of ?:"];
-            25 [label="Enter rhs of ?:"];
+            26 [label="Enter rhs of ?:"];
-            26 [label="Const: Int(0)"];
+            27 [label="Const: Int(0)"];
-            27 [label="Jump: ^stringReturnInLeftLen Int(0)"];
+            28 [label="Jump: ^stringReturnInLeftLen Int(0)"];
-            28 [label="Stub" style="filled" fillcolor=gray];
+            29 [label="Stub" style="filled" fillcolor=gray];
-            29 [label="Lhs of ?: is not null" style="filled" fillcolor=gray];
+            30 [label="Lhs of ?: is not null" style="filled" fillcolor=gray];
-            30 [label="Exit ?:" style="filled" fillcolor=gray];
+            31 [label="Exit ?:" style="filled" fillcolor=gray];
-            31 [label="Variable declaration: lval s1: R|kotlin/Nothing|" style="filled" fillcolor=gray];
+            32 [label="Variable declaration: lval s1: R|kotlin/Nothing|" style="filled" fillcolor=gray];
-            32 [label="Exit block" style="filled" fillcolor=gray];
+            33 [label="Exit block" style="filled" fillcolor=gray];
         }
-        33 [label="Exit function stringReturnInLeftLen" style="filled" fillcolor=red];
+        34 [label="Exit function stringReturnInLeftLen" style="filled" fillcolor=red];
     }
     0 -> {1};
     1 -> {2};
@@ -72,27 +73,28 @@ digraph elvisReturnSimple_kt {
     11 -> {12};
     12 -> {13};
     13 -> {14};
-    14 -> {23};
+    14 -> {24};
     15 -> {16};
     16 -> {17};
     17 -> {18};
     18 -> {19};
-    19 -> {33};
+    19 -> {20};
-    19 -> {20} [style=dotted];
+    20 -> {34};
     20 -> {21} [style=dotted];
     21 -> {22} [style=dotted];
     22 -> {23} [style=dotted];
-    23 -> {24};
+    23 -> {24} [style=dotted];
     24 -> {25};
-    24 -> {29} [style=dotted];
     25 -> {26};
+    25 -> {30} [style=dotted];
     26 -> {27};
-    27 -> {33};
+    27 -> {28};
-    27 -> {28} [style=dotted];
+    28 -> {34};
-    28 -> {30} [style=dotted];
+    28 -> {29} [style=dotted];
-    29 -> {30} [style=dotted];
+    29 -> {31} [style=dotted];
     30 -> {31} [style=dotted];
     31 -> {32} [style=dotted];
     32 -> {33} [style=dotted];
+    33 -> {34} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.dot

@@ -27,10 +27,11 @@ digraph bangbang_kt {
             7 [label="Check not null: R|<local>/a|!!"];
             8 [label="Function call: R|<local>/a|!!.R|/A.foo|()"];
             9 [label="Access variable R|<local>/a|"];
-            10 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            10 [label="Smart cast: R|<local>/a|"];
-            11 [label="Exit block"];
+            11 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            12 [label="Exit block"];
         }
-        12 [label="Exit function test_0" style="filled" fillcolor=red];
+        13 [label="Exit function test_0" style="filled" fillcolor=red];
     }
     4 -> {5};
     5 -> {6};
@@ -40,52 +41,54 @@ digraph bangbang_kt {
     9 -> {10};
     10 -> {11};
     11 -> {12};
+    12 -> {13};
 
     subgraph cluster_4 {
         color=red
-        13 [label="Enter function test_1" style="filled" fillcolor=red];
+        14 [label="Enter function test_1" style="filled" fillcolor=red];
         subgraph cluster_5 {
             color=blue
-            14 [label="Enter block"];
+            15 [label="Enter block"];
             subgraph cluster_6 {
                 color=blue
-                15 [label="Enter when"];
+                16 [label="Enter when"];
                 subgraph cluster_7 {
                     color=blue
-                    16 [label="Enter when branch condition "];
+                    17 [label="Enter when branch condition "];
-                    17 [label="Access variable R|<local>/a|"];
+                    18 [label="Access variable R|<local>/a|"];
-                    18 [label="Check not null: R|<local>/a|!!"];
+                    19 [label="Check not null: R|<local>/a|!!"];
-                    19 [label="Function call: R|<local>/a|!!.R|/A.foo|()"];
+                    20 [label="Function call: R|<local>/a|!!.R|/A.foo|()"];
-                    20 [label="Exit when branch condition"];
+                    21 [label="Exit when branch condition"];
                 }
-                21 [label="Synthetic else branch"];
+                22 [label="Synthetic else branch"];
-                22 [label="Enter when branch result"];
+                23 [label="Enter when branch result"];
                 subgraph cluster_8 {
                     color=blue
-                    23 [label="Enter block"];
+                    24 [label="Enter block"];
-                    24 [label="Access variable R|<local>/a|"];
+                    25 [label="Access variable R|<local>/a|"];
-                    25 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+                    26 [label="Smart cast: R|<local>/a|"];
-                    26 [label="Exit block"];
+                    27 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+                    28 [label="Exit block"];
                 }
-                27 [label="Exit when branch result"];
+                29 [label="Exit when branch result"];
-                28 [label="Exit when"];
+                30 [label="Exit when"];
             }
-            29 [label="Access variable R|<local>/a|"];
+            31 [label="Access variable R|<local>/a|"];
-            30 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            32 [label="Smart cast: R|<local>/a|"];
-            31 [label="Exit block"];
+            33 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            34 [label="Exit block"];
         }
-        32 [label="Exit function test_1" style="filled" fillcolor=red];
+        35 [label="Exit function test_1" style="filled" fillcolor=red];
     }
-    13 -> {14};
     14 -> {15};
     15 -> {16};
     16 -> {17};
     17 -> {18};
     18 -> {19};
     19 -> {20};
-    20 -> {22 21};
+    20 -> {21};
-    21 -> {28};
+    21 -> {23 22};
-    22 -> {23};
+    22 -> {30};
     23 -> {24};
     24 -> {25};
     25 -> {26};
@@ -95,67 +98,69 @@ digraph bangbang_kt {
     29 -> {30};
     30 -> {31};
     31 -> {32};
+    32 -> {33};
+    33 -> {34};
+    34 -> {35};
 
     subgraph cluster_9 {
         color=red
-        33 [label="Enter function test_2" style="filled" fillcolor=red];
+        36 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_10 {
             color=blue
-            34 [label="Enter block"];
+            37 [label="Enter block"];
             subgraph cluster_11 {
                 color=blue
-                35 [label="Enter when"];
+                38 [label="Enter when"];
                 subgraph cluster_12 {
                     color=blue
-                    36 [label="Enter when branch condition "];
+                    39 [label="Enter when branch condition "];
                     subgraph cluster_13 {
                         color=blue
-                        37 [label="Enter &&"];
+                        40 [label="Enter &&"];
-                        38 [label="Access variable R|<local>/a|"];
+                        41 [label="Access variable R|<local>/a|"];
-                        39 [label="Check not null: R|<local>/a|!!"];
+                        42 [label="Check not null: R|<local>/a|!!"];
-                        40 [label="Function call: R|<local>/a|!!.R|/A.foo|()"];
+                        43 [label="Function call: R|<local>/a|!!.R|/A.foo|()"];
-                        41 [label="Exit left part of &&"];
+                        44 [label="Exit left part of &&"];
-                        42 [label="Enter right part of &&"];
+                        45 [label="Enter right part of &&"];
-                        43 [label="Access variable R|<local>/b|"];
+                        46 [label="Access variable R|<local>/b|"];
-                        44 [label="Exit &&"];
+                        47 [label="Exit &&"];
                     }
-                    45 [label="Exit when branch condition"];
+                    48 [label="Exit when branch condition"];
                 }
-                46 [label="Synthetic else branch"];
+                49 [label="Synthetic else branch"];
-                47 [label="Enter when branch result"];
+                50 [label="Enter when branch result"];
                 subgraph cluster_14 {
                     color=blue
-                    48 [label="Enter block"];
+                    51 [label="Enter block"];
-                    49 [label="Access variable R|<local>/a|"];
+                    52 [label="Access variable R|<local>/a|"];
-                    50 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+                    53 [label="Smart cast: R|<local>/a|"];
-                    51 [label="Exit block"];
+                    54 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+                    55 [label="Exit block"];
                 }
-                52 [label="Exit when branch result"];
+                56 [label="Exit when branch result"];
-                53 [label="Exit when"];
+                57 [label="Exit when"];
             }
-            54 [label="Access variable R|<local>/a|"];
+            58 [label="Access variable R|<local>/a|"];
-            55 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            59 [label="Smart cast: R|<local>/a|"];
-            56 [label="Exit block"];
+            60 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            61 [label="Exit block"];
         }
-        57 [label="Exit function test_2" style="filled" fillcolor=red];
+        62 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    33 -> {34};
-    34 -> {35};
-    35 -> {36};
     36 -> {37};
     37 -> {38};
     38 -> {39};
     39 -> {40};
     40 -> {41};
-    41 -> {44 42};
+    41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {45};
+    44 -> {47 45};
-    45 -> {47 46};
+    45 -> {46};
-    46 -> {53};
+    46 -> {47};
     47 -> {48};
-    48 -> {49};
+    48 -> {50 49};
-    49 -> {50};
+    49 -> {57};
     50 -> {51};
     51 -> {52};
     52 -> {53};
@@ -163,249 +168,260 @@ digraph bangbang_kt {
     54 -> {55};
     55 -> {56};
     56 -> {57};
-
+    57 -> {58};
-    subgraph cluster_15 {
-        color=red
-        58 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_16 {
-            color=blue
-            59 [label="Enter block"];
-            subgraph cluster_17 {
-                color=blue
-                60 [label="Enter when"];
-                subgraph cluster_18 {
-                    color=blue
-                    61 [label="Enter when branch condition "];
-                    subgraph cluster_19 {
-                        color=blue
-                        62 [label="Enter &&"];
-                        63 [label="Access variable R|<local>/b|"];
-                        64 [label="Exit left part of &&"];
-                        65 [label="Enter right part of &&"];
-                        66 [label="Access variable R|<local>/a|"];
-                        67 [label="Check not null: R|<local>/a|!!"];
-                        68 [label="Function call: R|<local>/a|!!.R|/A.foo|()"];
-                        69 [label="Exit &&"];
-                    }
-                    70 [label="Exit when branch condition"];
-                }
-                71 [label="Synthetic else branch"];
-                72 [label="Enter when branch result"];
-                subgraph cluster_20 {
-                    color=blue
-                    73 [label="Enter block"];
-                    74 [label="Access variable R|<local>/a|"];
-                    75 [label="Function call: R|<local>/a|.R|/A.foo|()"];
-                    76 [label="Exit block"];
-                }
-                77 [label="Exit when branch result"];
-                78 [label="Exit when"];
-            }
-            79 [label="Access variable R|<local>/a|"];
-            80 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
-            81 [label="Exit block"];
-        }
-        82 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
     58 -> {59};
     59 -> {60};
     60 -> {61};
     61 -> {62};
-    62 -> {63};
+
+    subgraph cluster_15 {
+        color=red
+        63 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_16 {
+            color=blue
+            64 [label="Enter block"];
+            subgraph cluster_17 {
+                color=blue
+                65 [label="Enter when"];
+                subgraph cluster_18 {
+                    color=blue
+                    66 [label="Enter when branch condition "];
+                    subgraph cluster_19 {
+                        color=blue
+                        67 [label="Enter &&"];
+                        68 [label="Access variable R|<local>/b|"];
+                        69 [label="Exit left part of &&"];
+                        70 [label="Enter right part of &&"];
+                        71 [label="Access variable R|<local>/a|"];
+                        72 [label="Check not null: R|<local>/a|!!"];
+                        73 [label="Function call: R|<local>/a|!!.R|/A.foo|()"];
+                        74 [label="Exit &&"];
+                    }
+                    75 [label="Exit when branch condition"];
+                }
+                76 [label="Synthetic else branch"];
+                77 [label="Enter when branch result"];
+                subgraph cluster_20 {
+                    color=blue
+                    78 [label="Enter block"];
+                    79 [label="Access variable R|<local>/a|"];
+                    80 [label="Smart cast: R|<local>/a|"];
+                    81 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+                    82 [label="Exit block"];
+                }
+                83 [label="Exit when branch result"];
+                84 [label="Exit when"];
+            }
+            85 [label="Access variable R|<local>/a|"];
+            86 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
+            87 [label="Exit block"];
+        }
+        88 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
     63 -> {64};
-    64 -> {69 65};
+    64 -> {65};
     65 -> {66};
     66 -> {67};
     67 -> {68};
     68 -> {69};
-    69 -> {70};
+    69 -> {74 70};
-    70 -> {72 71};
+    70 -> {71};
-    71 -> {78};
+    71 -> {72};
     72 -> {73};
     73 -> {74};
     74 -> {75};
-    75 -> {76};
+    75 -> {77 76};
-    76 -> {77};
+    76 -> {84};
     77 -> {78};
     78 -> {79};
     79 -> {80};
     80 -> {81};
     81 -> {82};
-
+    82 -> {83};
-    subgraph cluster_21 {
-        color=red
-        83 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_22 {
-            color=blue
-            84 [label="Enter block"];
-            subgraph cluster_23 {
-                color=blue
-                85 [label="Enter when"];
-                subgraph cluster_24 {
-                    color=blue
-                    86 [label="Enter when branch condition "];
-                    subgraph cluster_25 {
-                        color=blue
-                        87 [label="Enter ||"];
-                        88 [label="Access variable R|<local>/a|"];
-                        89 [label="Check not null: R|<local>/a|!!"];
-                        90 [label="Function call: R|<local>/a|!!.R|/A.foo|()"];
-                        91 [label="Exit left part of ||"];
-                        92 [label="Enter right part of ||"];
-                        93 [label="Access variable R|<local>/b|"];
-                        94 [label="Exit ||"];
-                    }
-                    95 [label="Exit when branch condition"];
-                }
-                96 [label="Synthetic else branch"];
-                97 [label="Enter when branch result"];
-                subgraph cluster_26 {
-                    color=blue
-                    98 [label="Enter block"];
-                    99 [label="Access variable R|<local>/a|"];
-                    100 [label="Function call: R|<local>/a|.R|/A.foo|()"];
-                    101 [label="Exit block"];
-                }
-                102 [label="Exit when branch result"];
-                103 [label="Exit when"];
-            }
-            104 [label="Access variable R|<local>/a|"];
-            105 [label="Function call: R|<local>/a|.R|/A.foo|()"];
-            106 [label="Exit block"];
-        }
-        107 [label="Exit function test_4" style="filled" fillcolor=red];
-    }
     83 -> {84};
     84 -> {85};
     85 -> {86};
     86 -> {87};
     87 -> {88};
-    88 -> {89};
+
+    subgraph cluster_21 {
+        color=red
+        89 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_22 {
+            color=blue
+            90 [label="Enter block"];
+            subgraph cluster_23 {
+                color=blue
+                91 [label="Enter when"];
+                subgraph cluster_24 {
+                    color=blue
+                    92 [label="Enter when branch condition "];
+                    subgraph cluster_25 {
+                        color=blue
+                        93 [label="Enter ||"];
+                        94 [label="Access variable R|<local>/a|"];
+                        95 [label="Check not null: R|<local>/a|!!"];
+                        96 [label="Function call: R|<local>/a|!!.R|/A.foo|()"];
+                        97 [label="Exit left part of ||"];
+                        98 [label="Enter right part of ||"];
+                        99 [label="Access variable R|<local>/b|"];
+                        100 [label="Exit ||"];
+                    }
+                    101 [label="Exit when branch condition"];
+                }
+                102 [label="Synthetic else branch"];
+                103 [label="Enter when branch result"];
+                subgraph cluster_26 {
+                    color=blue
+                    104 [label="Enter block"];
+                    105 [label="Access variable R|<local>/a|"];
+                    106 [label="Smart cast: R|<local>/a|"];
+                    107 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+                    108 [label="Exit block"];
+                }
+                109 [label="Exit when branch result"];
+                110 [label="Exit when"];
+            }
+            111 [label="Access variable R|<local>/a|"];
+            112 [label="Smart cast: R|<local>/a|"];
+            113 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            114 [label="Exit block"];
+        }
+        115 [label="Exit function test_4" style="filled" fillcolor=red];
+    }
     89 -> {90};
     90 -> {91};
-    91 -> {94 92};
+    91 -> {92};
     92 -> {93};
     93 -> {94};
     94 -> {95};
-    95 -> {97 96};
+    95 -> {96};
-    96 -> {103};
+    96 -> {97};
-    97 -> {98};
+    97 -> {100 98};
     98 -> {99};
     99 -> {100};
     100 -> {101};
-    101 -> {102};
+    101 -> {103 102};
-    102 -> {103};
+    102 -> {110};
     103 -> {104};
     104 -> {105};
     105 -> {106};
     106 -> {107};
-
+    107 -> {108};
-    subgraph cluster_27 {
-        color=red
-        108 [label="Enter function test_5" style="filled" fillcolor=red];
-        subgraph cluster_28 {
-            color=blue
-            109 [label="Enter block"];
-            subgraph cluster_29 {
-                color=blue
-                110 [label="Enter when"];
-                subgraph cluster_30 {
-                    color=blue
-                    111 [label="Enter when branch condition "];
-                    subgraph cluster_31 {
-                        color=blue
-                        112 [label="Enter ||"];
-                        113 [label="Access variable R|<local>/b|"];
-                        114 [label="Exit left part of ||"];
-                        115 [label="Enter right part of ||"];
-                        116 [label="Access variable R|<local>/a|"];
-                        117 [label="Check not null: R|<local>/a|!!"];
-                        118 [label="Function call: R|<local>/a|!!.R|/A.foo|()"];
-                        119 [label="Exit ||"];
-                    }
-                    120 [label="Exit when branch condition"];
-                }
-                121 [label="Synthetic else branch"];
-                122 [label="Enter when branch result"];
-                subgraph cluster_32 {
-                    color=blue
-                    123 [label="Enter block"];
-                    124 [label="Access variable R|<local>/a|"];
-                    125 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
-                    126 [label="Exit block"];
-                }
-                127 [label="Exit when branch result"];
-                128 [label="Exit when"];
-            }
-            129 [label="Access variable R|<local>/a|"];
-            130 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
-            131 [label="Exit block"];
-        }
-        132 [label="Exit function test_5" style="filled" fillcolor=red];
-    }
     108 -> {109};
     109 -> {110};
     110 -> {111};
     111 -> {112};
     112 -> {113};
     113 -> {114};
-    114 -> {119 115};
+    114 -> {115};
-    115 -> {116};
+
+    subgraph cluster_27 {
+        color=red
+        116 [label="Enter function test_5" style="filled" fillcolor=red];
+        subgraph cluster_28 {
+            color=blue
+            117 [label="Enter block"];
+            subgraph cluster_29 {
+                color=blue
+                118 [label="Enter when"];
+                subgraph cluster_30 {
+                    color=blue
+                    119 [label="Enter when branch condition "];
+                    subgraph cluster_31 {
+                        color=blue
+                        120 [label="Enter ||"];
+                        121 [label="Access variable R|<local>/b|"];
+                        122 [label="Exit left part of ||"];
+                        123 [label="Enter right part of ||"];
+                        124 [label="Access variable R|<local>/a|"];
+                        125 [label="Check not null: R|<local>/a|!!"];
+                        126 [label="Function call: R|<local>/a|!!.R|/A.foo|()"];
+                        127 [label="Exit ||"];
+                    }
+                    128 [label="Exit when branch condition"];
+                }
+                129 [label="Synthetic else branch"];
+                130 [label="Enter when branch result"];
+                subgraph cluster_32 {
+                    color=blue
+                    131 [label="Enter block"];
+                    132 [label="Access variable R|<local>/a|"];
+                    133 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
+                    134 [label="Exit block"];
+                }
+                135 [label="Exit when branch result"];
+                136 [label="Exit when"];
+            }
+            137 [label="Access variable R|<local>/a|"];
+            138 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
+            139 [label="Exit block"];
+        }
+        140 [label="Exit function test_5" style="filled" fillcolor=red];
+    }
     116 -> {117};
     117 -> {118};
     118 -> {119};
     119 -> {120};
-    120 -> {122 121};
+    120 -> {121};
-    121 -> {128};
+    121 -> {122};
-    122 -> {123};
+    122 -> {127 123};
     123 -> {124};
     124 -> {125};
     125 -> {126};
     126 -> {127};
     127 -> {128};
-    128 -> {129};
+    128 -> {130 129};
-    129 -> {130};
+    129 -> {136};
     130 -> {131};
     131 -> {132};
-
+    132 -> {133};
-    subgraph cluster_33 {
-        color=red
-        133 [label="Enter function test_6" style="filled" fillcolor=red];
-        subgraph cluster_34 {
-            color=blue
-            134 [label="Enter block"];
-            135 [label="Access variable R|<local>/x|"];
-            136 [label="Check not null: R|<local>/x|!!"];
-            137 [label="Function call: R|<local>/x|!!.R|/A.foo|()"];
-            138 [label="Exit block"];
-        }
-        139 [label="Exit function test_6" style="filled" fillcolor=red];
-    }
     133 -> {134};
     134 -> {135};
     135 -> {136};
     136 -> {137};
     137 -> {138};
     138 -> {139};
+    139 -> {140};
 
-    subgraph cluster_35 {
+    subgraph cluster_33 {
         color=red
-        140 [label="Enter function test_7" style="filled" fillcolor=red];
+        141 [label="Enter function test_6" style="filled" fillcolor=red];
-        subgraph cluster_36 {
+        subgraph cluster_34 {
             color=blue
-            141 [label="Enter block"];
+            142 [label="Enter block"];
-            142 [label="Access variable R|<local>/x|"];
+            143 [label="Access variable R|<local>/x|"];
-            143 [label="Check not null: R|<local>/x|!!"];
+            144 [label="Check not null: R|<local>/x|!!"];
-            144 [label="Function call: R|<local>/x|!!.R|/A.foo|()"];
+            145 [label="Function call: R|<local>/x|!!.R|/A.foo|()"];
-            145 [label="Exit block"];
+            146 [label="Exit block"];
         }
-        146 [label="Exit function test_7" style="filled" fillcolor=red];
+        147 [label="Exit function test_6" style="filled" fillcolor=red];
     }
-    140 -> {141};
     141 -> {142};
     142 -> {143};
     143 -> {144};
     144 -> {145};
     145 -> {146};
+    146 -> {147};
+
+    subgraph cluster_35 {
+        color=red
+        148 [label="Enter function test_7" style="filled" fillcolor=red];
+        subgraph cluster_36 {
+            color=blue
+            149 [label="Enter block"];
+            150 [label="Access variable R|<local>/x|"];
+            151 [label="Check not null: R|<local>/x|!!"];
+            152 [label="Function call: R|<local>/x|!!.R|/A.foo|()"];
+            153 [label="Exit block"];
+        }
+        154 [label="Exit function test_7" style="filled" fillcolor=red];
+    }
+    148 -> {149};
+    149 -> {150};
+    150 -> {151};
+    151 -> {152};
+    152 -> {153};
+    153 -> {154};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.dot

@@ -55,15 +55,16 @@ digraph equalsToBoolean_kt {
                     color=blue
                     23 [label="Enter block"];
                     24 [label="Access variable R|<local>/b|"];
-                    25 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
+                    25 [label="Smart cast: R|<local>/b|"];
-                    26 [label="Exit block"];
+                    26 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
+                    27 [label="Exit block"];
                 }
-                27 [label="Exit when branch result"];
+                28 [label="Exit when branch result"];
-                28 [label="Exit when"];
+                29 [label="Exit when"];
             }
-            29 [label="Exit block"];
+            30 [label="Exit block"];
         }
-        30 [label="Exit function test_1" style="filled" fillcolor=red];
+        31 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     4 -> {5};
     5 -> {6};
@@ -82,7 +83,7 @@ digraph equalsToBoolean_kt {
     18 -> {19};
     19 -> {20};
     20 -> {21};
-    21 -> {28};
+    21 -> {29};
     22 -> {23};
     23 -> {24};
     24 -> {25};
@@ -91,56 +92,57 @@ digraph equalsToBoolean_kt {
     27 -> {28};
     28 -> {29};
     29 -> {30};
+    30 -> {31};
 
     subgraph cluster_9 {
         color=red
-        31 [label="Enter function test_2" style="filled" fillcolor=red];
+        32 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_10 {
             color=blue
-            32 [label="Enter block"];
+            33 [label="Enter block"];
             subgraph cluster_11 {
                 color=blue
-                33 [label="Enter when"];
+                34 [label="Enter when"];
                 subgraph cluster_12 {
                     color=blue
-                    34 [label="Enter when branch condition "];
+                    35 [label="Enter when branch condition "];
-                    35 [label="Access variable R|<local>/b|"];
+                    36 [label="Access variable R|<local>/b|"];
-                    36 [label="Const: Boolean(true)"];
+                    37 [label="Const: Boolean(true)"];
-                    37 [label="Equality operator =="];
+                    38 [label="Equality operator =="];
-                    38 [label="Const: Boolean(true)"];
+                    39 [label="Const: Boolean(true)"];
-                    39 [label="Equality operator !="];
+                    40 [label="Equality operator !="];
-                    40 [label="Exit when branch condition"];
+                    41 [label="Exit when branch condition"];
                 }
                 subgraph cluster_13 {
                     color=blue
-                    41 [label="Enter when branch condition else"];
+                    42 [label="Enter when branch condition else"];
-                    42 [label="Exit when branch condition"];
+                    43 [label="Exit when branch condition"];
                 }
-                43 [label="Enter when branch result"];
+                44 [label="Enter when branch result"];
                 subgraph cluster_14 {
                     color=blue
-                    44 [label="Enter block"];
+                    45 [label="Enter block"];
-                    45 [label="Access variable R|<local>/b|"];
+                    46 [label="Access variable R|<local>/b|"];
-                    46 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
+                    47 [label="Smart cast: R|<local>/b|"];
-                    47 [label="Exit block"];
+                    48 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
+                    49 [label="Exit block"];
                 }
-                48 [label="Exit when branch result"];
+                50 [label="Exit when branch result"];
-                49 [label="Enter when branch result"];
+                51 [label="Enter when branch result"];
                 subgraph cluster_15 {
                     color=blue
-                    50 [label="Enter block"];
+                    52 [label="Enter block"];
-                    51 [label="Access variable R|<local>/b|"];
+                    53 [label="Access variable R|<local>/b|"];
-                    52 [label="Function call: R|<local>/b|.<Inapplicable(UNSAFE_CALL): kotlin/Boolean.not>#()"];
+                    54 [label="Function call: R|<local>/b|.<Inapplicable(UNSAFE_CALL): kotlin/Boolean.not>#()"];
-                    53 [label="Exit block"];
+                    55 [label="Exit block"];
                 }
-                54 [label="Exit when branch result"];
+                56 [label="Exit when branch result"];
-                55 [label="Exit when"];
+                57 [label="Exit when"];
             }
-            56 [label="Exit block"];
+            58 [label="Exit block"];
         }
-        57 [label="Exit function test_2" style="filled" fillcolor=red];
+        59 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    31 -> {32};
     32 -> {33};
     33 -> {34};
     34 -> {35};
@@ -149,74 +151,75 @@ digraph equalsToBoolean_kt {
     37 -> {38};
     38 -> {39};
     39 -> {40};
-    40 -> {49 41};
+    40 -> {41};
-    41 -> {42};
+    41 -> {51 42};
     42 -> {43};
     43 -> {44};
     44 -> {45};
     45 -> {46};
     46 -> {47};
     47 -> {48};
-    48 -> {55};
+    48 -> {49};
     49 -> {50};
-    50 -> {51};
+    50 -> {57};
     51 -> {52};
     52 -> {53};
     53 -> {54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
+    57 -> {58};
+    58 -> {59};
 
     subgraph cluster_16 {
         color=red
-        58 [label="Enter function test_3" style="filled" fillcolor=red];
+        60 [label="Enter function test_3" style="filled" fillcolor=red];
         subgraph cluster_17 {
             color=blue
-            59 [label="Enter block"];
+            61 [label="Enter block"];
             subgraph cluster_18 {
                 color=blue
-                60 [label="Enter when"];
+                62 [label="Enter when"];
                 subgraph cluster_19 {
                     color=blue
-                    61 [label="Enter when branch condition "];
+                    63 [label="Enter when branch condition "];
-                    62 [label="Access variable R|<local>/b|"];
+                    64 [label="Access variable R|<local>/b|"];
-                    63 [label="Const: Boolean(true)"];
+                    65 [label="Const: Boolean(true)"];
-                    64 [label="Equality operator =="];
-                    65 [label="Const: Boolean(false)"];
                     66 [label="Equality operator =="];
-                    67 [label="Exit when branch condition"];
+                    67 [label="Const: Boolean(false)"];
+                    68 [label="Equality operator =="];
+                    69 [label="Exit when branch condition"];
                 }
                 subgraph cluster_20 {
                     color=blue
-                    68 [label="Enter when branch condition else"];
+                    70 [label="Enter when branch condition else"];
-                    69 [label="Exit when branch condition"];
+                    71 [label="Exit when branch condition"];
                 }
-                70 [label="Enter when branch result"];
+                72 [label="Enter when branch result"];
                 subgraph cluster_21 {
                     color=blue
-                    71 [label="Enter block"];
+                    73 [label="Enter block"];
-                    72 [label="Access variable R|<local>/b|"];
+                    74 [label="Access variable R|<local>/b|"];
-                    73 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
+                    75 [label="Smart cast: R|<local>/b|"];
-                    74 [label="Exit block"];
+                    76 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
+                    77 [label="Exit block"];
                 }
-                75 [label="Exit when branch result"];
+                78 [label="Exit when branch result"];
-                76 [label="Enter when branch result"];
+                79 [label="Enter when branch result"];
                 subgraph cluster_22 {
                     color=blue
-                    77 [label="Enter block"];
+                    80 [label="Enter block"];
-                    78 [label="Access variable R|<local>/b|"];
+                    81 [label="Access variable R|<local>/b|"];
-                    79 [label="Function call: R|<local>/b|.<Inapplicable(UNSAFE_CALL): kotlin/Boolean.not>#()"];
+                    82 [label="Function call: R|<local>/b|.<Inapplicable(UNSAFE_CALL): kotlin/Boolean.not>#()"];
-                    80 [label="Exit block"];
+                    83 [label="Exit block"];
                 }
-                81 [label="Exit when branch result"];
+                84 [label="Exit when branch result"];
-                82 [label="Exit when"];
+                85 [label="Exit when"];
             }
-            83 [label="Exit block"];
+            86 [label="Exit block"];
         }
-        84 [label="Exit function test_3" style="filled" fillcolor=red];
+        87 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    58 -> {59};
-    59 -> {60};
     60 -> {61};
     61 -> {62};
     62 -> {63};
@@ -224,390 +227,395 @@ digraph equalsToBoolean_kt {
     64 -> {65};
     65 -> {66};
     66 -> {67};
-    67 -> {76 68};
+    67 -> {68};
     68 -> {69};
-    69 -> {70};
+    69 -> {79 70};
     70 -> {71};
     71 -> {72};
     72 -> {73};
     73 -> {74};
     74 -> {75};
-    75 -> {82};
+    75 -> {76};
     76 -> {77};
     77 -> {78};
-    78 -> {79};
+    78 -> {85};
     79 -> {80};
     80 -> {81};
     81 -> {82};
     82 -> {83};
     83 -> {84};
+    84 -> {85};
+    85 -> {86};
+    86 -> {87};
 
     subgraph cluster_23 {
         color=red
-        85 [label="Enter function test_4" style="filled" fillcolor=red];
+        88 [label="Enter function test_4" style="filled" fillcolor=red];
         subgraph cluster_24 {
             color=blue
-            86 [label="Enter block"];
+            89 [label="Enter block"];
             subgraph cluster_25 {
                 color=blue
-                87 [label="Enter when"];
+                90 [label="Enter when"];
                 subgraph cluster_26 {
                     color=blue
-                    88 [label="Enter when branch condition "];
+                    91 [label="Enter when branch condition "];
-                    89 [label="Access variable R|<local>/b|"];
+                    92 [label="Access variable R|<local>/b|"];
-                    90 [label="Const: Boolean(true)"];
+                    93 [label="Const: Boolean(true)"];
-                    91 [label="Equality operator =="];
+                    94 [label="Equality operator =="];
-                    92 [label="Const: Boolean(false)"];
+                    95 [label="Const: Boolean(false)"];
-                    93 [label="Equality operator !="];
+                    96 [label="Equality operator !="];
-                    94 [label="Exit when branch condition"];
+                    97 [label="Exit when branch condition"];
                 }
                 subgraph cluster_27 {
                     color=blue
-                    95 [label="Enter when branch condition else"];
+                    98 [label="Enter when branch condition else"];
-                    96 [label="Exit when branch condition"];
+                    99 [label="Exit when branch condition"];
                 }
-                97 [label="Enter when branch result"];
+                100 [label="Enter when branch result"];
                 subgraph cluster_28 {
                     color=blue
-                    98 [label="Enter block"];
+                    101 [label="Enter block"];
-                    99 [label="Access variable R|<local>/b|"];
+                    102 [label="Access variable R|<local>/b|"];
-                    100 [label="Function call: R|<local>/b|.<Inapplicable(UNSAFE_CALL): kotlin/Boolean.not>#()"];
+                    103 [label="Function call: R|<local>/b|.<Inapplicable(UNSAFE_CALL): kotlin/Boolean.not>#()"];
-                    101 [label="Exit block"];
+                    104 [label="Exit block"];
                 }
-                102 [label="Exit when branch result"];
+                105 [label="Exit when branch result"];
-                103 [label="Enter when branch result"];
+                106 [label="Enter when branch result"];
                 subgraph cluster_29 {
                     color=blue
-                    104 [label="Enter block"];
+                    107 [label="Enter block"];
-                    105 [label="Access variable R|<local>/b|"];
+                    108 [label="Access variable R|<local>/b|"];
-                    106 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
+                    109 [label="Smart cast: R|<local>/b|"];
-                    107 [label="Exit block"];
+                    110 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
+                    111 [label="Exit block"];
                 }
-                108 [label="Exit when branch result"];
+                112 [label="Exit when branch result"];
-                109 [label="Exit when"];
+                113 [label="Exit when"];
             }
-            110 [label="Exit block"];
+            114 [label="Exit block"];
         }
-        111 [label="Exit function test_4" style="filled" fillcolor=red];
+        115 [label="Exit function test_4" style="filled" fillcolor=red];
     }
-    85 -> {86};
-    86 -> {87};
-    87 -> {88};
     88 -> {89};
     89 -> {90};
     90 -> {91};
     91 -> {92};
     92 -> {93};
     93 -> {94};
-    94 -> {103 95};
+    94 -> {95};
     95 -> {96};
     96 -> {97};
-    97 -> {98};
+    97 -> {106 98};
     98 -> {99};
     99 -> {100};
     100 -> {101};
     101 -> {102};
-    102 -> {109};
+    102 -> {103};
     103 -> {104};
     104 -> {105};
-    105 -> {106};
+    105 -> {113};
     106 -> {107};
     107 -> {108};
     108 -> {109};
     109 -> {110};
     110 -> {111};
-
+    111 -> {112};
-    subgraph cluster_30 {
-        color=red
-        112 [label="Enter function test_5" style="filled" fillcolor=red];
-        subgraph cluster_31 {
-            color=blue
-            113 [label="Enter block"];
-            subgraph cluster_32 {
-                color=blue
-                114 [label="Enter when"];
-                subgraph cluster_33 {
-                    color=blue
-                    115 [label="Enter when branch condition "];
-                    116 [label="Access variable R|<local>/b|"];
-                    117 [label="Const: Boolean(true)"];
-                    118 [label="Equality operator !="];
-                    119 [label="Const: Boolean(true)"];
-                    120 [label="Equality operator =="];
-                    121 [label="Exit when branch condition"];
-                }
-                subgraph cluster_34 {
-                    color=blue
-                    122 [label="Enter when branch condition else"];
-                    123 [label="Exit when branch condition"];
-                }
-                124 [label="Enter when branch result"];
-                subgraph cluster_35 {
-                    color=blue
-                    125 [label="Enter block"];
-                    126 [label="Access variable R|<local>/b|"];
-                    127 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
-                    128 [label="Exit block"];
-                }
-                129 [label="Exit when branch result"];
-                130 [label="Enter when branch result"];
-                subgraph cluster_36 {
-                    color=blue
-                    131 [label="Enter block"];
-                    132 [label="Access variable R|<local>/b|"];
-                    133 [label="Function call: R|<local>/b|.<Inapplicable(UNSAFE_CALL): kotlin/Boolean.not>#()"];
-                    134 [label="Exit block"];
-                }
-                135 [label="Exit when branch result"];
-                136 [label="Exit when"];
-            }
-            137 [label="Exit block"];
-        }
-        138 [label="Exit function test_5" style="filled" fillcolor=red];
-    }
     112 -> {113};
     113 -> {114};
     114 -> {115};
-    115 -> {116};
+
+    subgraph cluster_30 {
+        color=red
+        116 [label="Enter function test_5" style="filled" fillcolor=red];
+        subgraph cluster_31 {
+            color=blue
+            117 [label="Enter block"];
+            subgraph cluster_32 {
+                color=blue
+                118 [label="Enter when"];
+                subgraph cluster_33 {
+                    color=blue
+                    119 [label="Enter when branch condition "];
+                    120 [label="Access variable R|<local>/b|"];
+                    121 [label="Const: Boolean(true)"];
+                    122 [label="Equality operator !="];
+                    123 [label="Const: Boolean(true)"];
+                    124 [label="Equality operator =="];
+                    125 [label="Exit when branch condition"];
+                }
+                subgraph cluster_34 {
+                    color=blue
+                    126 [label="Enter when branch condition else"];
+                    127 [label="Exit when branch condition"];
+                }
+                128 [label="Enter when branch result"];
+                subgraph cluster_35 {
+                    color=blue
+                    129 [label="Enter block"];
+                    130 [label="Access variable R|<local>/b|"];
+                    131 [label="Smart cast: R|<local>/b|"];
+                    132 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
+                    133 [label="Exit block"];
+                }
+                134 [label="Exit when branch result"];
+                135 [label="Enter when branch result"];
+                subgraph cluster_36 {
+                    color=blue
+                    136 [label="Enter block"];
+                    137 [label="Access variable R|<local>/b|"];
+                    138 [label="Function call: R|<local>/b|.<Inapplicable(UNSAFE_CALL): kotlin/Boolean.not>#()"];
+                    139 [label="Exit block"];
+                }
+                140 [label="Exit when branch result"];
+                141 [label="Exit when"];
+            }
+            142 [label="Exit block"];
+        }
+        143 [label="Exit function test_5" style="filled" fillcolor=red];
+    }
     116 -> {117};
     117 -> {118};
     118 -> {119};
     119 -> {120};
     120 -> {121};
-    121 -> {130 122};
+    121 -> {122};
     122 -> {123};
     123 -> {124};
     124 -> {125};
-    125 -> {126};
+    125 -> {135 126};
     126 -> {127};
     127 -> {128};
     128 -> {129};
-    129 -> {136};
+    129 -> {130};
     130 -> {131};
     131 -> {132};
     132 -> {133};
     133 -> {134};
-    134 -> {135};
+    134 -> {141};
     135 -> {136};
     136 -> {137};
     137 -> {138};
-
+    138 -> {139};
-    subgraph cluster_37 {
-        color=red
-        139 [label="Enter function test_6" style="filled" fillcolor=red];
-        subgraph cluster_38 {
-            color=blue
-            140 [label="Enter block"];
-            subgraph cluster_39 {
-                color=blue
-                141 [label="Enter when"];
-                subgraph cluster_40 {
-                    color=blue
-                    142 [label="Enter when branch condition "];
-                    143 [label="Access variable R|<local>/b|"];
-                    144 [label="Const: Boolean(true)"];
-                    145 [label="Equality operator !="];
-                    146 [label="Const: Boolean(true)"];
-                    147 [label="Equality operator !="];
-                    148 [label="Exit when branch condition"];
-                }
-                subgraph cluster_41 {
-                    color=blue
-                    149 [label="Enter when branch condition else"];
-                    150 [label="Exit when branch condition"];
-                }
-                151 [label="Enter when branch result"];
-                subgraph cluster_42 {
-                    color=blue
-                    152 [label="Enter block"];
-                    153 [label="Access variable R|<local>/b|"];
-                    154 [label="Function call: R|<local>/b|.<Inapplicable(UNSAFE_CALL): kotlin/Boolean.not>#()"];
-                    155 [label="Exit block"];
-                }
-                156 [label="Exit when branch result"];
-                157 [label="Enter when branch result"];
-                subgraph cluster_43 {
-                    color=blue
-                    158 [label="Enter block"];
-                    159 [label="Access variable R|<local>/b|"];
-                    160 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
-                    161 [label="Exit block"];
-                }
-                162 [label="Exit when branch result"];
-                163 [label="Exit when"];
-            }
-            164 [label="Exit block"];
-        }
-        165 [label="Exit function test_6" style="filled" fillcolor=red];
-    }
     139 -> {140};
     140 -> {141};
     141 -> {142};
     142 -> {143};
-    143 -> {144};
+
+    subgraph cluster_37 {
+        color=red
+        144 [label="Enter function test_6" style="filled" fillcolor=red];
+        subgraph cluster_38 {
+            color=blue
+            145 [label="Enter block"];
+            subgraph cluster_39 {
+                color=blue
+                146 [label="Enter when"];
+                subgraph cluster_40 {
+                    color=blue
+                    147 [label="Enter when branch condition "];
+                    148 [label="Access variable R|<local>/b|"];
+                    149 [label="Const: Boolean(true)"];
+                    150 [label="Equality operator !="];
+                    151 [label="Const: Boolean(true)"];
+                    152 [label="Equality operator !="];
+                    153 [label="Exit when branch condition"];
+                }
+                subgraph cluster_41 {
+                    color=blue
+                    154 [label="Enter when branch condition else"];
+                    155 [label="Exit when branch condition"];
+                }
+                156 [label="Enter when branch result"];
+                subgraph cluster_42 {
+                    color=blue
+                    157 [label="Enter block"];
+                    158 [label="Access variable R|<local>/b|"];
+                    159 [label="Function call: R|<local>/b|.<Inapplicable(UNSAFE_CALL): kotlin/Boolean.not>#()"];
+                    160 [label="Exit block"];
+                }
+                161 [label="Exit when branch result"];
+                162 [label="Enter when branch result"];
+                subgraph cluster_43 {
+                    color=blue
+                    163 [label="Enter block"];
+                    164 [label="Access variable R|<local>/b|"];
+                    165 [label="Smart cast: R|<local>/b|"];
+                    166 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
+                    167 [label="Exit block"];
+                }
+                168 [label="Exit when branch result"];
+                169 [label="Exit when"];
+            }
+            170 [label="Exit block"];
+        }
+        171 [label="Exit function test_6" style="filled" fillcolor=red];
+    }
     144 -> {145};
     145 -> {146};
     146 -> {147};
     147 -> {148};
-    148 -> {157 149};
+    148 -> {149};
     149 -> {150};
     150 -> {151};
     151 -> {152};
     152 -> {153};
-    153 -> {154};
+    153 -> {162 154};
     154 -> {155};
     155 -> {156};
-    156 -> {163};
+    156 -> {157};
     157 -> {158};
     158 -> {159};
     159 -> {160};
     160 -> {161};
-    161 -> {162};
+    161 -> {169};
     162 -> {163};
     163 -> {164};
     164 -> {165};
-
+    165 -> {166};
-    subgraph cluster_44 {
-        color=red
-        166 [label="Enter function test_7" style="filled" fillcolor=red];
-        subgraph cluster_45 {
-            color=blue
-            167 [label="Enter block"];
-            subgraph cluster_46 {
-                color=blue
-                168 [label="Enter when"];
-                subgraph cluster_47 {
-                    color=blue
-                    169 [label="Enter when branch condition "];
-                    170 [label="Access variable R|<local>/b|"];
-                    171 [label="Const: Boolean(true)"];
-                    172 [label="Equality operator !="];
-                    173 [label="Const: Boolean(false)"];
-                    174 [label="Equality operator =="];
-                    175 [label="Exit when branch condition"];
-                }
-                subgraph cluster_48 {
-                    color=blue
-                    176 [label="Enter when branch condition else"];
-                    177 [label="Exit when branch condition"];
-                }
-                178 [label="Enter when branch result"];
-                subgraph cluster_49 {
-                    color=blue
-                    179 [label="Enter block"];
-                    180 [label="Access variable R|<local>/b|"];
-                    181 [label="Function call: R|<local>/b|.<Inapplicable(UNSAFE_CALL): kotlin/Boolean.not>#()"];
-                    182 [label="Exit block"];
-                }
-                183 [label="Exit when branch result"];
-                184 [label="Enter when branch result"];
-                subgraph cluster_50 {
-                    color=blue
-                    185 [label="Enter block"];
-                    186 [label="Access variable R|<local>/b|"];
-                    187 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
-                    188 [label="Exit block"];
-                }
-                189 [label="Exit when branch result"];
-                190 [label="Exit when"];
-            }
-            191 [label="Exit block"];
-        }
-        192 [label="Exit function test_7" style="filled" fillcolor=red];
-    }
     166 -> {167};
     167 -> {168};
     168 -> {169};
     169 -> {170};
     170 -> {171};
-    171 -> {172};
+
+    subgraph cluster_44 {
+        color=red
+        172 [label="Enter function test_7" style="filled" fillcolor=red];
+        subgraph cluster_45 {
+            color=blue
+            173 [label="Enter block"];
+            subgraph cluster_46 {
+                color=blue
+                174 [label="Enter when"];
+                subgraph cluster_47 {
+                    color=blue
+                    175 [label="Enter when branch condition "];
+                    176 [label="Access variable R|<local>/b|"];
+                    177 [label="Const: Boolean(true)"];
+                    178 [label="Equality operator !="];
+                    179 [label="Const: Boolean(false)"];
+                    180 [label="Equality operator =="];
+                    181 [label="Exit when branch condition"];
+                }
+                subgraph cluster_48 {
+                    color=blue
+                    182 [label="Enter when branch condition else"];
+                    183 [label="Exit when branch condition"];
+                }
+                184 [label="Enter when branch result"];
+                subgraph cluster_49 {
+                    color=blue
+                    185 [label="Enter block"];
+                    186 [label="Access variable R|<local>/b|"];
+                    187 [label="Function call: R|<local>/b|.<Inapplicable(UNSAFE_CALL): kotlin/Boolean.not>#()"];
+                    188 [label="Exit block"];
+                }
+                189 [label="Exit when branch result"];
+                190 [label="Enter when branch result"];
+                subgraph cluster_50 {
+                    color=blue
+                    191 [label="Enter block"];
+                    192 [label="Access variable R|<local>/b|"];
+                    193 [label="Smart cast: R|<local>/b|"];
+                    194 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
+                    195 [label="Exit block"];
+                }
+                196 [label="Exit when branch result"];
+                197 [label="Exit when"];
+            }
+            198 [label="Exit block"];
+        }
+        199 [label="Exit function test_7" style="filled" fillcolor=red];
+    }
     172 -> {173};
     173 -> {174};
     174 -> {175};
-    175 -> {184 176};
+    175 -> {176};
     176 -> {177};
     177 -> {178};
     178 -> {179};
     179 -> {180};
     180 -> {181};
-    181 -> {182};
+    181 -> {190 182};
     182 -> {183};
-    183 -> {190};
+    183 -> {184};
     184 -> {185};
     185 -> {186};
     186 -> {187};
     187 -> {188};
     188 -> {189};
-    189 -> {190};
+    189 -> {197};
     190 -> {191};
     191 -> {192};
-
+    192 -> {193};
-    subgraph cluster_51 {
-        color=red
-        193 [label="Enter function test_8" style="filled" fillcolor=red];
-        subgraph cluster_52 {
-            color=blue
-            194 [label="Enter block"];
-            subgraph cluster_53 {
-                color=blue
-                195 [label="Enter when"];
-                subgraph cluster_54 {
-                    color=blue
-                    196 [label="Enter when branch condition "];
-                    197 [label="Access variable R|<local>/b|"];
-                    198 [label="Const: Boolean(true)"];
-                    199 [label="Equality operator !="];
-                    200 [label="Const: Boolean(false)"];
-                    201 [label="Equality operator !="];
-                    202 [label="Exit when branch condition"];
-                }
-                subgraph cluster_55 {
-                    color=blue
-                    203 [label="Enter when branch condition else"];
-                    204 [label="Exit when branch condition"];
-                }
-                205 [label="Enter when branch result"];
-                subgraph cluster_56 {
-                    color=blue
-                    206 [label="Enter block"];
-                    207 [label="Access variable R|<local>/b|"];
-                    208 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
-                    209 [label="Exit block"];
-                }
-                210 [label="Exit when branch result"];
-                211 [label="Enter when branch result"];
-                subgraph cluster_57 {
-                    color=blue
-                    212 [label="Enter block"];
-                    213 [label="Access variable R|<local>/b|"];
-                    214 [label="Function call: R|<local>/b|.<Inapplicable(UNSAFE_CALL): kotlin/Boolean.not>#()"];
-                    215 [label="Exit block"];
-                }
-                216 [label="Exit when branch result"];
-                217 [label="Exit when"];
-            }
-            218 [label="Exit block"];
-        }
-        219 [label="Exit function test_8" style="filled" fillcolor=red];
-    }
     193 -> {194};
     194 -> {195};
     195 -> {196};
     196 -> {197};
     197 -> {198};
     198 -> {199};
-    199 -> {200};
+
+    subgraph cluster_51 {
+        color=red
+        200 [label="Enter function test_8" style="filled" fillcolor=red];
+        subgraph cluster_52 {
+            color=blue
+            201 [label="Enter block"];
+            subgraph cluster_53 {
+                color=blue
+                202 [label="Enter when"];
+                subgraph cluster_54 {
+                    color=blue
+                    203 [label="Enter when branch condition "];
+                    204 [label="Access variable R|<local>/b|"];
+                    205 [label="Const: Boolean(true)"];
+                    206 [label="Equality operator !="];
+                    207 [label="Const: Boolean(false)"];
+                    208 [label="Equality operator !="];
+                    209 [label="Exit when branch condition"];
+                }
+                subgraph cluster_55 {
+                    color=blue
+                    210 [label="Enter when branch condition else"];
+                    211 [label="Exit when branch condition"];
+                }
+                212 [label="Enter when branch result"];
+                subgraph cluster_56 {
+                    color=blue
+                    213 [label="Enter block"];
+                    214 [label="Access variable R|<local>/b|"];
+                    215 [label="Smart cast: R|<local>/b|"];
+                    216 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
+                    217 [label="Exit block"];
+                }
+                218 [label="Exit when branch result"];
+                219 [label="Enter when branch result"];
+                subgraph cluster_57 {
+                    color=blue
+                    220 [label="Enter block"];
+                    221 [label="Access variable R|<local>/b|"];
+                    222 [label="Function call: R|<local>/b|.<Inapplicable(UNSAFE_CALL): kotlin/Boolean.not>#()"];
+                    223 [label="Exit block"];
+                }
+                224 [label="Exit when branch result"];
+                225 [label="Exit when"];
+            }
+            226 [label="Exit block"];
+        }
+        227 [label="Exit function test_8" style="filled" fillcolor=red];
+    }
     200 -> {201};
     201 -> {202};
-    202 -> {211 203};
+    202 -> {203};
     203 -> {204};
     204 -> {205};
     205 -> {206};
     206 -> {207};
     207 -> {208};
     208 -> {209};
-    209 -> {210};
+    209 -> {219 210};
-    210 -> {217};
+    210 -> {211};
     211 -> {212};
     212 -> {213};
     213 -> {214};
@@ -615,6 +623,14 @@ digraph equalsToBoolean_kt {
     215 -> {216};
     216 -> {217};
     217 -> {218};
-    218 -> {219};
+    218 -> {225};
+    219 -> {220};
+    220 -> {221};
+    221 -> {222};
+    222 -> {223};
+    223 -> {224};
+    224 -> {225};
+    225 -> {226};
+    226 -> {227};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.dot

@@ -37,10 +37,11 @@ digraph jumpFromRhsOfOperator_kt {
                 15 [label="Exit ||"];
             }
             16 [label="Access variable R|<local>/a|"];
-            17 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            17 [label="Smart cast: R|<local>/a|"];
-            18 [label="Exit block"];
+            18 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            19 [label="Exit block"];
         }
-        19 [label="Exit function test_1" style="filled" fillcolor=red];
+        20 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     4 -> {5};
     5 -> {6};
@@ -51,120 +52,123 @@ digraph jumpFromRhsOfOperator_kt {
     10 -> {15 11};
     11 -> {12};
     12 -> {13};
-    13 -> {19}    [label=onUncaughtException];
+    13 -> {20}    [label=onUncaughtException];
     13 -> {14} [style=dotted];
     14 -> {15} [style=dotted];
     15 -> {16};
     16 -> {17};
     17 -> {18};
     18 -> {19};
+    19 -> {20};
 
     subgraph cluster_5 {
         color=red
-        20 [label="Enter function teat_2" style="filled" fillcolor=red];
+        21 [label="Enter function teat_2" style="filled" fillcolor=red];
         subgraph cluster_6 {
             color=blue
-            21 [label="Enter block"];
+            22 [label="Enter block"];
             subgraph cluster_7 {
                 color=blue
-                22 [label="Enter &&"];
+                23 [label="Enter &&"];
-                23 [label="Access variable R|<local>/a|"];
+                24 [label="Access variable R|<local>/a|"];
-                24 [label="Const: Null(null)"];
+                25 [label="Const: Null(null)"];
-                25 [label="Equality operator =="];
+                26 [label="Equality operator =="];
-                26 [label="Exit left part of &&"];
+                27 [label="Exit left part of &&"];
-                27 [label="Enter right part of &&"];
+                28 [label="Enter right part of &&"];
-                28 [label="Function call: R|java/lang/Exception.Exception|()"];
+                29 [label="Function call: R|java/lang/Exception.Exception|()"];
-                29 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                30 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                30 [label="Stub" style="filled" fillcolor=gray];
+                31 [label="Stub" style="filled" fillcolor=gray];
-                31 [label="Exit &&"];
+                32 [label="Exit &&"];
             }
-            32 [label="Access variable R|<local>/a|"];
+            33 [label="Access variable R|<local>/a|"];
-            33 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            34 [label="Smart cast: R|<local>/a|"];
-            34 [label="Exit block"];
+            35 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            36 [label="Exit block"];
         }
-        35 [label="Exit function teat_2" style="filled" fillcolor=red];
+        37 [label="Exit function teat_2" style="filled" fillcolor=red];
     }
-    20 -> {21};
     21 -> {22};
     22 -> {23};
     23 -> {24};
     24 -> {25};
     25 -> {26};
-    26 -> {31 27};
+    26 -> {27};
-    27 -> {28};
+    27 -> {32 28};
     28 -> {29};
-    29 -> {35}    [label=onUncaughtException];
+    29 -> {30};
-    29 -> {30} [style=dotted];
+    30 -> {37}    [label=onUncaughtException];
     30 -> {31} [style=dotted];
-    31 -> {32};
+    31 -> {32} [style=dotted];
     32 -> {33};
     33 -> {34};
     34 -> {35};
+    35 -> {36};
+    36 -> {37};
 
     subgraph cluster_8 {
         color=red
-        36 [label="Enter function test_3" style="filled" fillcolor=red];
+        38 [label="Enter function test_3" style="filled" fillcolor=red];
         subgraph cluster_9 {
             color=blue
-            37 [label="Enter block"];
+            39 [label="Enter block"];
             subgraph cluster_10 {
                 color=blue
-                38 [label="Enter when"];
+                40 [label="Enter when"];
                 subgraph cluster_11 {
                     color=blue
-                    39 [label="Enter when branch condition "];
+                    41 [label="Enter when branch condition "];
                     subgraph cluster_12 {
                         color=blue
-                        40 [label="Enter ||"];
+                        42 [label="Enter ||"];
-                        41 [label="Access variable R|<local>/a|"];
+                        43 [label="Access variable R|<local>/a|"];
-                        42 [label="Const: Null(null)"];
+                        44 [label="Const: Null(null)"];
-                        43 [label="Equality operator !="];
+                        45 [label="Equality operator !="];
-                        44 [label="Exit left part of ||"];
+                        46 [label="Exit left part of ||"];
-                        45 [label="Enter right part of ||"];
+                        47 [label="Enter right part of ||"];
-                        46 [label="Function call: R|java/lang/Exception.Exception|()"];
+                        48 [label="Function call: R|java/lang/Exception.Exception|()"];
-                        47 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                        49 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                        48 [label="Stub" style="filled" fillcolor=gray];
+                        50 [label="Stub" style="filled" fillcolor=gray];
-                        49 [label="Exit ||"];
+                        51 [label="Exit ||"];
                     }
-                    50 [label="Exit when branch condition"];
+                    52 [label="Exit when branch condition"];
                 }
-                51 [label="Synthetic else branch"];
+                53 [label="Synthetic else branch"];
-                52 [label="Enter when branch result"];
+                54 [label="Enter when branch result"];
                 subgraph cluster_13 {
                     color=blue
-                    53 [label="Enter block"];
+                    55 [label="Enter block"];
-                    54 [label="Access variable R|<local>/a|"];
+                    56 [label="Access variable R|<local>/a|"];
-                    55 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+                    57 [label="Smart cast: R|<local>/a|"];
-                    56 [label="Exit block"];
+                    58 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+                    59 [label="Exit block"];
                 }
-                57 [label="Exit when branch result"];
+                60 [label="Exit when branch result"];
-                58 [label="Exit when"];
+                61 [label="Exit when"];
             }
-            59 [label="Access variable R|<local>/a|"];
+            62 [label="Access variable R|<local>/a|"];
-            60 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            63 [label="Smart cast: R|<local>/a|"];
-            61 [label="Exit block"];
+            64 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            65 [label="Exit block"];
         }
-        62 [label="Exit function test_3" style="filled" fillcolor=red];
+        66 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    36 -> {37};
-    37 -> {38};
     38 -> {39};
     39 -> {40};
     40 -> {41};
     41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {49 45};
+    44 -> {45};
     45 -> {46};
-    46 -> {47};
+    46 -> {51 47};
-    47 -> {62}    [label=onUncaughtException];
+    47 -> {48};
-    47 -> {48} [style=dotted];
+    48 -> {49};
-    48 -> {49} [style=dotted];
+    49 -> {66}    [label=onUncaughtException];
-    49 -> {50};
+    49 -> {50} [style=dotted];
-    50 -> {52 51};
+    50 -> {51} [style=dotted];
-    51 -> {58};
+    51 -> {52};
-    52 -> {53};
+    52 -> {54 53};
-    53 -> {54};
+    53 -> {61};
     54 -> {55};
     55 -> {56};
     56 -> {57};
@@ -173,282 +177,243 @@ digraph jumpFromRhsOfOperator_kt {
     59 -> {60};
     60 -> {61};
     61 -> {62};
-
+    62 -> {63};
-    subgraph cluster_14 {
-        color=red
-        63 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_15 {
-            color=blue
-            64 [label="Enter block"];
-            subgraph cluster_16 {
-                color=blue
-                65 [label="Enter when"];
-                subgraph cluster_17 {
-                    color=blue
-                    66 [label="Enter when branch condition "];
-                    subgraph cluster_18 {
-                        color=blue
-                        67 [label="Enter &&"];
-                        68 [label="Access variable R|<local>/a|"];
-                        69 [label="Const: Null(null)"];
-                        70 [label="Equality operator =="];
-                        71 [label="Exit left part of &&"];
-                        72 [label="Enter right part of &&"];
-                        73 [label="Function call: R|java/lang/Exception.Exception|()"];
-                        74 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                        75 [label="Stub" style="filled" fillcolor=gray];
-                        76 [label="Exit &&"];
-                    }
-                    77 [label="Exit when branch condition"];
-                }
-                78 [label="Synthetic else branch"];
-                79 [label="Enter when branch result"];
-                subgraph cluster_19 {
-                    color=blue
-                    80 [label="Enter block"];
-                    81 [label="Access variable R|<local>/a|"];
-                    82 [label="Function call: R|<local>/a|.R|/A.foo|()"];
-                    83 [label="Exit block"];
-                }
-                84 [label="Exit when branch result"];
-                85 [label="Exit when"];
-            }
-            86 [label="Access variable R|<local>/a|"];
-            87 [label="Function call: R|<local>/a|.R|/A.foo|()"];
-            88 [label="Exit block"];
-        }
-        89 [label="Exit function test_4" style="filled" fillcolor=red];
-    }
     63 -> {64};
     64 -> {65};
     65 -> {66};
-    66 -> {67};
+
+    subgraph cluster_14 {
+        color=red
+        67 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_15 {
+            color=blue
+            68 [label="Enter block"];
+            subgraph cluster_16 {
+                color=blue
+                69 [label="Enter when"];
+                subgraph cluster_17 {
+                    color=blue
+                    70 [label="Enter when branch condition "];
+                    subgraph cluster_18 {
+                        color=blue
+                        71 [label="Enter &&"];
+                        72 [label="Access variable R|<local>/a|"];
+                        73 [label="Const: Null(null)"];
+                        74 [label="Equality operator =="];
+                        75 [label="Exit left part of &&"];
+                        76 [label="Enter right part of &&"];
+                        77 [label="Function call: R|java/lang/Exception.Exception|()"];
+                        78 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                        79 [label="Stub" style="filled" fillcolor=gray];
+                        80 [label="Exit &&"];
+                    }
+                    81 [label="Exit when branch condition"];
+                }
+                82 [label="Synthetic else branch"];
+                83 [label="Enter when branch result"];
+                subgraph cluster_19 {
+                    color=blue
+                    84 [label="Enter block"];
+                    85 [label="Access variable R|<local>/a|"];
+                    86 [label="Smart cast: R|<local>/a|"];
+                    87 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+                    88 [label="Exit block"];
+                }
+                89 [label="Exit when branch result"];
+                90 [label="Exit when"];
+            }
+            91 [label="Access variable R|<local>/a|"];
+            92 [label="Smart cast: R|<local>/a|"];
+            93 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            94 [label="Exit block"];
+        }
+        95 [label="Exit function test_4" style="filled" fillcolor=red];
+    }
     67 -> {68};
     68 -> {69};
     69 -> {70};
     70 -> {71};
-    71 -> {76 72};
+    71 -> {72};
     72 -> {73};
     73 -> {74};
-    74 -> {89}    [label=onUncaughtException];
+    74 -> {75};
-    74 -> {75} [style=dotted];
+    75 -> {80 76};
-    75 -> {76} [style=dotted];
     76 -> {77};
-    77 -> {79 78};
+    77 -> {78};
-    78 -> {85};
+    78 -> {95}    [label=onUncaughtException];
-    79 -> {80};
+    78 -> {79} [style=dotted];
+    79 -> {80} [style=dotted];
     80 -> {81};
-    81 -> {82};
+    81 -> {83 82};
-    82 -> {83};
+    82 -> {90};
     83 -> {84};
     84 -> {85};
     85 -> {86};
     86 -> {87};
     87 -> {88};
     88 -> {89};
-
+    89 -> {90};
-    subgraph cluster_20 {
-        color=red
-        90 [label="Enter function test_5" style="filled" fillcolor=red];
-        subgraph cluster_21 {
-            color=blue
-            91 [label="Enter block"];
-            subgraph cluster_22 {
-                color=blue
-                92 [label="Enter ||"];
-                93 [label="Access variable R|<local>/a|"];
-                94 [label="Const: Null(null)"];
-                95 [label="Equality operator =="];
-                96 [label="Exit left part of ||"];
-                97 [label="Enter right part of ||"];
-                98 [label="Function call: R|java/lang/Exception.Exception|()"];
-                99 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                100 [label="Stub" style="filled" fillcolor=gray];
-                101 [label="Exit ||"];
-            }
-            102 [label="Access variable R|<local>/a|"];
-            103 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
-            104 [label="Exit block"];
-        }
-        105 [label="Exit function test_5" style="filled" fillcolor=red];
-    }
     90 -> {91};
     91 -> {92};
     92 -> {93};
     93 -> {94};
     94 -> {95};
-    95 -> {96};
+
-    96 -> {101 97};
+    subgraph cluster_20 {
+        color=red
+        96 [label="Enter function test_5" style="filled" fillcolor=red];
+        subgraph cluster_21 {
+            color=blue
+            97 [label="Enter block"];
+            subgraph cluster_22 {
+                color=blue
+                98 [label="Enter ||"];
+                99 [label="Access variable R|<local>/a|"];
+                100 [label="Const: Null(null)"];
+                101 [label="Equality operator =="];
+                102 [label="Exit left part of ||"];
+                103 [label="Enter right part of ||"];
+                104 [label="Function call: R|java/lang/Exception.Exception|()"];
+                105 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                106 [label="Stub" style="filled" fillcolor=gray];
+                107 [label="Exit ||"];
+            }
+            108 [label="Access variable R|<local>/a|"];
+            109 [label="Smart cast: R|<local>/a|"];
+            110 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
+            111 [label="Exit block"];
+        }
+        112 [label="Exit function test_5" style="filled" fillcolor=red];
+    }
+    96 -> {97};
     97 -> {98};
     98 -> {99};
-    99 -> {105}    [label=onUncaughtException];
+    99 -> {100};
-    99 -> {100} [style=dotted];
+    100 -> {101};
-    100 -> {101} [style=dotted];
     101 -> {102};
-    102 -> {103};
+    102 -> {107 103};
     103 -> {104};
     104 -> {105};
-
+    105 -> {112}    [label=onUncaughtException];
-    subgraph cluster_23 {
+    105 -> {106} [style=dotted];
-        color=red
+    106 -> {107} [style=dotted];
-        106 [label="Enter function teat_6" style="filled" fillcolor=red];
-        subgraph cluster_24 {
-            color=blue
-            107 [label="Enter block"];
-            subgraph cluster_25 {
-                color=blue
-                108 [label="Enter &&"];
-                109 [label="Access variable R|<local>/a|"];
-                110 [label="Const: Null(null)"];
-                111 [label="Equality operator !="];
-                112 [label="Exit left part of &&"];
-                113 [label="Enter right part of &&"];
-                114 [label="Function call: R|java/lang/Exception.Exception|()"];
-                115 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                116 [label="Stub" style="filled" fillcolor=gray];
-                117 [label="Exit &&"];
-            }
-            118 [label="Access variable R|<local>/a|"];
-            119 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
-            120 [label="Exit block"];
-        }
-        121 [label="Exit function teat_6" style="filled" fillcolor=red];
-    }
-    106 -> {107};
     107 -> {108};
     108 -> {109};
     109 -> {110};
     110 -> {111};
     111 -> {112};
-    112 -> {117 113};
+
+    subgraph cluster_23 {
+        color=red
+        113 [label="Enter function teat_6" style="filled" fillcolor=red];
+        subgraph cluster_24 {
+            color=blue
+            114 [label="Enter block"];
+            subgraph cluster_25 {
+                color=blue
+                115 [label="Enter &&"];
+                116 [label="Access variable R|<local>/a|"];
+                117 [label="Const: Null(null)"];
+                118 [label="Equality operator !="];
+                119 [label="Exit left part of &&"];
+                120 [label="Enter right part of &&"];
+                121 [label="Function call: R|java/lang/Exception.Exception|()"];
+                122 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                123 [label="Stub" style="filled" fillcolor=gray];
+                124 [label="Exit &&"];
+            }
+            125 [label="Access variable R|<local>/a|"];
+            126 [label="Smart cast: R|<local>/a|"];
+            127 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
+            128 [label="Exit block"];
+        }
+        129 [label="Exit function teat_6" style="filled" fillcolor=red];
+    }
     113 -> {114};
     114 -> {115};
-    115 -> {121}    [label=onUncaughtException];
+    115 -> {116};
-    115 -> {116} [style=dotted];
+    116 -> {117};
-    116 -> {117} [style=dotted];
     117 -> {118};
     118 -> {119};
-    119 -> {120};
+    119 -> {124 120};
     120 -> {121};
-
+    121 -> {122};
-    subgraph cluster_26 {
+    122 -> {129}    [label=onUncaughtException];
-        color=red
+    122 -> {123} [style=dotted];
-        122 [label="Enter function test_7" style="filled" fillcolor=red];
+    123 -> {124} [style=dotted];
-        subgraph cluster_27 {
-            color=blue
-            123 [label="Enter block"];
-            subgraph cluster_28 {
-                color=blue
-                124 [label="Enter when"];
-                subgraph cluster_29 {
-                    color=blue
-                    125 [label="Enter when branch condition "];
-                    subgraph cluster_30 {
-                        color=blue
-                        126 [label="Enter ||"];
-                        127 [label="Access variable R|<local>/a|"];
-                        128 [label="Const: Null(null)"];
-                        129 [label="Equality operator =="];
-                        130 [label="Exit left part of ||"];
-                        131 [label="Enter right part of ||"];
-                        132 [label="Function call: R|java/lang/Exception.Exception|()"];
-                        133 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                        134 [label="Stub" style="filled" fillcolor=gray];
-                        135 [label="Exit ||"];
-                    }
-                    136 [label="Exit when branch condition"];
-                }
-                137 [label="Synthetic else branch"];
-                138 [label="Enter when branch result"];
-                subgraph cluster_31 {
-                    color=blue
-                    139 [label="Enter block"];
-                    140 [label="Access variable R|<local>/a|"];
-                    141 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
-                    142 [label="Exit block"];
-                }
-                143 [label="Exit when branch result"];
-                144 [label="Exit when"];
-            }
-            145 [label="Access variable R|<local>/a|"];
-            146 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
-            147 [label="Exit block"];
-        }
-        148 [label="Exit function test_7" style="filled" fillcolor=red];
-    }
-    122 -> {123};
-    123 -> {124};
     124 -> {125};
     125 -> {126};
     126 -> {127};
     127 -> {128};
     128 -> {129};
-    129 -> {130};
+
-    130 -> {135 131};
+    subgraph cluster_26 {
+        color=red
+        130 [label="Enter function test_7" style="filled" fillcolor=red];
+        subgraph cluster_27 {
+            color=blue
+            131 [label="Enter block"];
+            subgraph cluster_28 {
+                color=blue
+                132 [label="Enter when"];
+                subgraph cluster_29 {
+                    color=blue
+                    133 [label="Enter when branch condition "];
+                    subgraph cluster_30 {
+                        color=blue
+                        134 [label="Enter ||"];
+                        135 [label="Access variable R|<local>/a|"];
+                        136 [label="Const: Null(null)"];
+                        137 [label="Equality operator =="];
+                        138 [label="Exit left part of ||"];
+                        139 [label="Enter right part of ||"];
+                        140 [label="Function call: R|java/lang/Exception.Exception|()"];
+                        141 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                        142 [label="Stub" style="filled" fillcolor=gray];
+                        143 [label="Exit ||"];
+                    }
+                    144 [label="Exit when branch condition"];
+                }
+                145 [label="Synthetic else branch"];
+                146 [label="Enter when branch result"];
+                subgraph cluster_31 {
+                    color=blue
+                    147 [label="Enter block"];
+                    148 [label="Access variable R|<local>/a|"];
+                    149 [label="Smart cast: R|<local>/a|"];
+                    150 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
+                    151 [label="Exit block"];
+                }
+                152 [label="Exit when branch result"];
+                153 [label="Exit when"];
+            }
+            154 [label="Access variable R|<local>/a|"];
+            155 [label="Smart cast: R|<local>/a|"];
+            156 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
+            157 [label="Exit block"];
+        }
+        158 [label="Exit function test_7" style="filled" fillcolor=red];
+    }
+    130 -> {131};
     131 -> {132};
     132 -> {133};
-    133 -> {148}    [label=onUncaughtException];
+    133 -> {134};
-    133 -> {134} [style=dotted];
+    134 -> {135};
-    134 -> {135} [style=dotted];
     135 -> {136};
-    136 -> {138 137};
+    136 -> {137};
-    137 -> {144};
+    137 -> {138};
-    138 -> {139};
+    138 -> {143 139};
     139 -> {140};
     140 -> {141};
-    141 -> {142};
+    141 -> {158}    [label=onUncaughtException];
-    142 -> {143};
+    141 -> {142} [style=dotted];
+    142 -> {143} [style=dotted];
     143 -> {144};
-    144 -> {145};
+    144 -> {146 145};
-    145 -> {146};
+    145 -> {153};
     146 -> {147};
     147 -> {148};
-
+    148 -> {149};
-    subgraph cluster_32 {
-        color=red
-        149 [label="Enter function test_8" style="filled" fillcolor=red];
-        subgraph cluster_33 {
-            color=blue
-            150 [label="Enter block"];
-            subgraph cluster_34 {
-                color=blue
-                151 [label="Enter when"];
-                subgraph cluster_35 {
-                    color=blue
-                    152 [label="Enter when branch condition "];
-                    subgraph cluster_36 {
-                        color=blue
-                        153 [label="Enter &&"];
-                        154 [label="Access variable R|<local>/a|"];
-                        155 [label="Const: Null(null)"];
-                        156 [label="Equality operator !="];
-                        157 [label="Exit left part of &&"];
-                        158 [label="Enter right part of &&"];
-                        159 [label="Function call: R|java/lang/Exception.Exception|()"];
-                        160 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                        161 [label="Stub" style="filled" fillcolor=gray];
-                        162 [label="Exit &&"];
-                    }
-                    163 [label="Exit when branch condition"];
-                }
-                164 [label="Synthetic else branch"];
-                165 [label="Enter when branch result"];
-                subgraph cluster_37 {
-                    color=blue
-                    166 [label="Enter block"];
-                    167 [label="Access variable R|<local>/a|"];
-                    168 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
-                    169 [label="Exit block"];
-                }
-                170 [label="Exit when branch result"];
-                171 [label="Exit when"];
-            }
-            172 [label="Access variable R|<local>/a|"];
-            173 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
-            174 [label="Exit block"];
-        }
-        175 [label="Exit function test_8" style="filled" fillcolor=red];
-    }
     149 -> {150};
     150 -> {151};
     151 -> {152};
@@ -457,24 +422,83 @@ digraph jumpFromRhsOfOperator_kt {
     154 -> {155};
     155 -> {156};
     156 -> {157};
-    157 -> {162 158};
+    157 -> {158};
-    158 -> {159};
+
+    subgraph cluster_32 {
+        color=red
+        159 [label="Enter function test_8" style="filled" fillcolor=red];
+        subgraph cluster_33 {
+            color=blue
+            160 [label="Enter block"];
+            subgraph cluster_34 {
+                color=blue
+                161 [label="Enter when"];
+                subgraph cluster_35 {
+                    color=blue
+                    162 [label="Enter when branch condition "];
+                    subgraph cluster_36 {
+                        color=blue
+                        163 [label="Enter &&"];
+                        164 [label="Access variable R|<local>/a|"];
+                        165 [label="Const: Null(null)"];
+                        166 [label="Equality operator !="];
+                        167 [label="Exit left part of &&"];
+                        168 [label="Enter right part of &&"];
+                        169 [label="Function call: R|java/lang/Exception.Exception|()"];
+                        170 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                        171 [label="Stub" style="filled" fillcolor=gray];
+                        172 [label="Exit &&"];
+                    }
+                    173 [label="Exit when branch condition"];
+                }
+                174 [label="Synthetic else branch"];
+                175 [label="Enter when branch result"];
+                subgraph cluster_37 {
+                    color=blue
+                    176 [label="Enter block"];
+                    177 [label="Access variable R|<local>/a|"];
+                    178 [label="Smart cast: R|<local>/a|"];
+                    179 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
+                    180 [label="Exit block"];
+                }
+                181 [label="Exit when branch result"];
+                182 [label="Exit when"];
+            }
+            183 [label="Access variable R|<local>/a|"];
+            184 [label="Smart cast: R|<local>/a|"];
+            185 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
+            186 [label="Exit block"];
+        }
+        187 [label="Exit function test_8" style="filled" fillcolor=red];
+    }
     159 -> {160};
-    160 -> {175}    [label=onUncaughtException];
+    160 -> {161};
-    160 -> {161} [style=dotted];
+    161 -> {162};
-    161 -> {162} [style=dotted];
     162 -> {163};
-    163 -> {165 164};
+    163 -> {164};
-    164 -> {171};
+    164 -> {165};
     165 -> {166};
     166 -> {167};
-    167 -> {168};
+    167 -> {172 168};
     168 -> {169};
     169 -> {170};
-    170 -> {171};
+    170 -> {187}    [label=onUncaughtException];
-    171 -> {172};
+    170 -> {171} [style=dotted];
+    171 -> {172} [style=dotted];
     172 -> {173};
-    173 -> {174};
+    173 -> {175 174};
-    174 -> {175};
+    174 -> {182};
+    175 -> {176};
+    176 -> {177};
+    177 -> {178};
+    178 -> {179};
+    179 -> {180};
+    180 -> {181};
+    181 -> {182};
+    182 -> {183};
+    183 -> {184};
+    184 -> {185};
+    185 -> {186};
+    186 -> {187};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcasts.dot

@@ -55,17 +55,19 @@ digraph boundSmartcasts_kt {
                     color=blue
                     19 [label="Enter block"];
                     20 [label="Access variable R|<local>/x|"];
-                    21 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+                    21 [label="Smart cast: R|<local>/x|"];
-                    22 [label="Access variable R|<local>/y|"];
+                    22 [label="Function call: R|<local>/x|.R|/A.foo|()"];
-                    23 [label="Function call: R|<local>/y|.R|/A.foo|()"];
+                    23 [label="Access variable R|<local>/y|"];
-                    24 [label="Exit block"];
+                    24 [label="Smart cast: R|<local>/y|"];
+                    25 [label="Function call: R|<local>/y|.R|/A.foo|()"];
+                    26 [label="Exit block"];
                 }
-                25 [label="Exit when branch result"];
+                27 [label="Exit when branch result"];
-                26 [label="Exit when"];
+                28 [label="Exit when"];
             }
-            27 [label="Exit block"];
+            29 [label="Exit block"];
         }
-        28 [label="Exit function test_1" style="filled" fillcolor=red];
+        30 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     8 -> {9};
     9 -> {10};
@@ -76,7 +78,7 @@ digraph boundSmartcasts_kt {
     14 -> {15};
     15 -> {16};
     16 -> {18 17};
-    17 -> {26};
+    17 -> {28};
     18 -> {19};
     19 -> {20};
     20 -> {21};
@@ -87,55 +89,57 @@ digraph boundSmartcasts_kt {
     25 -> {26};
     26 -> {27};
     27 -> {28};
+    28 -> {29};
+    29 -> {30};
 
     subgraph cluster_9 {
         color=red
-        29 [label="Enter function test_2" style="filled" fillcolor=red];
+        31 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_10 {
             color=blue
-            30 [label="Enter block"];
+            32 [label="Enter block"];
-            31 [label="Access variable R|<local>/x|"];
+            33 [label="Access variable R|<local>/x|"];
-            32 [label="Variable declaration: lval y: R|kotlin/Any|"];
+            34 [label="Variable declaration: lval y: R|kotlin/Any|"];
             subgraph cluster_11 {
                 color=blue
-                33 [label="Enter when"];
+                35 [label="Enter when"];
                 subgraph cluster_12 {
                     color=blue
-                    34 [label="Enter when branch condition "];
+                    36 [label="Enter when branch condition "];
-                    35 [label="Access variable R|<local>/y|"];
+                    37 [label="Access variable R|<local>/y|"];
-                    36 [label="Type operator: (R|<local>/y| is R|A|)"];
+                    38 [label="Type operator: (R|<local>/y| is R|A|)"];
-                    37 [label="Exit when branch condition"];
+                    39 [label="Exit when branch condition"];
                 }
-                38 [label="Synthetic else branch"];
+                40 [label="Synthetic else branch"];
-                39 [label="Enter when branch result"];
+                41 [label="Enter when branch result"];
                 subgraph cluster_13 {
                     color=blue
-                    40 [label="Enter block"];
+                    42 [label="Enter block"];
-                    41 [label="Access variable R|<local>/x|"];
+                    43 [label="Access variable R|<local>/x|"];
-                    42 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+                    44 [label="Smart cast: R|<local>/x|"];
-                    43 [label="Access variable R|<local>/y|"];
+                    45 [label="Function call: R|<local>/x|.R|/A.foo|()"];
-                    44 [label="Function call: R|<local>/y|.R|/A.foo|()"];
+                    46 [label="Access variable R|<local>/y|"];
-                    45 [label="Exit block"];
+                    47 [label="Smart cast: R|<local>/y|"];
+                    48 [label="Function call: R|<local>/y|.R|/A.foo|()"];
+                    49 [label="Exit block"];
                 }
-                46 [label="Exit when branch result"];
+                50 [label="Exit when branch result"];
-                47 [label="Exit when"];
+                51 [label="Exit when"];
             }
-            48 [label="Exit block"];
+            52 [label="Exit block"];
         }
-        49 [label="Exit function test_2" style="filled" fillcolor=red];
+        53 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    29 -> {30};
-    30 -> {31};
     31 -> {32};
     32 -> {33};
     33 -> {34};
     34 -> {35};
     35 -> {36};
     36 -> {37};
-    37 -> {39 38};
+    37 -> {38};
-    38 -> {47};
+    38 -> {39};
-    39 -> {40};
+    39 -> {41 40};
-    40 -> {41};
+    40 -> {51};
     41 -> {42};
     42 -> {43};
     43 -> {44};
@@ -144,81 +148,84 @@ digraph boundSmartcasts_kt {
     46 -> {47};
     47 -> {48};
     48 -> {49};
-
+    49 -> {50};
-    subgraph cluster_14 {
-        color=red
-        50 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_15 {
-            color=blue
-            51 [label="Enter block"];
-            52 [label="Access variable R|<local>/x|"];
-            53 [label="Variable declaration: lvar z: R|kotlin/Any|"];
-            subgraph cluster_16 {
-                color=blue
-                54 [label="Enter when"];
-                subgraph cluster_17 {
-                    color=blue
-                    55 [label="Enter when branch condition "];
-                    56 [label="Access variable R|<local>/x|"];
-                    57 [label="Type operator: (R|<local>/x| is R|A|)"];
-                    58 [label="Exit when branch condition"];
-                }
-                59 [label="Synthetic else branch"];
-                60 [label="Enter when branch result"];
-                subgraph cluster_18 {
-                    color=blue
-                    61 [label="Enter block"];
-                    62 [label="Access variable R|<local>/z|"];
-                    63 [label="Function call: R|<local>/z|.R|/A.foo|()"];
-                    64 [label="Exit block"];
-                }
-                65 [label="Exit when branch result"];
-                66 [label="Exit when"];
-            }
-            67 [label="Access variable R|<local>/y|"];
-            68 [label="Assignment: R|<local>/z|"];
-            subgraph cluster_19 {
-                color=blue
-                69 [label="Enter when"];
-                subgraph cluster_20 {
-                    color=blue
-                    70 [label="Enter when branch condition "];
-                    71 [label="Access variable R|<local>/y|"];
-                    72 [label="Type operator: (R|<local>/y| is R|B|)"];
-                    73 [label="Exit when branch condition"];
-                }
-                74 [label="Synthetic else branch"];
-                75 [label="Enter when branch result"];
-                subgraph cluster_21 {
-                    color=blue
-                    76 [label="Enter block"];
-                    77 [label="Access variable R|<local>/z|"];
-                    78 [label="Function call: R|<local>/z|.<Unresolved name: foo>#()"];
-                    79 [label="Access variable R|<local>/z|"];
-                    80 [label="Function call: R|<local>/z|.R|/B.bar|()"];
-                    81 [label="Exit block"];
-                }
-                82 [label="Exit when branch result"];
-                83 [label="Exit when"];
-            }
-            84 [label="Exit block"];
-        }
-        85 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
     50 -> {51};
     51 -> {52};
     52 -> {53};
-    53 -> {54};
+
+    subgraph cluster_14 {
+        color=red
+        54 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_15 {
+            color=blue
+            55 [label="Enter block"];
+            56 [label="Access variable R|<local>/x|"];
+            57 [label="Variable declaration: lvar z: R|kotlin/Any|"];
+            subgraph cluster_16 {
+                color=blue
+                58 [label="Enter when"];
+                subgraph cluster_17 {
+                    color=blue
+                    59 [label="Enter when branch condition "];
+                    60 [label="Access variable R|<local>/x|"];
+                    61 [label="Type operator: (R|<local>/x| is R|A|)"];
+                    62 [label="Exit when branch condition"];
+                }
+                63 [label="Synthetic else branch"];
+                64 [label="Enter when branch result"];
+                subgraph cluster_18 {
+                    color=blue
+                    65 [label="Enter block"];
+                    66 [label="Access variable R|<local>/z|"];
+                    67 [label="Smart cast: R|<local>/z|"];
+                    68 [label="Function call: R|<local>/z|.R|/A.foo|()"];
+                    69 [label="Exit block"];
+                }
+                70 [label="Exit when branch result"];
+                71 [label="Exit when"];
+            }
+            72 [label="Access variable R|<local>/y|"];
+            73 [label="Assignment: R|<local>/z|"];
+            subgraph cluster_19 {
+                color=blue
+                74 [label="Enter when"];
+                subgraph cluster_20 {
+                    color=blue
+                    75 [label="Enter when branch condition "];
+                    76 [label="Access variable R|<local>/y|"];
+                    77 [label="Type operator: (R|<local>/y| is R|B|)"];
+                    78 [label="Exit when branch condition"];
+                }
+                79 [label="Synthetic else branch"];
+                80 [label="Enter when branch result"];
+                subgraph cluster_21 {
+                    color=blue
+                    81 [label="Enter block"];
+                    82 [label="Access variable R|<local>/z|"];
+                    83 [label="Smart cast: R|<local>/z|"];
+                    84 [label="Function call: R|<local>/z|.<Unresolved name: foo>#()"];
+                    85 [label="Access variable R|<local>/z|"];
+                    86 [label="Smart cast: R|<local>/z|"];
+                    87 [label="Function call: R|<local>/z|.R|/B.bar|()"];
+                    88 [label="Exit block"];
+                }
+                89 [label="Exit when branch result"];
+                90 [label="Exit when"];
+            }
+            91 [label="Exit block"];
+        }
+        92 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
     54 -> {55};
     55 -> {56};
     56 -> {57};
     57 -> {58};
-    58 -> {60 59};
+    58 -> {59};
-    59 -> {66};
+    59 -> {60};
     60 -> {61};
     61 -> {62};
-    62 -> {63};
+    62 -> {64 63};
-    63 -> {64};
+    63 -> {71};
     64 -> {65};
     65 -> {66};
     66 -> {67};
@@ -228,70 +235,73 @@ digraph boundSmartcasts_kt {
     70 -> {71};
     71 -> {72};
     72 -> {73};
-    73 -> {75 74};
+    73 -> {74};
-    74 -> {83};
+    74 -> {75};
     75 -> {76};
     76 -> {77};
     77 -> {78};
-    78 -> {79};
+    78 -> {80 79};
-    79 -> {80};
+    79 -> {90};
     80 -> {81};
     81 -> {82};
     82 -> {83};
     83 -> {84};
     84 -> {85};
-
+    85 -> {86};
-    subgraph cluster_22 {
-        color=red
-        86 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_23 {
-            color=blue
-            87 [label="Enter block"];
-            88 [label="Const: Int(1)"];
-            89 [label="Variable declaration: lvar x: R|kotlin/Any|"];
-            90 [label="Access variable R|<local>/x|"];
-            91 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
-            92 [label="Access variable R|<local>/x|"];
-            93 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
-            94 [label="Access variable R|<local>/y|"];
-            95 [label="Assignment: R|<local>/x|"];
-            96 [label="Access variable R|<local>/x|"];
-            97 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()"];
-            subgraph cluster_24 {
-                color=blue
-                98 [label="Enter when"];
-                subgraph cluster_25 {
-                    color=blue
-                    99 [label="Enter when branch condition "];
-                    100 [label="Access variable R|<local>/y|"];
-                    101 [label="Type operator: (R|<local>/y| is R|A|)"];
-                    102 [label="Exit when branch condition"];
-                }
-                103 [label="Synthetic else branch"];
-                104 [label="Enter when branch result"];
-                subgraph cluster_26 {
-                    color=blue
-                    105 [label="Enter block"];
-                    106 [label="Access variable R|<local>/x|"];
-                    107 [label="Function call: R|<local>/x|.R|/A.foo|()"];
-                    108 [label="Access variable R|<local>/y|"];
-                    109 [label="Function call: R|<local>/y|.R|/A.foo|()"];
-                    110 [label="Exit block"];
-                }
-                111 [label="Exit when branch result"];
-                112 [label="Exit when"];
-            }
-            113 [label="Exit block"];
-        }
-        114 [label="Exit function test_4" style="filled" fillcolor=red];
-    }
     86 -> {87};
     87 -> {88};
     88 -> {89};
     89 -> {90};
     90 -> {91};
     91 -> {92};
-    92 -> {93};
+
+    subgraph cluster_22 {
+        color=red
+        93 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_23 {
+            color=blue
+            94 [label="Enter block"];
+            95 [label="Const: Int(1)"];
+            96 [label="Variable declaration: lvar x: R|kotlin/Any|"];
+            97 [label="Access variable R|<local>/x|"];
+            98 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
+            99 [label="Access variable R|<local>/x|"];
+            100 [label="Smart cast: R|<local>/x|"];
+            101 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+            102 [label="Access variable R|<local>/y|"];
+            103 [label="Assignment: R|<local>/x|"];
+            104 [label="Access variable R|<local>/x|"];
+            105 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()"];
+            subgraph cluster_24 {
+                color=blue
+                106 [label="Enter when"];
+                subgraph cluster_25 {
+                    color=blue
+                    107 [label="Enter when branch condition "];
+                    108 [label="Access variable R|<local>/y|"];
+                    109 [label="Type operator: (R|<local>/y| is R|A|)"];
+                    110 [label="Exit when branch condition"];
+                }
+                111 [label="Synthetic else branch"];
+                112 [label="Enter when branch result"];
+                subgraph cluster_26 {
+                    color=blue
+                    113 [label="Enter block"];
+                    114 [label="Access variable R|<local>/x|"];
+                    115 [label="Smart cast: R|<local>/x|"];
+                    116 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+                    117 [label="Access variable R|<local>/y|"];
+                    118 [label="Smart cast: R|<local>/y|"];
+                    119 [label="Function call: R|<local>/y|.R|/A.foo|()"];
+                    120 [label="Exit block"];
+                }
+                121 [label="Exit when branch result"];
+                122 [label="Exit when"];
+            }
+            123 [label="Exit block"];
+        }
+        124 [label="Exit function test_4" style="filled" fillcolor=red];
+    }
     93 -> {94};
     94 -> {95};
     95 -> {96};
@@ -301,137 +311,116 @@ digraph boundSmartcasts_kt {
     99 -> {100};
     100 -> {101};
     101 -> {102};
-    102 -> {104 103};
+    102 -> {103};
-    103 -> {112};
+    103 -> {104};
     104 -> {105};
     105 -> {106};
     106 -> {107};
     107 -> {108};
     108 -> {109};
     109 -> {110};
-    110 -> {111};
+    110 -> {112 111};
-    111 -> {112};
+    111 -> {122};
     112 -> {113};
     113 -> {114};
+    114 -> {115};
+    115 -> {116};
+    116 -> {117};
+    117 -> {118};
+    118 -> {119};
+    119 -> {120};
+    120 -> {121};
+    121 -> {122};
+    122 -> {123};
+    123 -> {124};
 
     subgraph cluster_27 {
         color=red
-        115 [label="Enter function <init>" style="filled" fillcolor=red];
+        125 [label="Enter function <init>" style="filled" fillcolor=red];
-        116 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        126 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        117 [label="Exit function <init>" style="filled" fillcolor=red];
+        127 [label="Exit function <init>" style="filled" fillcolor=red];
     }
-    115 -> {116};
-    116 -> {117};
-
-    subgraph cluster_28 {
-        color=red
-        118 [label="Enter property" style="filled" fillcolor=red];
-        119 [label="Access variable R|<local>/any|"];
-        120 [label="Exit property" style="filled" fillcolor=red];
-    }
-    118 -> {119};
-    119 -> {120};
-    120 -> {123} [color=green];
-
-    subgraph cluster_29 {
-        color=red
-        121 [label="Enter class D" style="filled" fillcolor=red];
-        122 [label="Part of class initialization"];
-        123 [label="Exit class D" style="filled" fillcolor=red];
-    }
-    121 -> {122} [color=green];
-    122 -> {123} [style=dotted];
-    122 -> {118} [color=green];
-    122 -> {118} [style=dashed];
-
-    subgraph cluster_30 {
-        color=red
-        124 [label="Enter function baz" style="filled" fillcolor=red];
-        subgraph cluster_31 {
-            color=blue
-            125 [label="Enter block"];
-            126 [label="Exit block"];
-        }
-        127 [label="Exit function baz" style="filled" fillcolor=red];
-    }
-    124 -> {125};
     125 -> {126};
     126 -> {127};
 
-    subgraph cluster_32 {
+    subgraph cluster_28 {
         color=red
-        128 [label="Enter function test_5" style="filled" fillcolor=red];
+        128 [label="Enter property" style="filled" fillcolor=red];
-        subgraph cluster_33 {
+        129 [label="Access variable R|<local>/any|"];
-            color=blue
+        130 [label="Exit property" style="filled" fillcolor=red];
-            129 [label="Enter block"];
-            130 [label="Access variable R|<local>/d|"];
-            131 [label="Access variable R|/D.any|"];
-            132 [label="Exit lhs of ?:"];
-            133 [label="Enter rhs of ?:"];
-            134 [label="Jump: ^test_5 Unit"];
-            135 [label="Stub" style="filled" fillcolor=gray];
-            136 [label="Lhs of ?: is not null"];
-            137 [label="Exit ?:"];
-            138 [label="Variable declaration: lval a: R|kotlin/Any|"];
-            139 [label="Access variable R|<local>/a|"];
-            140 [label="Function call: R|<local>/a|.R|/baz|()"];
-            141 [label="Access variable R|<local>/d|"];
-            142 [label="Access variable R|/D.any|"];
-            143 [label="Function call: R|<local>/d|.R|/D.any|.R|/baz|()"];
-            144 [label="Access variable R|<local>/a|"];
-            145 [label="Type operator: (R|<local>/a| as R|A|)"];
-            146 [label="Access variable R|<local>/a|"];
-            147 [label="Function call: R|<local>/a|.R|/A.foo|()"];
-            148 [label="Exit block"];
-        }
-        149 [label="Exit function test_5" style="filled" fillcolor=red];
     }
     128 -> {129};
     129 -> {130};
-    130 -> {131};
+    130 -> {133} [color=green];
-    131 -> {132};
+
-    132 -> {136 133};
+    subgraph cluster_29 {
-    133 -> {134};
+        color=red
-    134 -> {149};
+        131 [label="Enter class D" style="filled" fillcolor=red];
-    134 -> {135} [style=dotted];
+        132 [label="Part of class initialization"];
-    135 -> {137} [style=dotted];
+        133 [label="Exit class D" style="filled" fillcolor=red];
+    }
+    131 -> {132} [color=green];
+    132 -> {133} [style=dotted];
+    132 -> {128} [color=green];
+    132 -> {128} [style=dashed];
+
+    subgraph cluster_30 {
+        color=red
+        134 [label="Enter function baz" style="filled" fillcolor=red];
+        subgraph cluster_31 {
+            color=blue
+            135 [label="Enter block"];
+            136 [label="Exit block"];
+        }
+        137 [label="Exit function baz" style="filled" fillcolor=red];
+    }
+    134 -> {135};
+    135 -> {136};
     136 -> {137};
-    137 -> {138};
+
+    subgraph cluster_32 {
+        color=red
+        138 [label="Enter function test_5" style="filled" fillcolor=red];
+        subgraph cluster_33 {
+            color=blue
+            139 [label="Enter block"];
+            140 [label="Access variable R|<local>/d|"];
+            141 [label="Access variable R|/D.any|"];
+            142 [label="Exit lhs of ?:"];
+            143 [label="Enter rhs of ?:"];
+            144 [label="Jump: ^test_5 Unit"];
+            145 [label="Stub" style="filled" fillcolor=gray];
+            146 [label="Lhs of ?: is not null"];
+            147 [label="Exit ?:"];
+            148 [label="Variable declaration: lval a: R|kotlin/Any|"];
+            149 [label="Access variable R|<local>/a|"];
+            150 [label="Function call: R|<local>/a|.R|/baz|()"];
+            151 [label="Access variable R|<local>/d|"];
+            152 [label="Access variable R|/D.any|"];
+            153 [label="Smart cast: R|<local>/d|.R|/D.any|"];
+            154 [label="Function call: R|<local>/d|.R|/D.any|.R|/baz|()"];
+            155 [label="Access variable R|<local>/a|"];
+            156 [label="Type operator: (R|<local>/a| as R|A|)"];
+            157 [label="Access variable R|<local>/a|"];
+            158 [label="Smart cast: R|<local>/a|"];
+            159 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            160 [label="Exit block"];
+        }
+        161 [label="Exit function test_5" style="filled" fillcolor=red];
+    }
     138 -> {139};
     139 -> {140};
     140 -> {141};
     141 -> {142};
-    142 -> {143};
+    142 -> {146 143};
     143 -> {144};
-    144 -> {145};
+    144 -> {161};
-    145 -> {146};
+    144 -> {145} [style=dotted];
+    145 -> {147} [style=dotted];
     146 -> {147};
     147 -> {148};
     148 -> {149};
-
+    149 -> {150};
-    subgraph cluster_34 {
-        color=red
-        150 [label="Enter function test_6" style="filled" fillcolor=red];
-        subgraph cluster_35 {
-            color=blue
-            151 [label="Enter block"];
-            152 [label="Access variable R|<local>/d1|"];
-            153 [label="Access variable R|/D.any|"];
-            154 [label="Variable declaration: lval a: R|kotlin/Any?|"];
-            155 [label="Access variable R|<local>/a|"];
-            156 [label="Type operator: (R|<local>/a| as R|A|)"];
-            157 [label="Access variable R|<local>/a|"];
-            158 [label="Function call: R|<local>/a|.R|/A.foo|()"];
-            159 [label="Access variable R|<local>/d1|"];
-            160 [label="Access variable R|/D.any|"];
-            161 [label="Function call: R|<local>/d1|.R|/D.any|.R|/A.foo|()"];
-            162 [label="Access variable R|<local>/d1|"];
-            163 [label="Access variable R|/D.any|"];
-            164 [label="Function call: R|<local>/d1|.R|/D.any|.R|/baz|()"];
-            165 [label="Exit block"];
-        }
-        166 [label="Exit function test_6" style="filled" fillcolor=red];
-    }
     150 -> {151};
     151 -> {152};
     152 -> {153};
@@ -443,60 +432,105 @@ digraph boundSmartcasts_kt {
     158 -> {159};
     159 -> {160};
     160 -> {161};
-    161 -> {162};
+
+    subgraph cluster_34 {
+        color=red
+        162 [label="Enter function test_6" style="filled" fillcolor=red];
+        subgraph cluster_35 {
+            color=blue
+            163 [label="Enter block"];
+            164 [label="Access variable R|<local>/d1|"];
+            165 [label="Access variable R|/D.any|"];
+            166 [label="Variable declaration: lval a: R|kotlin/Any?|"];
+            167 [label="Access variable R|<local>/a|"];
+            168 [label="Type operator: (R|<local>/a| as R|A|)"];
+            169 [label="Access variable R|<local>/a|"];
+            170 [label="Smart cast: R|<local>/a|"];
+            171 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            172 [label="Access variable R|<local>/d1|"];
+            173 [label="Access variable R|/D.any|"];
+            174 [label="Smart cast: R|<local>/d1|.R|/D.any|"];
+            175 [label="Function call: R|<local>/d1|.R|/D.any|.R|/A.foo|()"];
+            176 [label="Access variable R|<local>/d1|"];
+            177 [label="Access variable R|/D.any|"];
+            178 [label="Smart cast: R|<local>/d1|.R|/D.any|"];
+            179 [label="Function call: R|<local>/d1|.R|/D.any|.R|/baz|()"];
+            180 [label="Exit block"];
+        }
+        181 [label="Exit function test_6" style="filled" fillcolor=red];
+    }
     162 -> {163};
     163 -> {164};
     164 -> {165};
     165 -> {166};
-
+    166 -> {167};
-    subgraph cluster_36 {
-        color=red
-        167 [label="Enter function test_7" style="filled" fillcolor=red];
-        subgraph cluster_37 {
-            color=blue
-            168 [label="Enter block"];
-            169 [label="Access variable R|<local>/d1|"];
-            170 [label="Enter safe call"];
-            171 [label="Access variable R|/D.any|"];
-            172 [label="Exit safe call"];
-            173 [label="Variable declaration: lval a: R|kotlin/Any?|"];
-            174 [label="Access variable R|<local>/d2|"];
-            175 [label="Enter safe call"];
-            176 [label="Access variable R|/D.any|"];
-            177 [label="Exit safe call"];
-            178 [label="Variable declaration: lval b: R|kotlin/Any?|"];
-            179 [label="Access variable R|<local>/a|"];
-            180 [label="Type operator: (R|<local>/a| as R|A|)"];
-            181 [label="Access variable R|<local>/a|"];
-            182 [label="Function call: R|<local>/a|.R|/A.foo|()"];
-            183 [label="Access variable R|<local>/b|"];
-            184 [label="Type operator: (R|<local>/b| as R|B|)"];
-            185 [label="Access variable R|<local>/b|"];
-            186 [label="Function call: R|<local>/b|.R|/B.bar|()"];
-            187 [label="Exit block"];
-        }
-        188 [label="Exit function test_7" style="filled" fillcolor=red];
-    }
     167 -> {168};
     168 -> {169};
-    169 -> {170 172};
+    169 -> {170};
     170 -> {171};
     171 -> {172};
     172 -> {173};
     173 -> {174};
-    174 -> {175 177};
+    174 -> {175};
     175 -> {176};
     176 -> {177};
     177 -> {178};
     178 -> {179};
     179 -> {180};
     180 -> {181};
-    181 -> {182};
+
+    subgraph cluster_36 {
+        color=red
+        182 [label="Enter function test_7" style="filled" fillcolor=red];
+        subgraph cluster_37 {
+            color=blue
+            183 [label="Enter block"];
+            184 [label="Access variable R|<local>/d1|"];
+            185 [label="Enter safe call"];
+            186 [label="Access variable R|/D.any|"];
+            187 [label="Exit safe call"];
+            188 [label="Variable declaration: lval a: R|kotlin/Any?|"];
+            189 [label="Access variable R|<local>/d2|"];
+            190 [label="Enter safe call"];
+            191 [label="Access variable R|/D.any|"];
+            192 [label="Exit safe call"];
+            193 [label="Variable declaration: lval b: R|kotlin/Any?|"];
+            194 [label="Access variable R|<local>/a|"];
+            195 [label="Type operator: (R|<local>/a| as R|A|)"];
+            196 [label="Access variable R|<local>/a|"];
+            197 [label="Smart cast: R|<local>/a|"];
+            198 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            199 [label="Access variable R|<local>/b|"];
+            200 [label="Type operator: (R|<local>/b| as R|B|)"];
+            201 [label="Access variable R|<local>/b|"];
+            202 [label="Smart cast: R|<local>/b|"];
+            203 [label="Function call: R|<local>/b|.R|/B.bar|()"];
+            204 [label="Exit block"];
+        }
+        205 [label="Exit function test_7" style="filled" fillcolor=red];
+    }
     182 -> {183};
     183 -> {184};
-    184 -> {185};
+    184 -> {185 187};
     185 -> {186};
     186 -> {187};
     187 -> {188};
+    188 -> {189};
+    189 -> {190 192};
+    190 -> {191};
+    191 -> {192};
+    192 -> {193};
+    193 -> {194};
+    194 -> {195};
+    195 -> {196};
+    196 -> {197};
+    197 -> {198};
+    198 -> {199};
+    199 -> {200};
+    200 -> {201};
+    201 -> {202};
+    202 -> {203};
+    203 -> {204};
+    204 -> {205};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/functionCallBound.dot

@@ -109,13 +109,14 @@ digraph functionCallBound_kt {
                     color=blue
                     41 [label="Enter block"];
                     42 [label="Access variable R|<local>/base|"];
-                    43 [label="Access variable R|/Sub.data|"];
+                    43 [label="Smart cast: R|<local>/base|"];
-                    44 [label="Exit block"];
+                    44 [label="Access variable R|/Sub.data|"];
+                    45 [label="Exit block"];
                 }
-                45 [label="Exit when branch result"];
+                46 [label="Exit when branch result"];
-                46 [label="Exit when"];
+                47 [label="Exit when"];
             }
-            47 [label="Jump: ^check when () {
+            48 [label="Jump: ^check when () {
     ==((R|<local>/base| as? R|Sub|)?.{ $subj$.R|/isOk|() }, Boolean(true)) ->  {
         R|<local>/base|.R|/Sub.data|
     }
@@ -124,10 +125,10 @@ digraph functionCallBound_kt {
     }
 }
 "];
-            48 [label="Stub" style="filled" fillcolor=gray];
+            49 [label="Stub" style="filled" fillcolor=gray];
-            49 [label="Exit block" style="filled" fillcolor=gray];
+            50 [label="Exit block" style="filled" fillcolor=gray];
         }
-        50 [label="Exit function check" style="filled" fillcolor=red];
+        51 [label="Exit function check" style="filled" fillcolor=red];
     }
     21 -> {22};
     22 -> {23};
@@ -147,7 +148,7 @@ digraph functionCallBound_kt {
     36 -> {37};
     37 -> {38};
     38 -> {39};
-    39 -> {46};
+    39 -> {47};
     40 -> {41};
     41 -> {42};
     42 -> {43};
@@ -155,9 +156,10 @@ digraph functionCallBound_kt {
     44 -> {45};
     45 -> {46};
     46 -> {47};
-    47 -> {50};
+    47 -> {48};
-    47 -> {48} [style=dotted];
+    48 -> {51};
     48 -> {49} [style=dotted];
     49 -> {50} [style=dotted];
+    50 -> {51} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/casts.dot

@@ -12,10 +12,11 @@ digraph casts_kt {
             2 [label="Access variable R|<local>/x|"];
             3 [label="Type operator: (R|<local>/x| as R|kotlin/String|)"];
             4 [label="Access variable R|<local>/x|"];
-            5 [label="Access variable R|kotlin/String.length|"];
+            5 [label="Smart cast: R|<local>/x|"];
-            6 [label="Exit block"];
+            6 [label="Access variable R|kotlin/String.length|"];
+            7 [label="Exit block"];
         }
-        7 [label="Exit function test_1" style="filled" fillcolor=red];
+        8 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     0 -> {1};
     1 -> {2};
@@ -24,50 +25,52 @@ digraph casts_kt {
     4 -> {5};
     5 -> {6};
     6 -> {7};
+    7 -> {8};
 
     subgraph cluster_2 {
         color=red
-        8 [label="Enter function test_2" style="filled" fillcolor=red];
+        9 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_3 {
             color=blue
-            9 [label="Enter block"];
+            10 [label="Enter block"];
             subgraph cluster_4 {
                 color=blue
-                10 [label="Enter when"];
+                11 [label="Enter when"];
                 subgraph cluster_5 {
                     color=blue
-                    11 [label="Enter when branch condition "];
+                    12 [label="Enter when branch condition "];
-                    12 [label="Access variable R|<local>/x|"];
+                    13 [label="Access variable R|<local>/x|"];
-                    13 [label="Type operator: (R|<local>/x| as R|kotlin/Boolean|)"];
+                    14 [label="Type operator: (R|<local>/x| as R|kotlin/Boolean|)"];
-                    14 [label="Exit when branch condition"];
+                    15 [label="Exit when branch condition"];
                 }
-                15 [label="Synthetic else branch"];
+                16 [label="Synthetic else branch"];
-                16 [label="Enter when branch result"];
+                17 [label="Enter when branch result"];
                 subgraph cluster_6 {
                     color=blue
-                    17 [label="Enter block"];
+                    18 [label="Enter block"];
-                    18 [label="Access variable R|<local>/x|"];
+                    19 [label="Access variable R|<local>/x|"];
-                    19 [label="Function call: R|<local>/x|.R|kotlin/Boolean.not|()"];
+                    20 [label="Smart cast: R|<local>/x|"];
-                    20 [label="Exit block"];
+                    21 [label="Function call: R|<local>/x|.R|kotlin/Boolean.not|()"];
+                    22 [label="Exit block"];
                 }
-                21 [label="Exit when branch result"];
+                23 [label="Exit when branch result"];
-                22 [label="Exit when"];
+                24 [label="Exit when"];
             }
-            23 [label="Access variable R|<local>/x|"];
+            25 [label="Access variable R|<local>/x|"];
-            24 [label="Function call: R|<local>/x|.R|kotlin/Boolean.not|()"];
+            26 [label="Smart cast: R|<local>/x|"];
-            25 [label="Exit block"];
+            27 [label="Function call: R|<local>/x|.R|kotlin/Boolean.not|()"];
+            28 [label="Exit block"];
         }
-        26 [label="Exit function test_2" style="filled" fillcolor=red];
+        29 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    8 -> {9};
     9 -> {10};
     10 -> {11};
     11 -> {12};
     12 -> {13};
     13 -> {14};
-    14 -> {16 15};
+    14 -> {15};
-    15 -> {22};
+    15 -> {17 16};
-    16 -> {17};
+    16 -> {24};
     17 -> {18};
     18 -> {19};
     19 -> {20};
@@ -77,131 +80,133 @@ digraph casts_kt {
     23 -> {24};
     24 -> {25};
     25 -> {26};
+    26 -> {27};
+    27 -> {28};
+    28 -> {29};
 
     subgraph cluster_7 {
         color=red
-        27 [label="Enter function test_3" style="filled" fillcolor=red];
+        30 [label="Enter function test_3" style="filled" fillcolor=red];
         subgraph cluster_8 {
             color=blue
-            28 [label="Enter block"];
+            31 [label="Enter block"];
             subgraph cluster_9 {
                 color=blue
-                29 [label="Enter when"];
+                32 [label="Enter when"];
                 subgraph cluster_10 {
                     color=blue
-                    30 [label="Enter when branch condition "];
+                    33 [label="Enter when branch condition "];
                     subgraph cluster_11 {
                         color=blue
-                        31 [label="Enter &&"];
+                        34 [label="Enter &&"];
-                        32 [label="Access variable R|<local>/b|"];
+                        35 [label="Access variable R|<local>/b|"];
-                        33 [label="Exit left part of &&"];
+                        36 [label="Exit left part of &&"];
-                        34 [label="Enter right part of &&"];
+                        37 [label="Enter right part of &&"];
-                        35 [label="Access variable R|<local>/x|"];
+                        38 [label="Access variable R|<local>/x|"];
-                        36 [label="Type operator: (R|<local>/x| as R|kotlin/Boolean|)"];
+                        39 [label="Type operator: (R|<local>/x| as R|kotlin/Boolean|)"];
-                        37 [label="Exit &&"];
+                        40 [label="Exit &&"];
                     }
-                    38 [label="Exit when branch condition"];
+                    41 [label="Exit when branch condition"];
                 }
-                39 [label="Synthetic else branch"];
+                42 [label="Synthetic else branch"];
-                40 [label="Enter when branch result"];
+                43 [label="Enter when branch result"];
                 subgraph cluster_12 {
                     color=blue
-                    41 [label="Enter block"];
+                    44 [label="Enter block"];
-                    42 [label="Access variable R|<local>/x|"];
+                    45 [label="Access variable R|<local>/x|"];
-                    43 [label="Function call: R|<local>/x|.R|kotlin/Boolean.not|()"];
+                    46 [label="Smart cast: R|<local>/x|"];
-                    44 [label="Exit block"];
+                    47 [label="Function call: R|<local>/x|.R|kotlin/Boolean.not|()"];
+                    48 [label="Exit block"];
                 }
-                45 [label="Exit when branch result"];
+                49 [label="Exit when branch result"];
-                46 [label="Exit when"];
+                50 [label="Exit when"];
             }
-            47 [label="Access variable R|<local>/x|"];
+            51 [label="Access variable R|<local>/x|"];
-            48 [label="Function call: R|<local>/x|.<Unresolved name: not>#()"];
+            52 [label="Function call: R|<local>/x|.<Unresolved name: not>#()"];
             subgraph cluster_13 {
                 color=blue
-                49 [label="Enter when"];
+                53 [label="Enter when"];
                 subgraph cluster_14 {
                     color=blue
-                    50 [label="Enter when branch condition "];
+                    54 [label="Enter when branch condition "];
                     subgraph cluster_15 {
                         color=blue
-                        51 [label="Enter &&"];
+                        55 [label="Enter &&"];
-                        52 [label="Access variable R|<local>/b|"];
+                        56 [label="Access variable R|<local>/b|"];
-                        53 [label="Exit left part of &&"];
+                        57 [label="Exit left part of &&"];
-                        54 [label="Enter right part of &&"];
+                        58 [label="Enter right part of &&"];
-                        55 [label="Access variable R|<local>/x|"];
+                        59 [label="Access variable R|<local>/x|"];
-                        56 [label="Type operator: (R|<local>/x| as R|kotlin/Boolean|)"];
+                        60 [label="Type operator: (R|<local>/x| as R|kotlin/Boolean|)"];
-                        57 [label="Const: Boolean(true)"];
+                        61 [label="Const: Boolean(true)"];
-                        58 [label="Equality operator =="];
+                        62 [label="Equality operator =="];
-                        59 [label="Exit &&"];
+                        63 [label="Exit &&"];
                     }
-                    60 [label="Exit when branch condition"];
+                    64 [label="Exit when branch condition"];
                 }
-                61 [label="Synthetic else branch"];
+                65 [label="Synthetic else branch"];
-                62 [label="Enter when branch result"];
+                66 [label="Enter when branch result"];
                 subgraph cluster_16 {
                     color=blue
-                    63 [label="Enter block"];
+                    67 [label="Enter block"];
-                    64 [label="Access variable R|<local>/x|"];
+                    68 [label="Access variable R|<local>/x|"];
-                    65 [label="Function call: R|<local>/x|.R|kotlin/Boolean.not|()"];
+                    69 [label="Smart cast: R|<local>/x|"];
-                    66 [label="Exit block"];
+                    70 [label="Function call: R|<local>/x|.R|kotlin/Boolean.not|()"];
+                    71 [label="Exit block"];
                 }
-                67 [label="Exit when branch result"];
+                72 [label="Exit when branch result"];
-                68 [label="Exit when"];
+                73 [label="Exit when"];
             }
-            69 [label="Access variable R|<local>/x|"];
+            74 [label="Access variable R|<local>/x|"];
-            70 [label="Function call: R|<local>/x|.<Unresolved name: not>#()"];
+            75 [label="Function call: R|<local>/x|.<Unresolved name: not>#()"];
             subgraph cluster_17 {
                 color=blue
-                71 [label="Enter when"];
+                76 [label="Enter when"];
                 subgraph cluster_18 {
                     color=blue
-                    72 [label="Enter when branch condition "];
+                    77 [label="Enter when branch condition "];
                     subgraph cluster_19 {
                         color=blue
-                        73 [label="Enter ||"];
+                        78 [label="Enter ||"];
-                        74 [label="Access variable R|<local>/b|"];
+                        79 [label="Access variable R|<local>/b|"];
-                        75 [label="Exit left part of ||"];
+                        80 [label="Exit left part of ||"];
-                        76 [label="Enter right part of ||"];
+                        81 [label="Enter right part of ||"];
-                        77 [label="Access variable R|<local>/x|"];
+                        82 [label="Access variable R|<local>/x|"];
-                        78 [label="Type operator: (R|<local>/x| as R|kotlin/Boolean|)"];
+                        83 [label="Type operator: (R|<local>/x| as R|kotlin/Boolean|)"];
-                        79 [label="Exit ||"];
+                        84 [label="Exit ||"];
                     }
-                    80 [label="Exit when branch condition"];
+                    85 [label="Exit when branch condition"];
                 }
-                81 [label="Synthetic else branch"];
+                86 [label="Synthetic else branch"];
-                82 [label="Enter when branch result"];
+                87 [label="Enter when branch result"];
                 subgraph cluster_20 {
                     color=blue
-                    83 [label="Enter block"];
+                    88 [label="Enter block"];
-                    84 [label="Access variable R|<local>/x|"];
+                    89 [label="Access variable R|<local>/x|"];
-                    85 [label="Function call: R|<local>/x|.<Unresolved name: not>#()"];
+                    90 [label="Function call: R|<local>/x|.<Unresolved name: not>#()"];
-                    86 [label="Exit block"];
+                    91 [label="Exit block"];
                 }
-                87 [label="Exit when branch result"];
+                92 [label="Exit when branch result"];
-                88 [label="Exit when"];
+                93 [label="Exit when"];
             }
-            89 [label="Access variable R|<local>/x|"];
+            94 [label="Access variable R|<local>/x|"];
-            90 [label="Function call: R|<local>/x|.<Unresolved name: not>#()"];
+            95 [label="Function call: R|<local>/x|.<Unresolved name: not>#()"];
-            91 [label="Exit block"];
+            96 [label="Exit block"];
         }
-        92 [label="Exit function test_3" style="filled" fillcolor=red];
+        97 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    27 -> {28};
-    28 -> {29};
-    29 -> {30};
     30 -> {31};
     31 -> {32};
     32 -> {33};
-    33 -> {37 34};
+    33 -> {34};
     34 -> {35};
     35 -> {36};
-    36 -> {37};
+    36 -> {40 37};
     37 -> {38};
-    38 -> {40 39};
+    38 -> {39};
-    39 -> {46};
+    39 -> {40};
     40 -> {41};
-    41 -> {42};
+    41 -> {43 42};
-    42 -> {43};
+    42 -> {50};
     43 -> {44};
     44 -> {45};
     45 -> {46};
@@ -212,19 +217,19 @@ digraph casts_kt {
     50 -> {51};
     51 -> {52};
     52 -> {53};
-    53 -> {59 54};
+    53 -> {54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
-    57 -> {58};
+    57 -> {63 58};
     58 -> {59};
     59 -> {60};
-    60 -> {62 61};
+    60 -> {61};
-    61 -> {68};
+    61 -> {62};
     62 -> {63};
     63 -> {64};
-    64 -> {65};
+    64 -> {66 65};
-    65 -> {66};
+    65 -> {73};
     66 -> {67};
     67 -> {68};
     68 -> {69};
@@ -234,134 +239,136 @@ digraph casts_kt {
     72 -> {73};
     73 -> {74};
     74 -> {75};
-    75 -> {79 76};
+    75 -> {76};
     76 -> {77};
     77 -> {78};
     78 -> {79};
     79 -> {80};
-    80 -> {82 81};
+    80 -> {84 81};
-    81 -> {88};
+    81 -> {82};
     82 -> {83};
     83 -> {84};
     84 -> {85};
-    85 -> {86};
+    85 -> {87 86};
-    86 -> {87};
+    86 -> {93};
     87 -> {88};
     88 -> {89};
     89 -> {90};
     90 -> {91};
     91 -> {92};
-
+    92 -> {93};
-    subgraph cluster_21 {
-        color=red
-        93 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_22 {
-            color=blue
-            94 [label="Enter block"];
-            subgraph cluster_23 {
-                color=blue
-                95 [label="Enter when"];
-                subgraph cluster_24 {
-                    color=blue
-                    96 [label="Enter when branch condition "];
-                    97 [label="Access variable R|<local>/b|"];
-                    98 [label="Type operator: (R|<local>/b| as? R|kotlin/Boolean|)"];
-                    99 [label="Const: Null(null)"];
-                    100 [label="Equality operator !="];
-                    101 [label="Exit when branch condition"];
-                }
-                subgraph cluster_25 {
-                    color=blue
-                    102 [label="Enter when branch condition else"];
-                    103 [label="Exit when branch condition"];
-                }
-                104 [label="Enter when branch result"];
-                subgraph cluster_26 {
-                    color=blue
-                    105 [label="Enter block"];
-                    106 [label="Access variable R|<local>/b|"];
-                    107 [label="Function call: R|<local>/b|.<Unresolved name: not>#()"];
-                    108 [label="Exit block"];
-                }
-                109 [label="Exit when branch result"];
-                110 [label="Enter when branch result"];
-                subgraph cluster_27 {
-                    color=blue
-                    111 [label="Enter block"];
-                    112 [label="Access variable R|<local>/b|"];
-                    113 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
-                    114 [label="Exit block"];
-                }
-                115 [label="Exit when branch result"];
-                116 [label="Exit when"];
-            }
-            117 [label="Access variable R|<local>/b|"];
-            118 [label="Function call: R|<local>/b|.<Unresolved name: not>#()"];
-            subgraph cluster_28 {
-                color=blue
-                119 [label="Enter when"];
-                subgraph cluster_29 {
-                    color=blue
-                    120 [label="Enter when branch condition "];
-                    121 [label="Access variable R|<local>/b|"];
-                    122 [label="Type operator: (R|<local>/b| as? R|kotlin/Boolean|)"];
-                    123 [label="Const: Null(null)"];
-                    124 [label="Equality operator =="];
-                    125 [label="Exit when branch condition"];
-                }
-                subgraph cluster_30 {
-                    color=blue
-                    126 [label="Enter when branch condition else"];
-                    127 [label="Exit when branch condition"];
-                }
-                128 [label="Enter when branch result"];
-                subgraph cluster_31 {
-                    color=blue
-                    129 [label="Enter block"];
-                    130 [label="Access variable R|<local>/b|"];
-                    131 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
-                    132 [label="Exit block"];
-                }
-                133 [label="Exit when branch result"];
-                134 [label="Enter when branch result"];
-                subgraph cluster_32 {
-                    color=blue
-                    135 [label="Enter block"];
-                    136 [label="Access variable R|<local>/b|"];
-                    137 [label="Function call: R|<local>/b|.<Unresolved name: not>#()"];
-                    138 [label="Exit block"];
-                }
-                139 [label="Exit when branch result"];
-                140 [label="Exit when"];
-            }
-            141 [label="Access variable R|<local>/b|"];
-            142 [label="Function call: R|<local>/b|.<Unresolved name: not>#()"];
-            143 [label="Exit block"];
-        }
-        144 [label="Exit function test_4" style="filled" fillcolor=red];
-    }
     93 -> {94};
     94 -> {95};
     95 -> {96};
     96 -> {97};
-    97 -> {98};
+
+    subgraph cluster_21 {
+        color=red
+        98 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_22 {
+            color=blue
+            99 [label="Enter block"];
+            subgraph cluster_23 {
+                color=blue
+                100 [label="Enter when"];
+                subgraph cluster_24 {
+                    color=blue
+                    101 [label="Enter when branch condition "];
+                    102 [label="Access variable R|<local>/b|"];
+                    103 [label="Type operator: (R|<local>/b| as? R|kotlin/Boolean|)"];
+                    104 [label="Const: Null(null)"];
+                    105 [label="Equality operator !="];
+                    106 [label="Exit when branch condition"];
+                }
+                subgraph cluster_25 {
+                    color=blue
+                    107 [label="Enter when branch condition else"];
+                    108 [label="Exit when branch condition"];
+                }
+                109 [label="Enter when branch result"];
+                subgraph cluster_26 {
+                    color=blue
+                    110 [label="Enter block"];
+                    111 [label="Access variable R|<local>/b|"];
+                    112 [label="Function call: R|<local>/b|.<Unresolved name: not>#()"];
+                    113 [label="Exit block"];
+                }
+                114 [label="Exit when branch result"];
+                115 [label="Enter when branch result"];
+                subgraph cluster_27 {
+                    color=blue
+                    116 [label="Enter block"];
+                    117 [label="Access variable R|<local>/b|"];
+                    118 [label="Smart cast: R|<local>/b|"];
+                    119 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
+                    120 [label="Exit block"];
+                }
+                121 [label="Exit when branch result"];
+                122 [label="Exit when"];
+            }
+            123 [label="Access variable R|<local>/b|"];
+            124 [label="Function call: R|<local>/b|.<Unresolved name: not>#()"];
+            subgraph cluster_28 {
+                color=blue
+                125 [label="Enter when"];
+                subgraph cluster_29 {
+                    color=blue
+                    126 [label="Enter when branch condition "];
+                    127 [label="Access variable R|<local>/b|"];
+                    128 [label="Type operator: (R|<local>/b| as? R|kotlin/Boolean|)"];
+                    129 [label="Const: Null(null)"];
+                    130 [label="Equality operator =="];
+                    131 [label="Exit when branch condition"];
+                }
+                subgraph cluster_30 {
+                    color=blue
+                    132 [label="Enter when branch condition else"];
+                    133 [label="Exit when branch condition"];
+                }
+                134 [label="Enter when branch result"];
+                subgraph cluster_31 {
+                    color=blue
+                    135 [label="Enter block"];
+                    136 [label="Access variable R|<local>/b|"];
+                    137 [label="Smart cast: R|<local>/b|"];
+                    138 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
+                    139 [label="Exit block"];
+                }
+                140 [label="Exit when branch result"];
+                141 [label="Enter when branch result"];
+                subgraph cluster_32 {
+                    color=blue
+                    142 [label="Enter block"];
+                    143 [label="Access variable R|<local>/b|"];
+                    144 [label="Function call: R|<local>/b|.<Unresolved name: not>#()"];
+                    145 [label="Exit block"];
+                }
+                146 [label="Exit when branch result"];
+                147 [label="Exit when"];
+            }
+            148 [label="Access variable R|<local>/b|"];
+            149 [label="Function call: R|<local>/b|.<Unresolved name: not>#()"];
+            150 [label="Exit block"];
+        }
+        151 [label="Exit function test_4" style="filled" fillcolor=red];
+    }
     98 -> {99};
     99 -> {100};
     100 -> {101};
-    101 -> {110 102};
+    101 -> {102};
     102 -> {103};
     103 -> {104};
     104 -> {105};
     105 -> {106};
-    106 -> {107};
+    106 -> {115 107};
     107 -> {108};
     108 -> {109};
-    109 -> {116};
+    109 -> {110};
     110 -> {111};
     111 -> {112};
     112 -> {113};
     113 -> {114};
-    114 -> {115};
+    114 -> {122};
     115 -> {116};
     116 -> {117};
     117 -> {118};
@@ -372,24 +379,31 @@ digraph casts_kt {
     122 -> {123};
     123 -> {124};
     124 -> {125};
-    125 -> {134 126};
+    125 -> {126};
     126 -> {127};
     127 -> {128};
     128 -> {129};
     129 -> {130};
     130 -> {131};
-    131 -> {132};
+    131 -> {141 132};
     132 -> {133};
-    133 -> {140};
+    133 -> {134};
     134 -> {135};
     135 -> {136};
     136 -> {137};
     137 -> {138};
     138 -> {139};
     139 -> {140};
-    140 -> {141};
+    140 -> {147};
     141 -> {142};
     142 -> {143};
     143 -> {144};
+    144 -> {145};
+    145 -> {146};
+    146 -> {147};
+    147 -> {148};
+    148 -> {149};
+    149 -> {150};
+    150 -> {151};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/elvis.dot

@@ -47,15 +47,16 @@ digraph elvis_kt {
                     color=blue
                     21 [label="Enter block"];
                     22 [label="Access variable R|<local>/x|"];
-                    23 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+                    23 [label="Smart cast: R|<local>/x|"];
-                    24 [label="Exit block"];
+                    24 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+                    25 [label="Exit block"];
                 }
-                25 [label="Exit when branch result"];
+                26 [label="Exit when branch result"];
-                26 [label="Exit when"];
+                27 [label="Exit when"];
             }
-            27 [label="Exit block"];
+            28 [label="Exit block"];
         }
-        28 [label="Exit function test_1" style="filled" fillcolor=red];
+        29 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     4 -> {5};
     5 -> {6};
@@ -69,13 +70,13 @@ digraph elvis_kt {
     11 -> {12};
     12 -> {16 13};
     13 -> {14};
-    14 -> {28};
+    14 -> {29};
     14 -> {15} [style=dotted];
     15 -> {17} [style=dotted];
     16 -> {17};
     17 -> {18};
     18 -> {20 19};
-    19 -> {26};
+    19 -> {27};
     20 -> {21};
     21 -> {22};
     22 -> {23};
@@ -84,112 +85,117 @@ digraph elvis_kt {
     25 -> {26};
     26 -> {27};
     27 -> {28};
+    28 -> {29};
 
     subgraph cluster_7 {
         color=red
-        29 [label="Enter function test2" style="filled" fillcolor=red];
+        30 [label="Enter function test2" style="filled" fillcolor=red];
         subgraph cluster_8 {
             color=blue
-            30 [label="Enter block"];
+            31 [label="Enter block"];
             subgraph cluster_9 {
                 color=blue
-                31 [label="Enter when"];
+                32 [label="Enter when"];
                 subgraph cluster_10 {
                     color=blue
-                    32 [label="Enter when branch condition "];
+                    33 [label="Enter when branch condition "];
-                    33 [label="Access variable R|<local>/b|"];
+                    34 [label="Access variable R|<local>/b|"];
-                    34 [label="Type operator: (R|<local>/b| !is R|kotlin/String|)"];
+                    35 [label="Type operator: (R|<local>/b| !is R|kotlin/String|)"];
-                    35 [label="Exit when branch condition"];
+                    36 [label="Exit when branch condition"];
                 }
-                36 [label="Synthetic else branch"];
+                37 [label="Synthetic else branch"];
-                37 [label="Enter when branch result"];
+                38 [label="Enter when branch result"];
                 subgraph cluster_11 {
                     color=blue
-                    38 [label="Enter block"];
+                    39 [label="Enter block"];
-                    39 [label="Const: String()"];
+                    40 [label="Const: String()"];
-                    40 [label="Jump: ^test2 String()"];
+                    41 [label="Jump: ^test2 String()"];
-                    41 [label="Stub" style="filled" fillcolor=gray];
+                    42 [label="Stub" style="filled" fillcolor=gray];
-                    42 [label="Exit block" style="filled" fillcolor=gray];
+                    43 [label="Exit block" style="filled" fillcolor=gray];
                 }
-                43 [label="Exit when branch result" style="filled" fillcolor=gray];
+                44 [label="Exit when branch result" style="filled" fillcolor=gray];
-                44 [label="Exit when"];
+                45 [label="Exit when"];
             }
             subgraph cluster_12 {
                 color=blue
-                45 [label="Enter when"];
+                46 [label="Enter when"];
                 subgraph cluster_13 {
                     color=blue
-                    46 [label="Enter when branch condition "];
+                    47 [label="Enter when branch condition "];
-                    47 [label="Access variable R|<local>/a|"];
+                    48 [label="Access variable R|<local>/a|"];
-                    48 [label="Type operator: (R|<local>/a| !is R|kotlin/String?|)"];
+                    49 [label="Type operator: (R|<local>/a| !is R|kotlin/String?|)"];
-                    49 [label="Exit when branch condition"];
+                    50 [label="Exit when branch condition"];
                 }
-                50 [label="Synthetic else branch"];
+                51 [label="Synthetic else branch"];
-                51 [label="Enter when branch result"];
+                52 [label="Enter when branch result"];
                 subgraph cluster_14 {
                     color=blue
-                    52 [label="Enter block"];
+                    53 [label="Enter block"];
-                    53 [label="Const: String()"];
+                    54 [label="Const: String()"];
-                    54 [label="Jump: ^test2 String()"];
+                    55 [label="Jump: ^test2 String()"];
-                    55 [label="Stub" style="filled" fillcolor=gray];
+                    56 [label="Stub" style="filled" fillcolor=gray];
-                    56 [label="Exit block" style="filled" fillcolor=gray];
+                    57 [label="Exit block" style="filled" fillcolor=gray];
                 }
-                57 [label="Exit when branch result" style="filled" fillcolor=gray];
+                58 [label="Exit when branch result" style="filled" fillcolor=gray];
-                58 [label="Exit when"];
+                59 [label="Exit when"];
             }
-            59 [label="Access variable R|<local>/a|"];
+            60 [label="Access variable R|<local>/a|"];
-            60 [label="Exit lhs of ?:"];
+            61 [label="Smart cast: R|<local>/a|"];
-            61 [label="Enter rhs of ?:"];
+            62 [label="Exit lhs of ?:"];
-            62 [label="Access variable R|<local>/b|"];
+            63 [label="Enter rhs of ?:"];
-            63 [label="Lhs of ?: is not null"];
+            64 [label="Access variable R|<local>/b|"];
-            64 [label="Exit ?:"];
+            65 [label="Smart cast: R|<local>/b|"];
-            65 [label="Jump: ^test2 R|<local>/a| ?: R|<local>/b|"];
+            66 [label="Lhs of ?: is not null"];
-            66 [label="Stub" style="filled" fillcolor=gray];
+            67 [label="Exit ?:"];
-            67 [label="Exit block" style="filled" fillcolor=gray];
+            68 [label="Jump: ^test2 R|<local>/a| ?: R|<local>/b|"];
+            69 [label="Stub" style="filled" fillcolor=gray];
+            70 [label="Exit block" style="filled" fillcolor=gray];
         }
-        68 [label="Exit function test2" style="filled" fillcolor=red];
+        71 [label="Exit function test2" style="filled" fillcolor=red];
     }
-    29 -> {30};
     30 -> {31};
     31 -> {32};
     32 -> {33};
     33 -> {34};
     34 -> {35};
-    35 -> {37 36};
+    35 -> {36};
-    36 -> {44};
+    36 -> {38 37};
-    37 -> {38};
+    37 -> {45};
     38 -> {39};
     39 -> {40};
-    40 -> {68};
+    40 -> {41};
-    40 -> {41} [style=dotted];
+    41 -> {71};
     41 -> {42} [style=dotted];
     42 -> {43} [style=dotted];
     43 -> {44} [style=dotted];
-    44 -> {45};
+    44 -> {45} [style=dotted];
     45 -> {46};
     46 -> {47};
     47 -> {48};
     48 -> {49};
-    49 -> {51 50};
+    49 -> {50};
-    50 -> {58};
+    50 -> {52 51};
-    51 -> {52};
+    51 -> {59};
     52 -> {53};
     53 -> {54};
-    54 -> {68};
+    54 -> {55};
-    54 -> {55} [style=dotted];
+    55 -> {71};
     55 -> {56} [style=dotted];
     56 -> {57} [style=dotted];
     57 -> {58} [style=dotted];
-    58 -> {59};
+    58 -> {59} [style=dotted];
     59 -> {60};
-    60 -> {63 61};
+    60 -> {61};
     61 -> {62};
-    62 -> {64};
+    62 -> {66 63};
     63 -> {64};
     64 -> {65};
-    65 -> {68};
+    65 -> {67};
-    65 -> {66} [style=dotted];
+    66 -> {67};
-    66 -> {67} [style=dotted];
+    67 -> {68};
-    67 -> {68} [style=dotted];
+    68 -> {71};
+    68 -> {69} [style=dotted];
+    69 -> {70} [style=dotted];
+    70 -> {71} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.dot

@@ -36,17 +36,18 @@ digraph returns_kt {
                     color=blue
                     14 [label="Enter block"];
                     15 [label="Access variable R|<local>/x|"];
-                    16 [label="Access variable R|kotlin/String.length|"];
+                    16 [label="Smart cast: R|<local>/x|"];
-                    17 [label="Exit block"];
+                    17 [label="Access variable R|kotlin/String.length|"];
+                    18 [label="Exit block"];
                 }
-                18 [label="Exit when branch result"];
+                19 [label="Exit when branch result"];
-                19 [label="Exit when"];
+                20 [label="Exit when"];
             }
-            20 [label="Access variable R|<local>/x|"];
+            21 [label="Access variable R|<local>/x|"];
-            21 [label="Access variable <Unresolved name: length>#"];
+            22 [label="Access variable <Unresolved name: length>#"];
-            22 [label="Exit block"];
+            23 [label="Exit block"];
         }
-        23 [label="Exit function test_0" style="filled" fillcolor=red];
+        24 [label="Exit function test_0" style="filled" fillcolor=red];
     }
     0 -> {1};
     1 -> {2};
@@ -60,7 +61,7 @@ digraph returns_kt {
     9 -> {10};
     10 -> {11};
     11 -> {12};
-    12 -> {19};
+    12 -> {20};
     13 -> {14};
     14 -> {15};
     15 -> {16};
@@ -71,71 +72,73 @@ digraph returns_kt {
     20 -> {21};
     21 -> {22};
     22 -> {23};
+    23 -> {24};
 
     subgraph cluster_7 {
         color=red
-        24 [label="Enter function test_1" style="filled" fillcolor=red];
+        25 [label="Enter function test_1" style="filled" fillcolor=red];
         subgraph cluster_8 {
             color=blue
-            25 [label="Enter block"];
+            26 [label="Enter block"];
             subgraph cluster_9 {
                 color=blue
-                26 [label="Enter when"];
+                27 [label="Enter when"];
                 subgraph cluster_10 {
                     color=blue
-                    27 [label="Enter when branch condition "];
+                    28 [label="Enter when branch condition "];
-                    28 [label="Access variable R|<local>/x|"];
+                    29 [label="Access variable R|<local>/x|"];
-                    29 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+                    30 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-                    30 [label="Exit when branch condition"];
+                    31 [label="Exit when branch condition"];
                 }
                 subgraph cluster_11 {
                     color=blue
-                    31 [label="Enter when branch condition else"];
+                    32 [label="Enter when branch condition else"];
-                    32 [label="Exit when branch condition"];
+                    33 [label="Exit when branch condition"];
                 }
-                33 [label="Enter when branch result"];
+                34 [label="Enter when branch result"];
                 subgraph cluster_12 {
                     color=blue
-                    34 [label="Enter block"];
+                    35 [label="Enter block"];
-                    35 [label="Jump: ^test_1 Unit"];
+                    36 [label="Jump: ^test_1 Unit"];
-                    36 [label="Stub" style="filled" fillcolor=gray];
+                    37 [label="Stub" style="filled" fillcolor=gray];
-                    37 [label="Exit block" style="filled" fillcolor=gray];
+                    38 [label="Exit block" style="filled" fillcolor=gray];
                 }
-                38 [label="Exit when branch result" style="filled" fillcolor=gray];
+                39 [label="Exit when branch result" style="filled" fillcolor=gray];
-                39 [label="Enter when branch result"];
+                40 [label="Enter when branch result"];
                 subgraph cluster_13 {
                     color=blue
-                    40 [label="Enter block"];
+                    41 [label="Enter block"];
-                    41 [label="Access variable R|<local>/x|"];
+                    42 [label="Access variable R|<local>/x|"];
-                    42 [label="Access variable R|kotlin/String.length|"];
+                    43 [label="Smart cast: R|<local>/x|"];
-                    43 [label="Exit block"];
+                    44 [label="Access variable R|kotlin/String.length|"];
+                    45 [label="Exit block"];
                 }
-                44 [label="Exit when branch result"];
+                46 [label="Exit when branch result"];
-                45 [label="Exit when"];
+                47 [label="Exit when"];
             }
-            46 [label="Access variable R|<local>/x|"];
+            48 [label="Access variable R|<local>/x|"];
-            47 [label="Access variable R|kotlin/String.length|"];
+            49 [label="Smart cast: R|<local>/x|"];
-            48 [label="Exit block"];
+            50 [label="Access variable R|kotlin/String.length|"];
+            51 [label="Exit block"];
         }
-        49 [label="Exit function test_1" style="filled" fillcolor=red];
+        52 [label="Exit function test_1" style="filled" fillcolor=red];
     }
-    24 -> {25};
     25 -> {26};
     26 -> {27};
     27 -> {28};
     28 -> {29};
     29 -> {30};
-    30 -> {39 31};
+    30 -> {31};
-    31 -> {32};
+    31 -> {40 32};
     32 -> {33};
     33 -> {34};
     34 -> {35};
-    35 -> {49};
+    35 -> {36};
-    35 -> {36} [style=dotted];
+    36 -> {52};
     36 -> {37} [style=dotted];
     37 -> {38} [style=dotted];
-    38 -> {45} [style=dotted];
+    38 -> {39} [style=dotted];
-    39 -> {40};
+    39 -> {47} [style=dotted];
     40 -> {41};
     41 -> {42};
     42 -> {43};
@@ -145,146 +148,151 @@ digraph returns_kt {
     46 -> {47};
     47 -> {48};
     48 -> {49};
+    49 -> {50};
+    50 -> {51};
+    51 -> {52};
 
     subgraph cluster_14 {
         color=red
-        50 [label="Enter function foo" style="filled" fillcolor=red];
+        53 [label="Enter function foo" style="filled" fillcolor=red];
-        51 [label="Exit function foo" style="filled" fillcolor=red];
+        54 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    50 -> {51};
+    53 -> {54};
 
     subgraph cluster_15 {
         color=red
-        52 [label="Enter class A" style="filled" fillcolor=red];
+        55 [label="Enter class A" style="filled" fillcolor=red];
-        53 [label="Exit class A" style="filled" fillcolor=red];
+        56 [label="Exit class A" style="filled" fillcolor=red];
     }
-    52 -> {53} [color=green];
+    55 -> {56} [color=green];
 
     subgraph cluster_16 {
         color=red
-        54 [label="Enter function bar" style="filled" fillcolor=red];
+        57 [label="Enter function bar" style="filled" fillcolor=red];
-        55 [label="Exit function bar" style="filled" fillcolor=red];
+        58 [label="Exit function bar" style="filled" fillcolor=red];
     }
-    54 -> {55};
+    57 -> {58};
 
     subgraph cluster_17 {
         color=red
-        56 [label="Enter class B" style="filled" fillcolor=red];
+        59 [label="Enter class B" style="filled" fillcolor=red];
-        57 [label="Exit class B" style="filled" fillcolor=red];
+        60 [label="Exit class B" style="filled" fillcolor=red];
     }
-    56 -> {57} [color=green];
+    59 -> {60} [color=green];
 
     subgraph cluster_18 {
         color=red
-        58 [label="Enter function baz" style="filled" fillcolor=red];
+        61 [label="Enter function baz" style="filled" fillcolor=red];
-        59 [label="Exit function baz" style="filled" fillcolor=red];
+        62 [label="Exit function baz" style="filled" fillcolor=red];
     }
-    58 -> {59};
+    61 -> {62};
 
     subgraph cluster_19 {
         color=red
-        60 [label="Enter class C" style="filled" fillcolor=red];
+        63 [label="Enter class C" style="filled" fillcolor=red];
-        61 [label="Exit class C" style="filled" fillcolor=red];
+        64 [label="Exit class C" style="filled" fillcolor=red];
     }
-    60 -> {61} [color=green];
+    63 -> {64} [color=green];
 
     subgraph cluster_20 {
         color=red
-        62 [label="Enter function test_2" style="filled" fillcolor=red];
+        65 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_21 {
             color=blue
-            63 [label="Enter block"];
+            66 [label="Enter block"];
             subgraph cluster_22 {
                 color=blue
-                64 [label="Enter when"];
+                67 [label="Enter when"];
                 subgraph cluster_23 {
                     color=blue
-                    65 [label="Enter when branch condition "];
+                    68 [label="Enter when branch condition "];
-                    66 [label="Access variable R|<local>/x|"];
+                    69 [label="Access variable R|<local>/x|"];
-                    67 [label="Type operator: (R|<local>/x| is R|B|)"];
+                    70 [label="Type operator: (R|<local>/x| is R|B|)"];
-                    68 [label="Exit when branch condition"];
+                    71 [label="Exit when branch condition"];
                 }
                 subgraph cluster_24 {
                     color=blue
-                    69 [label="Enter when branch condition "];
+                    72 [label="Enter when branch condition "];
-                    70 [label="Access variable R|<local>/x|"];
+                    73 [label="Access variable R|<local>/x|"];
-                    71 [label="Type operator: (R|<local>/x| is R|C|)"];
+                    74 [label="Type operator: (R|<local>/x| is R|C|)"];
-                    72 [label="Exit when branch condition"];
+                    75 [label="Exit when branch condition"];
                 }
                 subgraph cluster_25 {
                     color=blue
-                    73 [label="Enter when branch condition else"];
+                    76 [label="Enter when branch condition else"];
-                    74 [label="Exit when branch condition"];
+                    77 [label="Exit when branch condition"];
                 }
-                75 [label="Enter when branch result"];
+                78 [label="Enter when branch result"];
                 subgraph cluster_26 {
                     color=blue
-                    76 [label="Enter block"];
+                    79 [label="Enter block"];
-                    77 [label="Jump: ^test_2 Unit"];
+                    80 [label="Jump: ^test_2 Unit"];
-                    78 [label="Stub" style="filled" fillcolor=gray];
+                    81 [label="Stub" style="filled" fillcolor=gray];
-                    79 [label="Exit block" style="filled" fillcolor=gray];
+                    82 [label="Exit block" style="filled" fillcolor=gray];
                 }
-                80 [label="Exit when branch result" style="filled" fillcolor=gray];
+                83 [label="Exit when branch result" style="filled" fillcolor=gray];
-                81 [label="Enter when branch result"];
+                84 [label="Enter when branch result"];
                 subgraph cluster_27 {
                     color=blue
-                    82 [label="Enter block"];
+                    85 [label="Enter block"];
-                    83 [label="Access variable R|<local>/x|"];
+                    86 [label="Access variable R|<local>/x|"];
-                    84 [label="Function call: R|<local>/x|.R|/C.baz|()"];
+                    87 [label="Smart cast: R|<local>/x|"];
-                    85 [label="Exit block"];
+                    88 [label="Function call: R|<local>/x|.R|/C.baz|()"];
+                    89 [label="Exit block"];
                 }
-                86 [label="Exit when branch result"];
+                90 [label="Exit when branch result"];
-                87 [label="Enter when branch result"];
+                91 [label="Enter when branch result"];
                 subgraph cluster_28 {
                     color=blue
-                    88 [label="Enter block"];
+                    92 [label="Enter block"];
-                    89 [label="Access variable R|<local>/x|"];
+                    93 [label="Access variable R|<local>/x|"];
-                    90 [label="Function call: R|<local>/x|.R|/B.bar|()"];
+                    94 [label="Smart cast: R|<local>/x|"];
-                    91 [label="Exit block"];
+                    95 [label="Function call: R|<local>/x|.R|/B.bar|()"];
+                    96 [label="Exit block"];
                 }
-                92 [label="Exit when branch result"];
+                97 [label="Exit when branch result"];
-                93 [label="Exit when"];
+                98 [label="Exit when"];
             }
-            94 [label="Access variable R|<local>/x|"];
+            99 [label="Access variable R|<local>/x|"];
-            95 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+            100 [label="Smart cast: R|<local>/x|"];
-            96 [label="Access variable R|<local>/x|"];
+            101 [label="Function call: R|<local>/x|.R|/A.foo|()"];
-            97 [label="Function call: R|<local>/x|.<Unresolved name: bar>#()"];
+            102 [label="Access variable R|<local>/x|"];
-            98 [label="Access variable R|<local>/x|"];
+            103 [label="Smart cast: R|<local>/x|"];
-            99 [label="Function call: R|<local>/x|.<Unresolved name: baz>#()"];
+            104 [label="Function call: R|<local>/x|.<Unresolved name: bar>#()"];
-            100 [label="Exit block"];
+            105 [label="Access variable R|<local>/x|"];
+            106 [label="Smart cast: R|<local>/x|"];
+            107 [label="Function call: R|<local>/x|.<Unresolved name: baz>#()"];
+            108 [label="Exit block"];
         }
-        101 [label="Exit function test_2" style="filled" fillcolor=red];
+        109 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    62 -> {63};
-    63 -> {64};
-    64 -> {65};
     65 -> {66};
     66 -> {67};
     67 -> {68};
-    68 -> {87 69};
+    68 -> {69};
     69 -> {70};
     70 -> {71};
-    71 -> {72};
+    71 -> {91 72};
-    72 -> {81 73};
+    72 -> {73};
     73 -> {74};
     74 -> {75};
-    75 -> {76};
+    75 -> {84 76};
     76 -> {77};
-    77 -> {101};
+    77 -> {78};
-    77 -> {78} [style=dotted];
+    78 -> {79};
-    78 -> {79} [style=dotted];
+    79 -> {80};
-    79 -> {80} [style=dotted];
+    80 -> {109};
-    80 -> {93} [style=dotted];
+    80 -> {81} [style=dotted];
-    81 -> {82};
+    81 -> {82} [style=dotted];
-    82 -> {83};
+    82 -> {83} [style=dotted];
-    83 -> {84};
+    83 -> {98} [style=dotted];
     84 -> {85};
     85 -> {86};
-    86 -> {93};
+    86 -> {87};
     87 -> {88};
     88 -> {89};
     89 -> {90};
-    90 -> {91};
+    90 -> {98};
     91 -> {92};
     92 -> {93};
     93 -> {94};
@@ -295,203 +303,217 @@ digraph returns_kt {
     98 -> {99};
     99 -> {100};
     100 -> {101};
-
+    101 -> {102};
-    subgraph cluster_29 {
-        color=red
-        102 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_30 {
-            color=blue
-            103 [label="Enter block"];
-            subgraph cluster_31 {
-                color=blue
-                104 [label="Enter when"];
-                subgraph cluster_32 {
-                    color=blue
-                    105 [label="Enter when branch condition "];
-                    106 [label="Access variable R|<local>/x|"];
-                    107 [label="Type operator: (R|<local>/x| is R|B|)"];
-                    108 [label="Exit when branch condition"];
-                }
-                subgraph cluster_33 {
-                    color=blue
-                    109 [label="Enter when branch condition "];
-                    110 [label="Access variable R|<local>/x|"];
-                    111 [label="Type operator: (R|<local>/x| is R|C|)"];
-                    112 [label="Exit when branch condition"];
-                }
-                113 [label="Synthetic else branch"];
-                114 [label="Enter when branch result"];
-                subgraph cluster_34 {
-                    color=blue
-                    115 [label="Enter block"];
-                    116 [label="Access variable R|<local>/x|"];
-                    117 [label="Function call: R|<local>/x|.R|/C.baz|()"];
-                    118 [label="Exit block"];
-                }
-                119 [label="Exit when branch result"];
-                120 [label="Enter when branch result"];
-                subgraph cluster_35 {
-                    color=blue
-                    121 [label="Enter block"];
-                    122 [label="Access variable R|<local>/x|"];
-                    123 [label="Function call: R|<local>/x|.R|/B.bar|()"];
-                    124 [label="Exit block"];
-                }
-                125 [label="Exit when branch result"];
-                126 [label="Exit when"];
-            }
-            127 [label="Access variable R|<local>/x|"];
-            128 [label="Function call: R|<local>/x|.<Unresolved name: foo>#()"];
-            129 [label="Access variable R|<local>/x|"];
-            130 [label="Function call: R|<local>/x|.<Unresolved name: bar>#()"];
-            131 [label="Access variable R|<local>/x|"];
-            132 [label="Function call: R|<local>/x|.<Unresolved name: baz>#()"];
-            133 [label="Exit block"];
-        }
-        134 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
     102 -> {103};
     103 -> {104};
     104 -> {105};
     105 -> {106};
     106 -> {107};
     107 -> {108};
-    108 -> {120 109};
+    108 -> {109};
-    109 -> {110};
+
+    subgraph cluster_29 {
+        color=red
+        110 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_30 {
+            color=blue
+            111 [label="Enter block"];
+            subgraph cluster_31 {
+                color=blue
+                112 [label="Enter when"];
+                subgraph cluster_32 {
+                    color=blue
+                    113 [label="Enter when branch condition "];
+                    114 [label="Access variable R|<local>/x|"];
+                    115 [label="Type operator: (R|<local>/x| is R|B|)"];
+                    116 [label="Exit when branch condition"];
+                }
+                subgraph cluster_33 {
+                    color=blue
+                    117 [label="Enter when branch condition "];
+                    118 [label="Access variable R|<local>/x|"];
+                    119 [label="Type operator: (R|<local>/x| is R|C|)"];
+                    120 [label="Exit when branch condition"];
+                }
+                121 [label="Synthetic else branch"];
+                122 [label="Enter when branch result"];
+                subgraph cluster_34 {
+                    color=blue
+                    123 [label="Enter block"];
+                    124 [label="Access variable R|<local>/x|"];
+                    125 [label="Smart cast: R|<local>/x|"];
+                    126 [label="Function call: R|<local>/x|.R|/C.baz|()"];
+                    127 [label="Exit block"];
+                }
+                128 [label="Exit when branch result"];
+                129 [label="Enter when branch result"];
+                subgraph cluster_35 {
+                    color=blue
+                    130 [label="Enter block"];
+                    131 [label="Access variable R|<local>/x|"];
+                    132 [label="Smart cast: R|<local>/x|"];
+                    133 [label="Function call: R|<local>/x|.R|/B.bar|()"];
+                    134 [label="Exit block"];
+                }
+                135 [label="Exit when branch result"];
+                136 [label="Exit when"];
+            }
+            137 [label="Access variable R|<local>/x|"];
+            138 [label="Function call: R|<local>/x|.<Unresolved name: foo>#()"];
+            139 [label="Access variable R|<local>/x|"];
+            140 [label="Function call: R|<local>/x|.<Unresolved name: bar>#()"];
+            141 [label="Access variable R|<local>/x|"];
+            142 [label="Function call: R|<local>/x|.<Unresolved name: baz>#()"];
+            143 [label="Exit block"];
+        }
+        144 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
     110 -> {111};
     111 -> {112};
-    112 -> {114 113};
+    112 -> {113};
-    113 -> {126};
+    113 -> {114};
     114 -> {115};
     115 -> {116};
-    116 -> {117};
+    116 -> {129 117};
     117 -> {118};
     118 -> {119};
-    119 -> {126};
+    119 -> {120};
-    120 -> {121};
+    120 -> {122 121};
-    121 -> {122};
+    121 -> {136};
     122 -> {123};
     123 -> {124};
     124 -> {125};
     125 -> {126};
     126 -> {127};
     127 -> {128};
-    128 -> {129};
+    128 -> {136};
     129 -> {130};
     130 -> {131};
     131 -> {132};
     132 -> {133};
     133 -> {134};
-
+    134 -> {135};
-    subgraph cluster_36 {
-        color=red
-        135 [label="Enter function runHigherOrder" style="filled" fillcolor=red];
-        subgraph cluster_37 {
-            color=blue
-            136 [label="Enter block"];
-            137 [label="Function call: R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
-            138 [label="Jump: ^runHigherOrder R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
-            139 [label="Stub" style="filled" fillcolor=gray];
-            140 [label="Exit block" style="filled" fillcolor=gray];
-        }
-        141 [label="Exit function runHigherOrder" style="filled" fillcolor=red];
-    }
     135 -> {136};
     136 -> {137};
     137 -> {138};
-    138 -> {141};
+    138 -> {139};
-    138 -> {139} [style=dotted];
+    139 -> {140};
-    139 -> {140} [style=dotted];
+    140 -> {141};
-    140 -> {141} [style=dotted];
+    141 -> {142};
+    142 -> {143};
+    143 -> {144};
+
+    subgraph cluster_36 {
+        color=red
+        145 [label="Enter function runHigherOrder" style="filled" fillcolor=red];
+        subgraph cluster_37 {
+            color=blue
+            146 [label="Enter block"];
+            147 [label="Function call: R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
+            148 [label="Jump: ^runHigherOrder R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
+            149 [label="Stub" style="filled" fillcolor=gray];
+            150 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        151 [label="Exit function runHigherOrder" style="filled" fillcolor=red];
+    }
+    145 -> {146};
+    146 -> {147};
+    147 -> {148};
+    148 -> {151};
+    148 -> {149} [style=dotted];
+    149 -> {150} [style=dotted];
+    150 -> {151} [style=dotted];
 
     subgraph cluster_38 {
         color=red
-        142 [label="Enter function getter" style="filled" fillcolor=red];
+        152 [label="Enter function getter" style="filled" fillcolor=red];
         subgraph cluster_39 {
             color=blue
-            143 [label="Enter block"];
+            153 [label="Enter block"];
-            144 [label="Access variable R|kotlin/String.length|"];
+            154 [label="Access variable R|kotlin/String.length|"];
-            145 [label="Jump: ^ this@R|/ext|.R|kotlin/String.length|"];
+            155 [label="Jump: ^ this@R|/ext|.R|kotlin/String.length|"];
-            146 [label="Stub" style="filled" fillcolor=gray];
+            156 [label="Stub" style="filled" fillcolor=gray];
-            147 [label="Exit block" style="filled" fillcolor=gray];
+            157 [label="Exit block" style="filled" fillcolor=gray];
         }
-        148 [label="Exit function getter" style="filled" fillcolor=red];
+        158 [label="Exit function getter" style="filled" fillcolor=red];
     }
-    142 -> {143};
-    143 -> {144};
-    144 -> {145};
-    145 -> {148};
-    145 -> {146} [style=dotted];
-    146 -> {147} [style=dotted];
-    147 -> {148} [style=dotted];
-
-    subgraph cluster_40 {
-        color=red
-        149 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_41 {
-            color=blue
-            150 [label="Enter block"];
-            151 [label="Access variable R|<local>/a|"];
-            152 [label="Type operator: (R|<local>/a| as? R|kotlin/String|)"];
-            153 [label="Variable declaration: lval s: R|kotlin/String?|"];
-            154 [label="Access variable R|<local>/s|"];
-            155 [label="Enter safe call"];
-            156 [label="Access variable R|/ext|"];
-            157 [label="Exit safe call"];
-            158 [label="Exit lhs of ?:"];
-            159 [label="Enter rhs of ?:"];
-            160 [label="Jump: ^test_4 Unit"];
-            161 [label="Stub" style="filled" fillcolor=gray];
-            162 [label="Lhs of ?: is not null"];
-            163 [label="Exit ?:"];
-            164 [label="Variable declaration: lval length: R|kotlin/Int|"];
-            165 [label="Postponed enter to lambda"];
-            subgraph cluster_42 {
-                color=blue
-                170 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                subgraph cluster_43 {
-                    color=blue
-                    171 [label="Enter block"];
-                    172 [label="Access variable R|<local>/s|"];
-                    173 [label="Access variable R|kotlin/String.length|"];
-                    174 [label="Exit block"];
-                }
-                175 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-            }
-            166 [label="Postponed exit from lambda"];
-            167 [label="Function call: R|/runHigherOrder|<R|kotlin/Int|>(...)"];
-            168 [label="Exit block"];
-        }
-        169 [label="Exit function test_4" style="filled" fillcolor=red];
-    }
-    149 -> {150};
-    150 -> {151};
-    151 -> {152};
     152 -> {153};
     153 -> {154};
     154 -> {155};
-    154 -> {157} [color=red];
+    155 -> {158};
-    154 -> {159} [color=green];
+    155 -> {156} [style=dotted];
-    155 -> {156};
+    156 -> {157} [style=dotted];
-    156 -> {157};
+    157 -> {158} [style=dotted];
-    157 -> {158};
+
-    158 -> {162 159};
+    subgraph cluster_40 {
+        color=red
+        159 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_41 {
+            color=blue
+            160 [label="Enter block"];
+            161 [label="Access variable R|<local>/a|"];
+            162 [label="Type operator: (R|<local>/a| as? R|kotlin/String|)"];
+            163 [label="Variable declaration: lval s: R|kotlin/String?|"];
+            164 [label="Access variable R|<local>/s|"];
+            165 [label="Enter safe call"];
+            166 [label="Access variable R|/ext|"];
+            167 [label="Exit safe call"];
+            168 [label="Exit lhs of ?:"];
+            169 [label="Enter rhs of ?:"];
+            170 [label="Jump: ^test_4 Unit"];
+            171 [label="Stub" style="filled" fillcolor=gray];
+            172 [label="Lhs of ?: is not null"];
+            173 [label="Exit ?:"];
+            174 [label="Variable declaration: lval length: R|kotlin/Int|"];
+            175 [label="Postponed enter to lambda"];
+            subgraph cluster_42 {
+                color=blue
+                180 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_43 {
+                    color=blue
+                    181 [label="Enter block"];
+                    182 [label="Access variable R|<local>/s|"];
+                    183 [label="Smart cast: R|<local>/s|"];
+                    184 [label="Access variable R|kotlin/String.length|"];
+                    185 [label="Exit block"];
+                }
+                186 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            176 [label="Postponed exit from lambda"];
+            177 [label="Function call: R|/runHigherOrder|<R|kotlin/Int|>(...)"];
+            178 [label="Exit block"];
+        }
+        179 [label="Exit function test_4" style="filled" fillcolor=red];
+    }
     159 -> {160};
-    160 -> {169};
+    160 -> {161};
-    160 -> {161} [style=dotted];
+    161 -> {162};
-    161 -> {163} [style=dotted];
     162 -> {163};
     163 -> {164};
     164 -> {165};
-    165 -> {166 170};
+    164 -> {167} [color=red];
-    165 -> {170} [style=dashed];
+    164 -> {169} [color=green];
+    165 -> {166};
     166 -> {167};
     167 -> {168};
-    168 -> {169};
+    168 -> {172 169};
-    170 -> {171};
+    169 -> {170};
-    171 -> {172};
+    170 -> {179};
+    170 -> {171} [style=dotted];
+    171 -> {173} [style=dotted];
     172 -> {173};
     173 -> {174};
     174 -> {175};
+    175 -> {176 180};
+    175 -> {180} [style=dashed];
+    176 -> {177};
+    177 -> {178};
+    178 -> {179};
+    180 -> {181};
+    181 -> {182};
+    182 -> {183};
+    183 -> {184};
+    184 -> {185};
+    185 -> {186};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/simpleIf.dot

@@ -25,17 +25,18 @@ digraph simpleIf_kt {
                     color=blue
                     9 [label="Enter block"];
                     10 [label="Access variable R|<local>/x|"];
-                    11 [label="Access variable R|kotlin/String.length|"];
+                    11 [label="Smart cast: R|<local>/x|"];
-                    12 [label="Exit block"];
+                    12 [label="Access variable R|kotlin/String.length|"];
+                    13 [label="Exit block"];
                 }
-                13 [label="Exit when branch result"];
+                14 [label="Exit when branch result"];
-                14 [label="Exit when"];
+                15 [label="Exit when"];
             }
-            15 [label="Access variable R|<local>/x|"];
+            16 [label="Access variable R|<local>/x|"];
-            16 [label="Access variable <Unresolved name: length>#"];
+            17 [label="Access variable <Unresolved name: length>#"];
-            17 [label="Exit block"];
+            18 [label="Exit block"];
         }
-        18 [label="Exit function test_1" style="filled" fillcolor=red];
+        19 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     0 -> {1};
     1 -> {2};
@@ -44,7 +45,7 @@ digraph simpleIf_kt {
     4 -> {5};
     5 -> {6};
     6 -> {8 7};
-    7 -> {14};
+    7 -> {15};
     8 -> {9};
     9 -> {10};
     10 -> {11};
@@ -55,44 +56,45 @@ digraph simpleIf_kt {
     15 -> {16};
     16 -> {17};
     17 -> {18};
+    18 -> {19};
 
     subgraph cluster_5 {
         color=red
-        19 [label="Enter function test_2" style="filled" fillcolor=red];
+        20 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_6 {
             color=blue
-            20 [label="Enter block"];
+            21 [label="Enter block"];
-            21 [label="Access variable R|<local>/x|"];
+            22 [label="Access variable R|<local>/x|"];
-            22 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+            23 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-            23 [label="Variable declaration: lval b: R|kotlin/Boolean|"];
+            24 [label="Variable declaration: lval b: R|kotlin/Boolean|"];
             subgraph cluster_7 {
                 color=blue
-                24 [label="Enter when"];
+                25 [label="Enter when"];
                 subgraph cluster_8 {
                     color=blue
-                    25 [label="Enter when branch condition "];
+                    26 [label="Enter when branch condition "];
-                    26 [label="Access variable R|<local>/b|"];
+                    27 [label="Access variable R|<local>/b|"];
-                    27 [label="Exit when branch condition"];
+                    28 [label="Exit when branch condition"];
                 }
-                28 [label="Synthetic else branch"];
+                29 [label="Synthetic else branch"];
-                29 [label="Enter when branch result"];
+                30 [label="Enter when branch result"];
                 subgraph cluster_9 {
                     color=blue
-                    30 [label="Enter block"];
+                    31 [label="Enter block"];
-                    31 [label="Access variable R|<local>/x|"];
+                    32 [label="Access variable R|<local>/x|"];
-                    32 [label="Access variable R|kotlin/String.length|"];
+                    33 [label="Smart cast: R|<local>/x|"];
-                    33 [label="Exit block"];
+                    34 [label="Access variable R|kotlin/String.length|"];
+                    35 [label="Exit block"];
                 }
-                34 [label="Exit when branch result"];
+                36 [label="Exit when branch result"];
-                35 [label="Exit when"];
+                37 [label="Exit when"];
             }
-            36 [label="Access variable R|<local>/x|"];
+            38 [label="Access variable R|<local>/x|"];
-            37 [label="Access variable <Unresolved name: length>#"];
+            39 [label="Access variable <Unresolved name: length>#"];
-            38 [label="Exit block"];
+            40 [label="Exit block"];
         }
-        39 [label="Exit function test_2" style="filled" fillcolor=red];
+        41 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    19 -> {20};
     20 -> {21};
     21 -> {22};
     22 -> {23};
@@ -100,9 +102,9 @@ digraph simpleIf_kt {
     24 -> {25};
     25 -> {26};
     26 -> {27};
-    27 -> {29 28};
+    27 -> {28};
-    28 -> {35};
+    28 -> {30 29};
-    29 -> {30};
+    29 -> {37};
     30 -> {31};
     31 -> {32};
     32 -> {33};
@@ -112,96 +114,104 @@ digraph simpleIf_kt {
     36 -> {37};
     37 -> {38};
     38 -> {39};
+    39 -> {40};
+    40 -> {41};
 
     subgraph cluster_10 {
         color=red
-        40 [label="Enter function test_3" style="filled" fillcolor=red];
+        42 [label="Enter function test_3" style="filled" fillcolor=red];
         subgraph cluster_11 {
             color=blue
-            41 [label="Enter block"];
+            43 [label="Enter block"];
             subgraph cluster_12 {
                 color=blue
-                42 [label="Enter when"];
+                44 [label="Enter when"];
                 subgraph cluster_13 {
                     color=blue
-                    43 [label="Enter when branch condition "];
+                    45 [label="Enter when branch condition "];
-                    44 [label="Access variable R|<local>/x|"];
+                    46 [label="Access variable R|<local>/x|"];
-                    45 [label="Type operator: (R|<local>/x| !is R|kotlin/String|)"];
+                    47 [label="Type operator: (R|<local>/x| !is R|kotlin/String|)"];
-                    46 [label="Exit when branch condition"];
+                    48 [label="Exit when branch condition"];
                 }
                 subgraph cluster_14 {
                     color=blue
-                    47 [label="Enter when branch condition "];
+                    49 [label="Enter when branch condition "];
-                    48 [label="Access variable R|<local>/x|"];
+                    50 [label="Access variable R|<local>/x|"];
-                    49 [label="Type operator: (R|<local>/x| !is R|kotlin/Int|)"];
+                    51 [label="Smart cast: R|<local>/x|"];
-                    50 [label="Exit when branch condition"];
+                    52 [label="Type operator: (R|<local>/x| !is R|kotlin/Int|)"];
+                    53 [label="Exit when branch condition"];
                 }
                 subgraph cluster_15 {
                     color=blue
-                    51 [label="Enter when branch condition else"];
+                    54 [label="Enter when branch condition else"];
-                    52 [label="Exit when branch condition"];
+                    55 [label="Exit when branch condition"];
                 }
-                53 [label="Enter when branch result"];
+                56 [label="Enter when branch result"];
                 subgraph cluster_16 {
                     color=blue
-                    54 [label="Enter block"];
+                    57 [label="Enter block"];
-                    55 [label="Access variable R|<local>/x|"];
+                    58 [label="Access variable R|<local>/x|"];
-                    56 [label="Access variable R|kotlin/String.length|"];
+                    59 [label="Smart cast: R|<local>/x|"];
-                    57 [label="Access variable R|<local>/x|"];
+                    60 [label="Access variable R|kotlin/String.length|"];
-                    58 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+                    61 [label="Access variable R|<local>/x|"];
-                    59 [label="Exit block"];
+                    62 [label="Smart cast: R|<local>/x|"];
+                    63 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+                    64 [label="Exit block"];
                 }
-                60 [label="Exit when branch result"];
+                65 [label="Exit when branch result"];
-                61 [label="Enter when branch result"];
+                66 [label="Enter when branch result"];
                 subgraph cluster_17 {
                     color=blue
-                    62 [label="Enter block"];
+                    67 [label="Enter block"];
-                    63 [label="Exit block"];
+                    68 [label="Exit block"];
                 }
-                64 [label="Exit when branch result"];
+                69 [label="Exit when branch result"];
-                65 [label="Enter when branch result"];
+                70 [label="Enter when branch result"];
                 subgraph cluster_18 {
                     color=blue
-                    66 [label="Enter block"];
+                    71 [label="Enter block"];
-                    67 [label="Exit block"];
+                    72 [label="Exit block"];
                 }
-                68 [label="Exit when branch result"];
+                73 [label="Exit when branch result"];
-                69 [label="Exit when"];
+                74 [label="Exit when"];
             }
-            70 [label="Exit block"];
+            75 [label="Exit block"];
         }
-        71 [label="Exit function test_3" style="filled" fillcolor=red];
+        76 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    40 -> {41};
-    41 -> {42};
     42 -> {43};
     43 -> {44};
     44 -> {45};
     45 -> {46};
-    46 -> {65 47};
+    46 -> {47};
     47 -> {48};
-    48 -> {49};
+    48 -> {70 49};
     49 -> {50};
-    50 -> {61 51};
+    50 -> {51};
     51 -> {52};
     52 -> {53};
-    53 -> {54};
+    53 -> {66 54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
     57 -> {58};
     58 -> {59};
     59 -> {60};
-    60 -> {69};
+    60 -> {61};
     61 -> {62};
     62 -> {63};
     63 -> {64};
-    64 -> {69};
+    64 -> {65};
-    65 -> {66};
+    65 -> {74};
     66 -> {67};
     67 -> {68};
     68 -> {69};
-    69 -> {70};
+    69 -> {74};
     70 -> {71};
+    71 -> {72};
+    72 -> {73};
+    73 -> {74};
+    74 -> {75};
+    75 -> {76};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/smartcastFromArgument.dot

@@ -67,15 +67,16 @@ digraph smartcastFromArgument_kt {
                     color=blue
                     27 [label="Enter block"];
                     28 [label="Access variable R|<local>/a|"];
-                    29 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+                    29 [label="Smart cast: R|<local>/a|"];
-                    30 [label="Exit block"];
+                    30 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+                    31 [label="Exit block"];
                 }
-                31 [label="Exit when branch result"];
+                32 [label="Exit when branch result"];
-                32 [label="Exit when"];
+                33 [label="Exit when"];
             }
-            33 [label="Exit block"];
+            34 [label="Exit block"];
         }
-        34 [label="Exit function test" style="filled" fillcolor=red];
+        35 [label="Exit function test" style="filled" fillcolor=red];
     }
     11 -> {12};
     12 -> {13};
@@ -85,14 +86,14 @@ digraph smartcastFromArgument_kt {
     16 -> {17};
     17 -> {21 18};
     18 -> {19};
-    19 -> {34};
+    19 -> {35};
     19 -> {20} [style=dotted];
     20 -> {22} [style=dotted];
     21 -> {22};
     22 -> {23};
     23 -> {24};
     24 -> {26 25};
-    25 -> {32};
+    25 -> {33};
     26 -> {27};
     27 -> {28};
     28 -> {29};
@@ -101,5 +102,6 @@ digraph smartcastFromArgument_kt {
     31 -> {32};
     32 -> {33};
     33 -> {34};
+    34 -> {35};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/whenSubjectExpression.dot

@@ -38,31 +38,32 @@ digraph whenSubjectExpression_kt {
                     color=blue
                     16 [label="Enter block"];
                     17 [label="Access variable R|<local>/x|"];
-                    18 [label="Function call: R|<local>/x|.R|kotlin/Double.toInt|()"];
+                    18 [label="Smart cast: R|<local>/x|"];
-                    19 [label="Exit block"];
+                    19 [label="Function call: R|<local>/x|.R|kotlin/Double.toInt|()"];
+                    20 [label="Exit block"];
                 }
-                20 [label="Exit when branch result"];
+                21 [label="Exit when branch result"];
-                21 [label="Enter when branch result"];
+                22 [label="Enter when branch result"];
                 subgraph cluster_7 {
                     color=blue
-                    22 [label="Enter block"];
+                    23 [label="Enter block"];
-                    23 [label="Const: Int(0)"];
+                    24 [label="Const: Int(0)"];
-                    24 [label="Exit block"];
+                    25 [label="Exit block"];
                 }
-                25 [label="Exit when branch result"];
+                26 [label="Exit when branch result"];
-                26 [label="Enter when branch result"];
+                27 [label="Enter when branch result"];
                 subgraph cluster_8 {
                     color=blue
-                    27 [label="Enter block"];
+                    28 [label="Enter block"];
-                    28 [label="Const: Int(-1)"];
+                    29 [label="Const: Int(-1)"];
-                    29 [label="Exit block"];
+                    30 [label="Exit block"];
                 }
-                30 [label="Exit when branch result"];
+                31 [label="Exit when branch result"];
-                31 [label="Exit when"];
+                32 [label="Exit when"];
             }
-            32 [label="Exit block"];
+            33 [label="Exit block"];
         }
-        33 [label="Exit function whenWithSubjectExpression" style="filled" fillcolor=red];
+        34 [label="Exit function whenWithSubjectExpression" style="filled" fillcolor=red];
     }
     0 -> {1};
     1 -> {2};
@@ -71,12 +72,12 @@ digraph whenSubjectExpression_kt {
     4 -> {5};
     5 -> {6};
     6 -> {7};
-    7 -> {26 8};
+    7 -> {27 8};
     8 -> {9};
     9 -> {10};
     10 -> {11};
     11 -> {12};
-    12 -> {21 13};
+    12 -> {22 13};
     13 -> {14};
     14 -> {15};
     15 -> {16};
@@ -84,83 +85,84 @@ digraph whenSubjectExpression_kt {
     17 -> {18};
     18 -> {19};
     19 -> {20};
-    20 -> {31};
+    20 -> {21};
-    21 -> {22};
+    21 -> {32};
     22 -> {23};
     23 -> {24};
     24 -> {25};
-    25 -> {31};
+    25 -> {26};
-    26 -> {27};
+    26 -> {32};
     27 -> {28};
     28 -> {29};
     29 -> {30};
     30 -> {31};
     31 -> {32};
     32 -> {33};
+    33 -> {34};
 
     subgraph cluster_9 {
         color=red
-        34 [label="Enter function whenWithSubjectVariable" style="filled" fillcolor=red];
+        35 [label="Enter function whenWithSubjectVariable" style="filled" fillcolor=red];
         subgraph cluster_10 {
             color=blue
-            35 [label="Enter block"];
+            36 [label="Enter block"];
             subgraph cluster_11 {
                 color=blue
-                36 [label="Enter when"];
+                37 [label="Enter when"];
-                37 [label="Access variable R|<local>/x|"];
+                38 [label="Access variable R|<local>/x|"];
-                38 [label="Variable declaration: lval y: R|kotlin/Any|"];
+                39 [label="Variable declaration: lval y: R|kotlin/Any|"];
                 subgraph cluster_12 {
                     color=blue
-                    39 [label="Enter when branch condition "];
+                    40 [label="Enter when branch condition "];
-                    40 [label="Exit $subj"];
+                    41 [label="Exit $subj"];
-                    41 [label="Type operator: ($subj$ !is R|kotlin/Double|)"];
+                    42 [label="Type operator: ($subj$ !is R|kotlin/Double|)"];
-                    42 [label="Exit when branch condition"];
+                    43 [label="Exit when branch condition"];
                 }
                 subgraph cluster_13 {
                     color=blue
-                    43 [label="Enter when branch condition "];
+                    44 [label="Enter when branch condition "];
-                    44 [label="Exit $subj"];
+                    45 [label="Exit $subj"];
-                    45 [label="Const: Double(0.0)"];
+                    46 [label="Const: Double(0.0)"];
-                    46 [label="Equality operator =="];
+                    47 [label="Equality operator =="];
-                    47 [label="Exit when branch condition"];
+                    48 [label="Exit when branch condition"];
                 }
                 subgraph cluster_14 {
                     color=blue
-                    48 [label="Enter when branch condition else"];
+                    49 [label="Enter when branch condition else"];
-                    49 [label="Exit when branch condition"];
+                    50 [label="Exit when branch condition"];
                 }
-                50 [label="Enter when branch result"];
+                51 [label="Enter when branch result"];
                 subgraph cluster_15 {
                     color=blue
-                    51 [label="Enter block"];
+                    52 [label="Enter block"];
-                    52 [label="Access variable R|<local>/y|"];
+                    53 [label="Access variable R|<local>/y|"];
-                    53 [label="Function call: R|<local>/y|.R|kotlin/Double.toInt|()"];
+                    54 [label="Smart cast: R|<local>/y|"];
-                    54 [label="Exit block"];
+                    55 [label="Function call: R|<local>/y|.R|kotlin/Double.toInt|()"];
+                    56 [label="Exit block"];
                 }
-                55 [label="Exit when branch result"];
+                57 [label="Exit when branch result"];
-                56 [label="Enter when branch result"];
+                58 [label="Enter when branch result"];
                 subgraph cluster_16 {
                     color=blue
-                    57 [label="Enter block"];
+                    59 [label="Enter block"];
-                    58 [label="Const: Int(0)"];
+                    60 [label="Const: Int(0)"];
-                    59 [label="Exit block"];
+                    61 [label="Exit block"];
                 }
-                60 [label="Exit when branch result"];
+                62 [label="Exit when branch result"];
-                61 [label="Enter when branch result"];
+                63 [label="Enter when branch result"];
                 subgraph cluster_17 {
                     color=blue
-                    62 [label="Enter block"];
+                    64 [label="Enter block"];
-                    63 [label="Const: Int(-1)"];
+                    65 [label="Const: Int(-1)"];
-                    64 [label="Exit block"];
+                    66 [label="Exit block"];
                 }
-                65 [label="Exit when branch result"];
+                67 [label="Exit when branch result"];
-                66 [label="Exit when"];
+                68 [label="Exit when"];
             }
-            67 [label="Exit block"];
+            69 [label="Exit block"];
         }
-        68 [label="Exit function whenWithSubjectVariable" style="filled" fillcolor=red];
+        70 [label="Exit function whenWithSubjectVariable" style="filled" fillcolor=red];
     }
-    34 -> {35};
     35 -> {36};
     36 -> {37};
     37 -> {38};
@@ -168,31 +170,33 @@ digraph whenSubjectExpression_kt {
     39 -> {40};
     40 -> {41};
     41 -> {42};
-    42 -> {61 43};
+    42 -> {43};
-    43 -> {44};
+    43 -> {63 44};
     44 -> {45};
     45 -> {46};
     46 -> {47};
-    47 -> {56 48};
+    47 -> {48};
-    48 -> {49};
+    48 -> {58 49};
     49 -> {50};
     50 -> {51};
     51 -> {52};
     52 -> {53};
     53 -> {54};
     54 -> {55};
-    55 -> {66};
+    55 -> {56};
     56 -> {57};
-    57 -> {58};
+    57 -> {68};
     58 -> {59};
     59 -> {60};
-    60 -> {66};
+    60 -> {61};
     61 -> {62};
-    62 -> {63};
+    62 -> {68};
     63 -> {64};
     64 -> {65};
     65 -> {66};
     66 -> {67};
     67 -> {68};
+    68 -> {69};
+    69 -> {70};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.dot

@@ -42,40 +42,42 @@ digraph equalsAndIdentity_kt {
                     15 [label="Access variable R|<local>/x|"];
                     16 [label="Function call: R|<local>/x|.R|/A.foo|()"];
                     17 [label="Access variable R|<local>/y|"];
-                    18 [label="Function call: R|<local>/y|.R|/A.foo|()"];
+                    18 [label="Smart cast: R|<local>/y|"];
-                    19 [label="Exit block"];
+                    19 [label="Function call: R|<local>/y|.R|/A.foo|()"];
+                    20 [label="Exit block"];
                 }
-                20 [label="Exit when branch result"];
+                21 [label="Exit when branch result"];
-                21 [label="Exit when"];
+                22 [label="Exit when"];
             }
             subgraph cluster_7 {
                 color=blue
-                22 [label="Enter when"];
+                23 [label="Enter when"];
                 subgraph cluster_8 {
                     color=blue
-                    23 [label="Enter when branch condition "];
+                    24 [label="Enter when branch condition "];
-                    24 [label="Access variable R|<local>/x|"];
+                    25 [label="Access variable R|<local>/x|"];
-                    25 [label="Access variable R|<local>/y|"];
+                    26 [label="Access variable R|<local>/y|"];
-                    26 [label="Equality operator ==="];
+                    27 [label="Equality operator ==="];
-                    27 [label="Exit when branch condition"];
+                    28 [label="Exit when branch condition"];
                 }
-                28 [label="Synthetic else branch"];
+                29 [label="Synthetic else branch"];
-                29 [label="Enter when branch result"];
+                30 [label="Enter when branch result"];
                 subgraph cluster_9 {
                     color=blue
-                    30 [label="Enter block"];
+                    31 [label="Enter block"];
-                    31 [label="Access variable R|<local>/x|"];
+                    32 [label="Access variable R|<local>/x|"];
-                    32 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+                    33 [label="Function call: R|<local>/x|.R|/A.foo|()"];
-                    33 [label="Access variable R|<local>/y|"];
+                    34 [label="Access variable R|<local>/y|"];
-                    34 [label="Function call: R|<local>/y|.R|/A.foo|()"];
+                    35 [label="Smart cast: R|<local>/y|"];
-                    35 [label="Exit block"];
+                    36 [label="Function call: R|<local>/y|.R|/A.foo|()"];
+                    37 [label="Exit block"];
                 }
-                36 [label="Exit when branch result"];
+                38 [label="Exit when branch result"];
-                37 [label="Exit when"];
+                39 [label="Exit when"];
             }
-            38 [label="Exit block"];
+            40 [label="Exit block"];
         }
-        39 [label="Exit function test_1" style="filled" fillcolor=red];
+        41 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     4 -> {5};
     5 -> {6};
@@ -85,7 +87,7 @@ digraph equalsAndIdentity_kt {
     9 -> {10};
     10 -> {11};
     11 -> {13 12};
-    12 -> {21};
+    12 -> {22};
     13 -> {14};
     14 -> {15};
     15 -> {16};
@@ -100,9 +102,9 @@ digraph equalsAndIdentity_kt {
     24 -> {25};
     25 -> {26};
     26 -> {27};
-    27 -> {29 28};
+    27 -> {28};
-    28 -> {37};
+    28 -> {30 29};
-    29 -> {30};
+    29 -> {39};
     30 -> {31};
     31 -> {32};
     32 -> {33};
@@ -112,78 +114,78 @@ digraph equalsAndIdentity_kt {
     36 -> {37};
     37 -> {38};
     38 -> {39};
+    39 -> {40};
+    40 -> {41};
 
     subgraph cluster_10 {
         color=red
-        40 [label="Enter function test_2" style="filled" fillcolor=red];
+        42 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_11 {
             color=blue
-            41 [label="Enter block"];
+            43 [label="Enter block"];
             subgraph cluster_12 {
                 color=blue
-                42 [label="Enter when"];
+                44 [label="Enter when"];
                 subgraph cluster_13 {
                     color=blue
-                    43 [label="Enter when branch condition "];
+                    45 [label="Enter when branch condition "];
-                    44 [label="Access variable R|<local>/x|"];
+                    46 [label="Access variable R|<local>/x|"];
-                    45 [label="Access variable R|<local>/y|"];
+                    47 [label="Access variable R|<local>/y|"];
-                    46 [label="Equality operator =="];
+                    48 [label="Equality operator =="];
-                    47 [label="Exit when branch condition"];
+                    49 [label="Exit when branch condition"];
                 }
-                48 [label="Synthetic else branch"];
+                50 [label="Synthetic else branch"];
-                49 [label="Enter when branch result"];
+                51 [label="Enter when branch result"];
                 subgraph cluster_14 {
                     color=blue
-                    50 [label="Enter block"];
+                    52 [label="Enter block"];
-                    51 [label="Access variable R|<local>/x|"];
+                    53 [label="Access variable R|<local>/x|"];
-                    52 [label="Function call: R|<local>/x|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
+                    54 [label="Function call: R|<local>/x|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
-                    53 [label="Access variable R|<local>/y|"];
+                    55 [label="Access variable R|<local>/y|"];
-                    54 [label="Function call: R|<local>/y|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
+                    56 [label="Function call: R|<local>/y|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
-                    55 [label="Exit block"];
+                    57 [label="Exit block"];
                 }
-                56 [label="Exit when branch result"];
+                58 [label="Exit when branch result"];
-                57 [label="Exit when"];
+                59 [label="Exit when"];
             }
             subgraph cluster_15 {
                 color=blue
-                58 [label="Enter when"];
+                60 [label="Enter when"];
                 subgraph cluster_16 {
                     color=blue
-                    59 [label="Enter when branch condition "];
+                    61 [label="Enter when branch condition "];
-                    60 [label="Access variable R|<local>/x|"];
+                    62 [label="Access variable R|<local>/x|"];
-                    61 [label="Access variable R|<local>/y|"];
+                    63 [label="Access variable R|<local>/y|"];
-                    62 [label="Equality operator ==="];
+                    64 [label="Equality operator ==="];
-                    63 [label="Exit when branch condition"];
+                    65 [label="Exit when branch condition"];
                 }
-                64 [label="Synthetic else branch"];
+                66 [label="Synthetic else branch"];
-                65 [label="Enter when branch result"];
+                67 [label="Enter when branch result"];
                 subgraph cluster_17 {
                     color=blue
-                    66 [label="Enter block"];
+                    68 [label="Enter block"];
-                    67 [label="Access variable R|<local>/x|"];
+                    69 [label="Access variable R|<local>/x|"];
-                    68 [label="Function call: R|<local>/x|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
+                    70 [label="Function call: R|<local>/x|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
-                    69 [label="Access variable R|<local>/y|"];
+                    71 [label="Access variable R|<local>/y|"];
-                    70 [label="Function call: R|<local>/y|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
+                    72 [label="Function call: R|<local>/y|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
-                    71 [label="Exit block"];
+                    73 [label="Exit block"];
                 }
-                72 [label="Exit when branch result"];
+                74 [label="Exit when branch result"];
-                73 [label="Exit when"];
+                75 [label="Exit when"];
             }
-            74 [label="Exit block"];
+            76 [label="Exit block"];
         }
-        75 [label="Exit function test_2" style="filled" fillcolor=red];
+        77 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    40 -> {41};
-    41 -> {42};
     42 -> {43};
     43 -> {44};
     44 -> {45};
     45 -> {46};
     46 -> {47};
-    47 -> {49 48};
+    47 -> {48};
-    48 -> {57};
+    48 -> {49};
-    49 -> {50};
+    49 -> {51 50};
-    50 -> {51};
+    50 -> {59};
     51 -> {52};
     52 -> {53};
     53 -> {54};
@@ -196,10 +198,10 @@ digraph equalsAndIdentity_kt {
     60 -> {61};
     61 -> {62};
     62 -> {63};
-    63 -> {65 64};
+    63 -> {64};
-    64 -> {73};
+    64 -> {65};
-    65 -> {66};
+    65 -> {67 66};
-    66 -> {67};
+    66 -> {75};
     67 -> {68};
     68 -> {69};
     69 -> {70};
@@ -208,117 +210,123 @@ digraph equalsAndIdentity_kt {
     72 -> {73};
     73 -> {74};
     74 -> {75};
+    75 -> {76};
+    76 -> {77};
 
     subgraph cluster_18 {
         color=red
-        76 [label="Enter function test_3" style="filled" fillcolor=red];
+        78 [label="Enter function test_3" style="filled" fillcolor=red];
         subgraph cluster_19 {
             color=blue
-            77 [label="Enter block"];
+            79 [label="Enter block"];
             subgraph cluster_20 {
                 color=blue
-                78 [label="Enter when"];
+                80 [label="Enter when"];
                 subgraph cluster_21 {
                     color=blue
-                    79 [label="Enter when branch condition "];
+                    81 [label="Enter when branch condition "];
-                    80 [label="Access variable R|<local>/y|"];
+                    82 [label="Access variable R|<local>/y|"];
-                    81 [label="Const: Null(null)"];
+                    83 [label="Const: Null(null)"];
-                    82 [label="Equality operator =="];
+                    84 [label="Equality operator =="];
-                    83 [label="Exit when branch condition"];
+                    85 [label="Exit when branch condition"];
                 }
-                84 [label="Synthetic else branch"];
+                86 [label="Synthetic else branch"];
-                85 [label="Enter when branch result"];
+                87 [label="Enter when branch result"];
                 subgraph cluster_22 {
                     color=blue
-                    86 [label="Enter block"];
+                    88 [label="Enter block"];
-                    87 [label="Jump: ^test_3 Unit"];
+                    89 [label="Jump: ^test_3 Unit"];
-                    88 [label="Stub" style="filled" fillcolor=gray];
+                    90 [label="Stub" style="filled" fillcolor=gray];
-                    89 [label="Exit block" style="filled" fillcolor=gray];
+                    91 [label="Exit block" style="filled" fillcolor=gray];
                 }
-                90 [label="Exit when branch result" style="filled" fillcolor=gray];
+                92 [label="Exit when branch result" style="filled" fillcolor=gray];
-                91 [label="Exit when"];
+                93 [label="Exit when"];
             }
             subgraph cluster_23 {
                 color=blue
-                92 [label="Enter when"];
+                94 [label="Enter when"];
                 subgraph cluster_24 {
                     color=blue
-                    93 [label="Enter when branch condition "];
+                    95 [label="Enter when branch condition "];
-                    94 [label="Access variable R|<local>/x|"];
+                    96 [label="Access variable R|<local>/x|"];
-                    95 [label="Access variable R|<local>/y|"];
+                    97 [label="Access variable R|<local>/y|"];
-                    96 [label="Equality operator =="];
+                    98 [label="Smart cast: R|<local>/y|"];
-                    97 [label="Exit when branch condition"];
+                    99 [label="Equality operator =="];
+                    100 [label="Exit when branch condition"];
                 }
-                98 [label="Synthetic else branch"];
+                101 [label="Synthetic else branch"];
-                99 [label="Enter when branch result"];
+                102 [label="Enter when branch result"];
                 subgraph cluster_25 {
                     color=blue
-                    100 [label="Enter block"];
+                    103 [label="Enter block"];
-                    101 [label="Access variable R|<local>/x|"];
+                    104 [label="Access variable R|<local>/x|"];
-                    102 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+                    105 [label="Smart cast: R|<local>/x|"];
-                    103 [label="Access variable R|<local>/y|"];
+                    106 [label="Function call: R|<local>/x|.R|/A.foo|()"];
-                    104 [label="Function call: R|<local>/y|.R|/A.foo|()"];
+                    107 [label="Access variable R|<local>/y|"];
-                    105 [label="Exit block"];
+                    108 [label="Smart cast: R|<local>/y|"];
+                    109 [label="Function call: R|<local>/y|.R|/A.foo|()"];
+                    110 [label="Exit block"];
                 }
-                106 [label="Exit when branch result"];
+                111 [label="Exit when branch result"];
-                107 [label="Exit when"];
+                112 [label="Exit when"];
             }
             subgraph cluster_26 {
                 color=blue
-                108 [label="Enter when"];
+                113 [label="Enter when"];
                 subgraph cluster_27 {
                     color=blue
-                    109 [label="Enter when branch condition "];
+                    114 [label="Enter when branch condition "];
-                    110 [label="Access variable R|<local>/x|"];
+                    115 [label="Access variable R|<local>/x|"];
-                    111 [label="Access variable R|<local>/y|"];
+                    116 [label="Access variable R|<local>/y|"];
-                    112 [label="Equality operator ==="];
+                    117 [label="Smart cast: R|<local>/y|"];
-                    113 [label="Exit when branch condition"];
+                    118 [label="Equality operator ==="];
+                    119 [label="Exit when branch condition"];
                 }
-                114 [label="Synthetic else branch"];
+                120 [label="Synthetic else branch"];
-                115 [label="Enter when branch result"];
+                121 [label="Enter when branch result"];
                 subgraph cluster_28 {
                     color=blue
-                    116 [label="Enter block"];
+                    122 [label="Enter block"];
-                    117 [label="Access variable R|<local>/x|"];
+                    123 [label="Access variable R|<local>/x|"];
-                    118 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+                    124 [label="Smart cast: R|<local>/x|"];
-                    119 [label="Access variable R|<local>/y|"];
+                    125 [label="Function call: R|<local>/x|.R|/A.foo|()"];
-                    120 [label="Function call: R|<local>/y|.R|/A.foo|()"];
+                    126 [label="Access variable R|<local>/y|"];
-                    121 [label="Exit block"];
+                    127 [label="Smart cast: R|<local>/y|"];
+                    128 [label="Function call: R|<local>/y|.R|/A.foo|()"];
+                    129 [label="Exit block"];
                 }
-                122 [label="Exit when branch result"];
+                130 [label="Exit when branch result"];
-                123 [label="Exit when"];
+                131 [label="Exit when"];
             }
-            124 [label="Exit block"];
+            132 [label="Exit block"];
         }
-        125 [label="Exit function test_3" style="filled" fillcolor=red];
+        133 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    76 -> {77};
-    77 -> {78};
     78 -> {79};
     79 -> {80};
     80 -> {81};
     81 -> {82};
     82 -> {83};
-    83 -> {85 84};
+    83 -> {84};
-    84 -> {91};
+    84 -> {85};
-    85 -> {86};
+    85 -> {87 86};
-    86 -> {87};
+    86 -> {93};
-    87 -> {125};
+    87 -> {88};
-    87 -> {88} [style=dotted];
+    88 -> {89};
-    88 -> {89} [style=dotted];
+    89 -> {133};
     89 -> {90} [style=dotted];
     90 -> {91} [style=dotted];
-    91 -> {92};
+    91 -> {92} [style=dotted];
-    92 -> {93};
+    92 -> {93} [style=dotted];
     93 -> {94};
     94 -> {95};
     95 -> {96};
     96 -> {97};
-    97 -> {99 98};
+    97 -> {98};
-    98 -> {107};
+    98 -> {99};
     99 -> {100};
-    100 -> {101};
+    100 -> {102 101};
-    101 -> {102};
+    101 -> {112};
     102 -> {103};
     103 -> {104};
     104 -> {105};
@@ -330,17 +338,25 @@ digraph equalsAndIdentity_kt {
     110 -> {111};
     111 -> {112};
     112 -> {113};
-    113 -> {115 114};
+    113 -> {114};
-    114 -> {123};
+    114 -> {115};
     115 -> {116};
     116 -> {117};
     117 -> {118};
     118 -> {119};
-    119 -> {120};
+    119 -> {121 120};
-    120 -> {121};
+    120 -> {131};
     121 -> {122};
     122 -> {123};
     123 -> {124};
     124 -> {125};
+    125 -> {126};
+    126 -> {127};
+    127 -> {128};
+    128 -> {129};
+    129 -> {130};
+    130 -> {131};
+    131 -> {132};
+    132 -> {133};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/incorrectSmartcastToNothing.dot

@@ -35,66 +35,68 @@ digraph incorrectSmartcastToNothing_kt {
                     color=blue
                     12 [label="Enter when branch condition "];
                     13 [label="Access variable R|<local>/cacheExtSetting|"];
-                    14 [label="Function call: R|<local>/cacheExtSetting|.R|kotlin/text/isBlank|()"];
+                    14 [label="Smart cast: R|<local>/cacheExtSetting|"];
-                    15 [label="Exit when branch condition"];
+                    15 [label="Function call: R|<local>/cacheExtSetting|.R|kotlin/text/isBlank|()"];
+                    16 [label="Exit when branch condition"];
                 }
                 subgraph cluster_6 {
                     color=blue
-                    16 [label="Enter when branch condition else"];
+                    17 [label="Enter when branch condition else"];
-                    17 [label="Exit when branch condition"];
+                    18 [label="Exit when branch condition"];
                 }
-                18 [label="Enter when branch result"];
+                19 [label="Enter when branch result"];
                 subgraph cluster_7 {
                     color=blue
-                    19 [label="Enter block"];
+                    20 [label="Enter block"];
-                    20 [label="Access variable R|<local>/cacheExtSetting|"];
+                    21 [label="Access variable R|<local>/cacheExtSetting|"];
-                    21 [label="Function call: R|java/io/File.File|(...)"];
+                    22 [label="Smart cast: R|<local>/cacheExtSetting|"];
-                    22 [label="Exit block"];
+                    23 [label="Function call: R|java/io/File.File|(...)"];
+                    24 [label="Exit block"];
                 }
-                23 [label="Exit when branch result"];
+                25 [label="Exit when branch result"];
-                24 [label="Enter when branch result"];
+                26 [label="Enter when branch result"];
                 subgraph cluster_8 {
                     color=blue
-                    25 [label="Enter block"];
+                    27 [label="Enter block"];
-                    26 [label="Const: Null(null)"];
+                    28 [label="Const: Null(null)"];
-                    27 [label="Exit block"];
+                    29 [label="Exit block"];
                 }
-                28 [label="Exit when branch result"];
+                30 [label="Exit when branch result"];
-                29 [label="Enter when branch result"];
+                31 [label="Enter when branch result"];
                 subgraph cluster_9 {
                     color=blue
-                    30 [label="Enter block"];
+                    32 [label="Enter block"];
-                    31 [label="Access variable R|/cache|"];
+                    33 [label="Access variable R|/cache|"];
-                    32 [label="Enter safe call"];
+                    34 [label="Enter safe call"];
-                    33 [label="Postponed enter to lambda"];
+                    35 [label="Postponed enter to lambda"];
                     subgraph cluster_10 {
                         color=blue
-                        45 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                        47 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                         subgraph cluster_11 {
                             color=blue
-                            46 [label="Enter block"];
+                            48 [label="Enter block"];
-                            47 [label="Access variable R|<local>/it|"];
+                            49 [label="Access variable R|<local>/it|"];
-                            48 [label="Const: String(main.kts.compiled.cache)"];
+                            50 [label="Const: String(main.kts.compiled.cache)"];
-                            49 [label="Function call: R|java/io/File.File|(...)"];
+                            51 [label="Function call: R|java/io/File.File|(...)"];
-                            50 [label="Exit block"];
+                            52 [label="Exit block"];
                         }
-                        51 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                        53 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
                     }
-                    34 [label="Postponed exit from lambda"];
+                    36 [label="Postponed exit from lambda"];
-                    35 [label="Function call: $subj$.R|kotlin/let|<R|java/io/File|, R|java/io/File|>(...)"];
+                    37 [label="Function call: $subj$.R|kotlin/let|<R|java/io/File|, R|java/io/File|>(...)"];
-                    36 [label="Exit safe call"];
+                    38 [label="Exit safe call"];
-                    37 [label="Exit block"];
+                    39 [label="Exit block"];
                 }
-                38 [label="Exit when branch result"];
+                40 [label="Exit when branch result"];
-                39 [label="Exit when"];
+                41 [label="Exit when"];
             }
-            40 [label="Variable declaration: lval cacheBaseDir: R|java/io/File?|"];
+            42 [label="Variable declaration: lval cacheBaseDir: R|java/io/File?|"];
-            41 [label="Exit block"];
+            43 [label="Exit block"];
         }
-        42 [label="Exit function test" style="filled" fillcolor=red];
+        44 [label="Exit function test" style="filled" fillcolor=red];
     }
-    43 [label="Merge postponed lambda exits"];
+    45 [label="Merge postponed lambda exits"];
-    44 [label="Merge postponed lambda exits"];
+    46 [label="Merge postponed lambda exits"];
     4 -> {5};
     5 -> {6};
     6 -> {7};
@@ -102,47 +104,49 @@ digraph incorrectSmartcastToNothing_kt {
     8 -> {9};
     9 -> {10};
     10 -> {11};
-    11 -> {29 12};
+    11 -> {31 12};
     12 -> {13};
     13 -> {14};
     14 -> {15};
-    15 -> {24 16};
+    15 -> {16};
-    16 -> {17};
+    16 -> {26 17};
     17 -> {18};
     18 -> {19};
     19 -> {20};
     20 -> {21};
     21 -> {22};
     22 -> {23};
-    23 -> {39};
+    23 -> {24};
     24 -> {25};
-    25 -> {26};
+    25 -> {41};
     26 -> {27};
     27 -> {28};
-    28 -> {39};
+    28 -> {29};
     29 -> {30};
-    30 -> {31};
+    30 -> {41};
-    31 -> {32 36};
+    31 -> {32};
     32 -> {33};
-    33 -> {45};
+    33 -> {34 38};
-    33 -> {34} [color=red];
-    33 -> {45} [style=dashed];
     34 -> {35};
-    35 -> {36};
+    35 -> {47};
-    36 -> {43 37};
+    35 -> {36} [color=red];
+    35 -> {47} [style=dashed];
+    36 -> {37};
     37 -> {38};
-    38 -> {39};
+    38 -> {45 39};
-    39 -> {44 40};
+    39 -> {40};
     40 -> {41};
-    41 -> {42};
+    41 -> {46 42};
-    43 -> {44} [color=red];
+    42 -> {43};
-    45 -> {46};
+    43 -> {44};
-    46 -> {47};
+    45 -> {46} [color=red];
     47 -> {48};
     48 -> {49};
     49 -> {50};
     50 -> {51};
-    51 -> {43} [color=red];
+    51 -> {52};
-    51 -> {34} [color=green];
+    52 -> {53};
+    53 -> {45} [color=red];
+    53 -> {36} [color=green];
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/inPlaceLambdas.dot

@@ -60,10 +60,11 @@ digraph inPlaceLambdas_kt {
                             color=blue
                             28 [label="Enter block"];
                             29 [label="Access variable R|<local>/x|"];
-                            30 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+                            30 [label="Smart cast: R|<local>/x|"];
-                            31 [label="Exit block"];
+                            31 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+                            32 [label="Exit block"];
                         }
-                        32 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                        33 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
                     }
                     19 [label="Call arguments union" style="filled" fillcolor=yellow];
                     20 [label="Postponed exit from lambda"];
@@ -102,136 +103,145 @@ digraph inPlaceLambdas_kt {
     29 -> {30};
     30 -> {31};
     31 -> {32};
-    32 -> {19} [color=red];
+    32 -> {33};
-    32 -> {20} [color=green];
+    33 -> {19} [color=red];
+    33 -> {20} [color=green];
 
     subgraph cluster_11 {
         color=red
-        33 [label="Enter function test_2" style="filled" fillcolor=red];
+        34 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_12 {
             color=blue
-            34 [label="Enter block"];
+            35 [label="Enter block"];
-            35 [label="Postponed enter to lambda"];
+            36 [label="Postponed enter to lambda"];
             subgraph cluster_13 {
                 color=blue
-                43 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                45 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_14 {
                     color=blue
-                    44 [label="Enter block"];
+                    46 [label="Enter block"];
-                    45 [label="Access variable R|<local>/x|"];
+                    47 [label="Access variable R|<local>/x|"];
-                    46 [label="Type operator: (R|<local>/x| as R|B|)"];
+                    48 [label="Type operator: (R|<local>/x| as R|B|)"];
-                    47 [label="Exit block"];
+                    49 [label="Exit block"];
                 }
-                48 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                50 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            36 [label="Call arguments union" style="filled" fillcolor=yellow];
+            37 [label="Call arguments union" style="filled" fillcolor=yellow];
-            37 [label="Postponed exit from lambda"];
+            38 [label="Postponed exit from lambda"];
-            38 [label="Function call: R|kotlin/run|<R|B|>(...)"];
+            39 [label="Function call: R|kotlin/run|<R|B|>(...)"];
-            39 [label="Access variable R|<local>/x|"];
+            40 [label="Access variable R|<local>/x|"];
-            40 [label="Function call: R|<local>/x|.R|/B.bar|()"];
+            41 [label="Smart cast: R|<local>/x|"];
-            41 [label="Exit block"];
+            42 [label="Function call: R|<local>/x|.R|/B.bar|()"];
+            43 [label="Exit block"];
         }
-        42 [label="Exit function test_2" style="filled" fillcolor=red];
+        44 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    33 -> {34};
     34 -> {35};
-    35 -> {43};
+    35 -> {36};
-    35 -> {37} [color=red];
+    36 -> {45};
-    35 -> {43} [style=dashed];
     36 -> {38} [color=red];
-    37 -> {38} [color=green];
+    36 -> {45} [style=dashed];
-    38 -> {39};
+    37 -> {39} [color=red];
+    38 -> {39} [color=green];
     39 -> {40};
     40 -> {41};
     41 -> {42};
+    42 -> {43};
     43 -> {44};
-    44 -> {45};
     45 -> {46};
     46 -> {47};
     47 -> {48};
-    48 -> {36} [color=red];
+    48 -> {49};
-    48 -> {37} [color=green];
+    49 -> {50};
+    50 -> {37} [color=red];
+    50 -> {38} [color=green];
 
     subgraph cluster_15 {
         color=red
-        49 [label="Enter function test_3" style="filled" fillcolor=red];
+        51 [label="Enter function test_3" style="filled" fillcolor=red];
         subgraph cluster_16 {
             color=blue
-            50 [label="Enter block"];
+            52 [label="Enter block"];
             subgraph cluster_17 {
                 color=blue
-                51 [label="Enter when"];
+                53 [label="Enter when"];
                 subgraph cluster_18 {
                     color=blue
-                    52 [label="Enter when branch condition "];
+                    54 [label="Enter when branch condition "];
-                    53 [label="Access variable R|<local>/x|"];
+                    55 [label="Access variable R|<local>/x|"];
-                    54 [label="Type operator: (R|<local>/x| is R|A|)"];
+                    56 [label="Type operator: (R|<local>/x| is R|A|)"];
-                    55 [label="Exit when branch condition"];
+                    57 [label="Exit when branch condition"];
                 }
-                56 [label="Synthetic else branch"];
+                58 [label="Synthetic else branch"];
-                57 [label="Enter when branch result"];
+                59 [label="Enter when branch result"];
                 subgraph cluster_19 {
                     color=blue
-                    58 [label="Enter block"];
+                    60 [label="Enter block"];
-                    59 [label="Postponed enter to lambda"];
+                    61 [label="Postponed enter to lambda"];
                     subgraph cluster_20 {
                         color=blue
-                        70 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                        73 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                         subgraph cluster_21 {
                             color=blue
-                            71 [label="Enter block"];
+                            74 [label="Enter block"];
-                            72 [label="Access variable R|<local>/x|"];
+                            75 [label="Access variable R|<local>/x|"];
-                            73 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+                            76 [label="Smart cast: R|<local>/x|"];
-                            74 [label="Access variable R|<local>/x|"];
+                            77 [label="Function call: R|<local>/x|.R|/A.foo|()"];
-                            75 [label="Type operator: (R|<local>/x| as R|B|)"];
+                            78 [label="Access variable R|<local>/x|"];
-                            76 [label="Exit block"];
+                            79 [label="Smart cast: R|<local>/x|"];
+                            80 [label="Type operator: (R|<local>/x| as R|B|)"];
+                            81 [label="Exit block"];
                         }
-                        77 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                        82 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
                     }
-                    60 [label="Call arguments union" style="filled" fillcolor=yellow];
+                    62 [label="Call arguments union" style="filled" fillcolor=yellow];
-                    61 [label="Postponed exit from lambda"];
+                    63 [label="Postponed exit from lambda"];
-                    62 [label="Function call: R|kotlin/run|<R|B|>(...)"];
+                    64 [label="Function call: R|kotlin/run|<R|B|>(...)"];
-                    63 [label="Access variable R|<local>/x|"];
+                    65 [label="Access variable R|<local>/x|"];
-                    64 [label="Function call: R|<local>/x|.R|/B.bar|()"];
+                    66 [label="Smart cast: R|<local>/x|"];
-                    65 [label="Exit block"];
+                    67 [label="Function call: R|<local>/x|.R|/B.bar|()"];
+                    68 [label="Exit block"];
                 }
-                66 [label="Exit when branch result"];
+                69 [label="Exit when branch result"];
-                67 [label="Exit when"];
+                70 [label="Exit when"];
             }
-            68 [label="Exit block"];
+            71 [label="Exit block"];
         }
-        69 [label="Exit function test_3" style="filled" fillcolor=red];
+        72 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    49 -> {50};
-    50 -> {51};
     51 -> {52};
     52 -> {53};
     53 -> {54};
     54 -> {55};
-    55 -> {57 56};
+    55 -> {56};
-    56 -> {67};
+    56 -> {57};
-    57 -> {58};
+    57 -> {59 58};
-    58 -> {59};
+    58 -> {70};
-    59 -> {70};
+    59 -> {60};
-    59 -> {61} [color=red];
+    60 -> {61};
-    59 -> {70} [style=dashed];
+    61 -> {73};
-    60 -> {62} [color=red];
+    61 -> {63} [color=red];
-    61 -> {62} [color=green];
+    61 -> {73} [style=dashed];
-    62 -> {63};
+    62 -> {64} [color=red];
-    63 -> {64};
+    63 -> {64} [color=green];
     64 -> {65};
     65 -> {66};
     66 -> {67};
     67 -> {68};
     68 -> {69};
+    69 -> {70};
     70 -> {71};
     71 -> {72};
-    72 -> {73};
     73 -> {74};
     74 -> {75};
     75 -> {76};
     76 -> {77};
-    77 -> {60} [color=red];
+    77 -> {78};
-    77 -> {61} [color=green];
+    78 -> {79};
+    79 -> {80};
+    80 -> {81};
+    81 -> {82};
+    82 -> {62} [color=red];
+    82 -> {63} [color=green];
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/lambdaInWhenBranch.dot

@@ -135,14 +135,14 @@ digraph lambdaInWhenBranch_kt {
                     48 [label="Postponed enter to lambda"];
                     subgraph cluster_18 {
                         color=blue
-                        82 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                        83 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                         subgraph cluster_19 {
                             color=blue
-                            83 [label="Enter block"];
+                            84 [label="Enter block"];
-                            84 [label="Access variable R|<local>/it|"];
+                            85 [label="Access variable R|<local>/it|"];
-                            85 [label="Exit block"];
+                            86 [label="Exit block"];
                         }
-                        86 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                        87 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
                     }
                     49 [label="Postponed exit from lambda"];
                     50 [label="Function call: String().R|kotlin/let|<R|kotlin/String|, R|kotlin/String|>(...)"];
@@ -184,18 +184,19 @@ digraph lambdaInWhenBranch_kt {
                     color=blue
                     72 [label="Enter block"];
                     73 [label="Access variable R|<local>/p|"];
-                    74 [label="Access variable R|/SubClass1.t|"];
+                    74 [label="Smart cast: R|<local>/p|"];
-                    75 [label="Exit block"];
+                    75 [label="Access variable R|/SubClass1.t|"];
+                    76 [label="Exit block"];
                 }
-                76 [label="Exit when branch result"];
+                77 [label="Exit when branch result"];
-                77 [label="Exit when"];
+                78 [label="Exit when"];
             }
-            78 [label="Access variable R|kotlin/String.length|"];
+            79 [label="Access variable R|kotlin/String.length|"];
-            79 [label="Exit block"];
+            80 [label="Exit block"];
         }
-        80 [label="Exit function foo" style="filled" fillcolor=red];
+        81 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    81 [label="Merge postponed lambda exits"];
+    82 [label="Merge postponed lambda exits"];
     28 -> {29};
     29 -> {30};
     30 -> {31};
@@ -216,14 +217,14 @@ digraph lambdaInWhenBranch_kt {
     45 -> {46};
     46 -> {47};
     47 -> {48};
-    48 -> {82};
+    48 -> {83};
     48 -> {49} [color=red];
-    48 -> {82} [style=dashed];
+    48 -> {83} [style=dashed];
     49 -> {50};
     50 -> {51};
     51 -> {52};
     52 -> {53};
-    53 -> {81 54};
+    53 -> {82 54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
@@ -240,7 +241,7 @@ digraph lambdaInWhenBranch_kt {
     67 -> {68};
     68 -> {69};
     69 -> {70};
-    70 -> {77};
+    70 -> {78};
     71 -> {72};
     72 -> {73};
     73 -> {74};
@@ -250,11 +251,12 @@ digraph lambdaInWhenBranch_kt {
     77 -> {78};
     78 -> {79};
     79 -> {80};
-    82 -> {83};
+    80 -> {81};
     83 -> {84};
     84 -> {85};
     85 -> {86};
-    86 -> {81} [color=red];
+    86 -> {87};
-    86 -> {49} [color=green];
+    87 -> {82} [color=red];
+    87 -> {49} [color=green];
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/dataFlowInfoFromWhileCondition.dot

@@ -65,16 +65,17 @@ digraph dataFlowInfoFromWhileCondition_kt {
                         color=blue
                         24 [label="Enter block"];
                         25 [label="Access variable R|<local>/a|"];
-                        26 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+                        26 [label="Smart cast: R|<local>/a|"];
-                        27 [label="Exit block"];
+                        27 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+                        28 [label="Exit block"];
                     }
-                    28 [label="Exit loop block"];
+                    29 [label="Exit loop block"];
                 }
-                29 [label="Exit whileloop"];
+                30 [label="Exit whileloop"];
             }
-            30 [label="Exit block"];
+            31 [label="Exit block"];
         }
-        31 [label="Exit function test" style="filled" fillcolor=red];
+        32 [label="Exit function test" style="filled" fillcolor=red];
     }
     8 -> {9};
     9 -> {10};
@@ -90,14 +91,15 @@ digraph dataFlowInfoFromWhileCondition_kt {
     19 -> {20};
     20 -> {21};
     21 -> {22};
-    22 -> {29 23};
+    22 -> {30 23};
     23 -> {24};
     24 -> {25};
     25 -> {26};
     26 -> {27};
     27 -> {28};
-    28 -> {13} [color=green style=dashed];
+    28 -> {29};
-    29 -> {30};
+    29 -> {13} [color=green style=dashed];
     30 -> {31};
+    31 -> {32};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/endlessLoops.dot

@@ -68,10 +68,11 @@ digraph endlessLoops_kt {
                 28 [label="Exit whileloop"];
             }
             29 [label="Access variable R|<local>/x|"];
-            30 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+            30 [label="Smart cast: R|<local>/x|"];
-            31 [label="Exit block"];
+            31 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+            32 [label="Exit block"];
         }
-        32 [label="Exit function test_1" style="filled" fillcolor=red];
+        33 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     4 -> {5};
     5 -> {6};
@@ -103,532 +104,543 @@ digraph endlessLoops_kt {
     29 -> {30};
     30 -> {31};
     31 -> {32};
+    32 -> {33};
 
     subgraph cluster_11 {
         color=red
-        33 [label="Enter function test_2" style="filled" fillcolor=red];
+        34 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_12 {
             color=blue
-            34 [label="Enter block"];
+            35 [label="Enter block"];
             subgraph cluster_13 {
                 color=blue
-                35 [label="Enter while loop"];
+                36 [label="Enter while loop"];
                 subgraph cluster_14 {
                     color=blue
-                    36 [label="Enter loop condition"];
+                    37 [label="Enter loop condition"];
-                    37 [label="Const: Boolean(true)"];
+                    38 [label="Const: Boolean(true)"];
-                    38 [label="Exit loop condition"];
+                    39 [label="Exit loop condition"];
                 }
                 subgraph cluster_15 {
                     color=blue
-                    39 [label="Enter loop block"];
+                    40 [label="Enter loop block"];
                     subgraph cluster_16 {
                         color=blue
-                        40 [label="Enter block"];
+                        41 [label="Enter block"];
                         subgraph cluster_17 {
                             color=blue
-                            41 [label="Enter when"];
+                            42 [label="Enter when"];
                             subgraph cluster_18 {
                                 color=blue
-                                42 [label="Enter when branch condition "];
+                                43 [label="Enter when branch condition "];
-                                43 [label="Access variable R|<local>/b|"];
+                                44 [label="Access variable R|<local>/b|"];
-                                44 [label="Exit when branch condition"];
+                                45 [label="Exit when branch condition"];
                             }
-                            45 [label="Synthetic else branch"];
+                            46 [label="Synthetic else branch"];
-                            46 [label="Enter when branch result"];
+                            47 [label="Enter when branch result"];
                             subgraph cluster_19 {
                                 color=blue
-                                47 [label="Enter block"];
+                                48 [label="Enter block"];
-                                48 [label="Access variable R|<local>/x|"];
+                                49 [label="Access variable R|<local>/x|"];
-                                49 [label="Type operator: (R|<local>/x| as R|A|)"];
+                                50 [label="Type operator: (R|<local>/x| as R|A|)"];
-                                50 [label="Jump: break@@@[Boolean(true)] "];
+                                51 [label="Jump: break@@@[Boolean(true)] "];
-                                51 [label="Stub" style="filled" fillcolor=gray];
+                                52 [label="Stub" style="filled" fillcolor=gray];
-                                52 [label="Exit block" style="filled" fillcolor=gray];
+                                53 [label="Exit block" style="filled" fillcolor=gray];
                             }
-                            53 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            54 [label="Exit when branch result" style="filled" fillcolor=gray];
-                            54 [label="Exit when"];
+                            55 [label="Exit when"];
                         }
-                        55 [label="Exit block"];
+                        56 [label="Exit block"];
                     }
-                    56 [label="Exit loop block"];
+                    57 [label="Exit loop block"];
                 }
-                57 [label="Exit whileloop"];
+                58 [label="Exit whileloop"];
             }
-            58 [label="Access variable R|<local>/x|"];
+            59 [label="Access variable R|<local>/x|"];
-            59 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+            60 [label="Smart cast: R|<local>/x|"];
-            60 [label="Exit block"];
+            61 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+            62 [label="Exit block"];
         }
-        61 [label="Exit function test_2" style="filled" fillcolor=red];
+        63 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    33 -> {34};
     34 -> {35};
     35 -> {36};
     36 -> {37};
     37 -> {38};
     38 -> {39};
-    38 -> {57} [style=dotted];
     39 -> {40};
+    39 -> {58} [style=dotted];
     40 -> {41};
     41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {46 45};
+    44 -> {45};
-    45 -> {54};
+    45 -> {47 46};
-    46 -> {47};
+    46 -> {55};
     47 -> {48};
     48 -> {49};
     49 -> {50};
-    50 -> {57};
+    50 -> {51};
-    50 -> {51} [style=dotted];
+    51 -> {58};
     51 -> {52} [style=dotted];
     52 -> {53} [style=dotted];
     53 -> {54} [style=dotted];
-    54 -> {55};
+    54 -> {55} [style=dotted];
     55 -> {56};
-    56 -> {36} [color=green style=dashed];
+    56 -> {57};
-    57 -> {58};
+    57 -> {37} [color=green style=dashed];
     58 -> {59};
     59 -> {60};
     60 -> {61};
+    61 -> {62};
+    62 -> {63};
 
     subgraph cluster_20 {
         color=red
-        62 [label="Enter function test_3" style="filled" fillcolor=red];
+        64 [label="Enter function test_3" style="filled" fillcolor=red];
         subgraph cluster_21 {
             color=blue
-            63 [label="Enter block"];
+            65 [label="Enter block"];
             subgraph cluster_22 {
                 color=blue
-                64 [label="Enter while loop"];
+                66 [label="Enter while loop"];
                 subgraph cluster_23 {
                     color=blue
-                    65 [label="Enter loop condition"];
+                    67 [label="Enter loop condition"];
-                    66 [label="Const: Boolean(true)"];
+                    68 [label="Const: Boolean(true)"];
-                    67 [label="Exit loop condition"];
+                    69 [label="Exit loop condition"];
                 }
                 subgraph cluster_24 {
                     color=blue
-                    68 [label="Enter loop block"];
+                    70 [label="Enter loop block"];
                     subgraph cluster_25 {
                         color=blue
-                        69 [label="Enter block"];
+                        71 [label="Enter block"];
-                        70 [label="Access variable R|<local>/x|"];
+                        72 [label="Access variable R|<local>/x|"];
-                        71 [label="Type operator: (R|<local>/x| as R|A|)"];
+                        73 [label="Type operator: (R|<local>/x| as R|A|)"];
                         subgraph cluster_26 {
                             color=blue
-                            72 [label="Enter when"];
+                            74 [label="Enter when"];
                             subgraph cluster_27 {
                                 color=blue
-                                73 [label="Enter when branch condition "];
+                                75 [label="Enter when branch condition "];
-                                74 [label="Access variable R|<local>/b|"];
+                                76 [label="Access variable R|<local>/b|"];
-                                75 [label="Exit when branch condition"];
+                                77 [label="Exit when branch condition"];
                             }
-                            76 [label="Synthetic else branch"];
+                            78 [label="Synthetic else branch"];
-                            77 [label="Enter when branch result"];
+                            79 [label="Enter when branch result"];
                             subgraph cluster_28 {
                                 color=blue
-                                78 [label="Enter block"];
+                                80 [label="Enter block"];
-                                79 [label="Jump: break@@@[Boolean(true)] "];
+                                81 [label="Jump: break@@@[Boolean(true)] "];
-                                80 [label="Stub" style="filled" fillcolor=gray];
+                                82 [label="Stub" style="filled" fillcolor=gray];
-                                81 [label="Exit block" style="filled" fillcolor=gray];
+                                83 [label="Exit block" style="filled" fillcolor=gray];
                             }
-                            82 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            84 [label="Exit when branch result" style="filled" fillcolor=gray];
-                            83 [label="Exit when"];
+                            85 [label="Exit when"];
                         }
                         subgraph cluster_29 {
                             color=blue
-                            84 [label="Enter when"];
+                            86 [label="Enter when"];
                             subgraph cluster_30 {
                                 color=blue
-                                85 [label="Enter when branch condition "];
+                                87 [label="Enter when branch condition "];
-                                86 [label="Access variable R|<local>/b|"];
+                                88 [label="Access variable R|<local>/b|"];
-                                87 [label="Exit when branch condition"];
+                                89 [label="Exit when branch condition"];
                             }
-                            88 [label="Synthetic else branch"];
+                            90 [label="Synthetic else branch"];
-                            89 [label="Enter when branch result"];
+                            91 [label="Enter when branch result"];
                             subgraph cluster_31 {
                                 color=blue
-                                90 [label="Enter block"];
+                                92 [label="Enter block"];
-                                91 [label="Jump: break@@@[Boolean(true)] "];
+                                93 [label="Jump: break@@@[Boolean(true)] "];
-                                92 [label="Stub" style="filled" fillcolor=gray];
+                                94 [label="Stub" style="filled" fillcolor=gray];
-                                93 [label="Exit block" style="filled" fillcolor=gray];
+                                95 [label="Exit block" style="filled" fillcolor=gray];
                             }
-                            94 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            96 [label="Exit when branch result" style="filled" fillcolor=gray];
-                            95 [label="Exit when"];
+                            97 [label="Exit when"];
                         }
-                        96 [label="Exit block"];
+                        98 [label="Exit block"];
                     }
-                    97 [label="Exit loop block"];
+                    99 [label="Exit loop block"];
                 }
-                98 [label="Exit whileloop"];
+                100 [label="Exit whileloop"];
             }
-            99 [label="Access variable R|<local>/x|"];
+            101 [label="Access variable R|<local>/x|"];
-            100 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+            102 [label="Smart cast: R|<local>/x|"];
-            101 [label="Exit block"];
+            103 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+            104 [label="Exit block"];
         }
-        102 [label="Exit function test_3" style="filled" fillcolor=red];
+        105 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    62 -> {63};
-    63 -> {64};
     64 -> {65};
     65 -> {66};
     66 -> {67};
     67 -> {68};
-    67 -> {98} [style=dotted];
     68 -> {69};
     69 -> {70};
+    69 -> {100} [style=dotted];
     70 -> {71};
     71 -> {72};
     72 -> {73};
     73 -> {74};
     74 -> {75};
-    75 -> {77 76};
+    75 -> {76};
-    76 -> {83};
+    76 -> {77};
-    77 -> {78};
+    77 -> {79 78};
-    78 -> {79};
+    78 -> {85};
-    79 -> {98};
+    79 -> {80};
-    79 -> {80} [style=dotted];
+    80 -> {81};
-    80 -> {81} [style=dotted];
+    81 -> {100};
     81 -> {82} [style=dotted];
     82 -> {83} [style=dotted];
-    83 -> {84};
+    83 -> {84} [style=dotted];
-    84 -> {85};
+    84 -> {85} [style=dotted];
     85 -> {86};
     86 -> {87};
-    87 -> {89 88};
+    87 -> {88};
-    88 -> {95};
+    88 -> {89};
-    89 -> {90};
+    89 -> {91 90};
-    90 -> {91};
+    90 -> {97};
-    91 -> {98};
+    91 -> {92};
-    91 -> {92} [style=dotted];
+    92 -> {93};
-    92 -> {93} [style=dotted];
+    93 -> {100};
     93 -> {94} [style=dotted];
     94 -> {95} [style=dotted];
-    95 -> {96};
+    95 -> {96} [style=dotted];
-    96 -> {97};
+    96 -> {97} [style=dotted];
-    97 -> {65} [color=green style=dashed];
+    97 -> {98};
     98 -> {99};
-    99 -> {100};
+    99 -> {67} [color=green style=dashed];
     100 -> {101};
     101 -> {102};
+    102 -> {103};
+    103 -> {104};
+    104 -> {105};
 
     subgraph cluster_32 {
         color=red
-        103 [label="Enter function test_4" style="filled" fillcolor=red];
+        106 [label="Enter function test_4" style="filled" fillcolor=red];
         subgraph cluster_33 {
             color=blue
-            104 [label="Enter block"];
+            107 [label="Enter block"];
             subgraph cluster_34 {
                 color=blue
-                105 [label="Enter while loop"];
+                108 [label="Enter while loop"];
                 subgraph cluster_35 {
                     color=blue
-                    106 [label="Enter loop condition"];
+                    109 [label="Enter loop condition"];
-                    107 [label="Const: Boolean(true)"];
+                    110 [label="Const: Boolean(true)"];
-                    108 [label="Exit loop condition"];
+                    111 [label="Exit loop condition"];
                 }
                 subgraph cluster_36 {
                     color=blue
-                    109 [label="Enter loop block"];
+                    112 [label="Enter loop block"];
                     subgraph cluster_37 {
                         color=blue
-                        110 [label="Enter block"];
+                        113 [label="Enter block"];
                         subgraph cluster_38 {
                             color=blue
-                            111 [label="Enter when"];
+                            114 [label="Enter when"];
                             subgraph cluster_39 {
                                 color=blue
-                                112 [label="Enter when branch condition "];
+                                115 [label="Enter when branch condition "];
-                                113 [label="Access variable R|<local>/b|"];
+                                116 [label="Access variable R|<local>/b|"];
-                                114 [label="Exit when branch condition"];
+                                117 [label="Exit when branch condition"];
                             }
-                            115 [label="Synthetic else branch"];
+                            118 [label="Synthetic else branch"];
-                            116 [label="Enter when branch result"];
+                            119 [label="Enter when branch result"];
                             subgraph cluster_40 {
                                 color=blue
-                                117 [label="Enter block"];
+                                120 [label="Enter block"];
-                                118 [label="Access variable R|<local>/x|"];
+                                121 [label="Access variable R|<local>/x|"];
-                                119 [label="Type operator: (R|<local>/x| as R|A|)"];
+                                122 [label="Type operator: (R|<local>/x| as R|A|)"];
-                                120 [label="Jump: break@@@[Boolean(true)] "];
+                                123 [label="Jump: break@@@[Boolean(true)] "];
-                                121 [label="Stub" style="filled" fillcolor=gray];
+                                124 [label="Stub" style="filled" fillcolor=gray];
-                                122 [label="Exit block" style="filled" fillcolor=gray];
+                                125 [label="Exit block" style="filled" fillcolor=gray];
                             }
-                            123 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            126 [label="Exit when branch result" style="filled" fillcolor=gray];
-                            124 [label="Exit when"];
+                            127 [label="Exit when"];
                         }
-                        125 [label="Jump: break@@@[Boolean(true)] "];
+                        128 [label="Jump: break@@@[Boolean(true)] "];
-                        126 [label="Stub" style="filled" fillcolor=gray];
+                        129 [label="Stub" style="filled" fillcolor=gray];
-                        127 [label="Exit block" style="filled" fillcolor=gray];
+                        130 [label="Exit block" style="filled" fillcolor=gray];
                     }
-                    128 [label="Exit loop block" style="filled" fillcolor=gray];
+                    131 [label="Exit loop block" style="filled" fillcolor=gray];
                 }
-                129 [label="Exit whileloop"];
+                132 [label="Exit whileloop"];
             }
-            130 [label="Access variable R|<local>/x|"];
+            133 [label="Access variable R|<local>/x|"];
-            131 [label="Function call: R|<local>/x|.<Unresolved name: foo>#()"];
+            134 [label="Function call: R|<local>/x|.<Unresolved name: foo>#()"];
-            132 [label="Exit block"];
+            135 [label="Exit block"];
         }
-        133 [label="Exit function test_4" style="filled" fillcolor=red];
+        136 [label="Exit function test_4" style="filled" fillcolor=red];
     }
-    103 -> {104};
-    104 -> {105};
-    105 -> {106};
     106 -> {107};
     107 -> {108};
     108 -> {109};
-    108 -> {129} [style=dotted];
     109 -> {110};
     110 -> {111};
     111 -> {112};
+    111 -> {132} [style=dotted];
     112 -> {113};
     113 -> {114};
-    114 -> {116 115};
+    114 -> {115};
-    115 -> {124};
+    115 -> {116};
     116 -> {117};
-    117 -> {118};
+    117 -> {119 118};
-    118 -> {119};
+    118 -> {127};
     119 -> {120};
-    120 -> {129};
+    120 -> {121};
-    120 -> {121} [style=dotted];
+    121 -> {122};
-    121 -> {122} [style=dotted];
+    122 -> {123};
-    122 -> {123} [style=dotted];
+    123 -> {132};
     123 -> {124} [style=dotted];
-    124 -> {125};
+    124 -> {125} [style=dotted];
-    125 -> {129};
     125 -> {126} [style=dotted];
     126 -> {127} [style=dotted];
-    127 -> {128} [style=dotted];
+    127 -> {128};
-    128 -> {106} [color=green style=dotted];
+    128 -> {132};
-    129 -> {130};
+    128 -> {129} [style=dotted];
-    130 -> {131};
+    129 -> {130} [style=dotted];
-    131 -> {132};
+    130 -> {131} [style=dotted];
+    131 -> {109} [color=green style=dotted];
     132 -> {133};
+    133 -> {134};
+    134 -> {135};
+    135 -> {136};
 
     subgraph cluster_41 {
         color=red
-        134 [label="Enter function test_5" style="filled" fillcolor=red];
+        137 [label="Enter function test_5" style="filled" fillcolor=red];
         subgraph cluster_42 {
             color=blue
-            135 [label="Enter block"];
+            138 [label="Enter block"];
             subgraph cluster_43 {
                 color=blue
-                136 [label="Enter do-while loop"];
+                139 [label="Enter do-while loop"];
                 subgraph cluster_44 {
                     color=blue
-                    137 [label="Enter loop block"];
+                    140 [label="Enter loop block"];
                     subgraph cluster_45 {
                         color=blue
-                        138 [label="Enter block"];
+                        141 [label="Enter block"];
                         subgraph cluster_46 {
                             color=blue
-                            139 [label="Enter when"];
+                            142 [label="Enter when"];
                             subgraph cluster_47 {
                                 color=blue
-                                140 [label="Enter when branch condition "];
+                                143 [label="Enter when branch condition "];
-                                141 [label="Access variable R|<local>/b|"];
+                                144 [label="Access variable R|<local>/b|"];
-                                142 [label="Exit when branch condition"];
+                                145 [label="Exit when branch condition"];
                             }
-                            143 [label="Synthetic else branch"];
+                            146 [label="Synthetic else branch"];
-                            144 [label="Enter when branch result"];
+                            147 [label="Enter when branch result"];
                             subgraph cluster_48 {
                                 color=blue
-                                145 [label="Enter block"];
+                                148 [label="Enter block"];
-                                146 [label="Access variable R|<local>/x|"];
+                                149 [label="Access variable R|<local>/x|"];
-                                147 [label="Type operator: (R|<local>/x| as R|A|)"];
+                                150 [label="Type operator: (R|<local>/x| as R|A|)"];
-                                148 [label="Jump: break@@@[Boolean(true)] "];
+                                151 [label="Jump: break@@@[Boolean(true)] "];
-                                149 [label="Stub" style="filled" fillcolor=gray];
+                                152 [label="Stub" style="filled" fillcolor=gray];
-                                150 [label="Exit block" style="filled" fillcolor=gray];
+                                153 [label="Exit block" style="filled" fillcolor=gray];
                             }
-                            151 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            154 [label="Exit when branch result" style="filled" fillcolor=gray];
-                            152 [label="Exit when"];
+                            155 [label="Exit when"];
                         }
-                        153 [label="Exit block"];
+                        156 [label="Exit block"];
                     }
-                    154 [label="Exit loop block"];
+                    157 [label="Exit loop block"];
                 }
                 subgraph cluster_49 {
                     color=blue
-                    155 [label="Enter loop condition"];
+                    158 [label="Enter loop condition"];
-                    156 [label="Const: Boolean(true)"];
+                    159 [label="Const: Boolean(true)"];
-                    157 [label="Exit loop condition"];
+                    160 [label="Exit loop condition"];
                 }
-                158 [label="Exit do-whileloop"];
+                161 [label="Exit do-whileloop"];
             }
-            159 [label="Access variable R|<local>/x|"];
+            162 [label="Access variable R|<local>/x|"];
-            160 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+            163 [label="Smart cast: R|<local>/x|"];
-            161 [label="Exit block"];
+            164 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+            165 [label="Exit block"];
         }
-        162 [label="Exit function test_5" style="filled" fillcolor=red];
+        166 [label="Exit function test_5" style="filled" fillcolor=red];
     }
-    134 -> {135};
-    135 -> {136};
-    136 -> {137};
     137 -> {138};
     138 -> {139};
     139 -> {140};
     140 -> {141};
     141 -> {142};
-    142 -> {144 143};
+    142 -> {143};
-    143 -> {152};
+    143 -> {144};
     144 -> {145};
-    145 -> {146};
+    145 -> {147 146};
-    146 -> {147};
+    146 -> {155};
     147 -> {148};
-    148 -> {158};
+    148 -> {149};
-    148 -> {149} [style=dotted];
+    149 -> {150};
-    149 -> {150} [style=dotted];
+    150 -> {151};
-    150 -> {151} [style=dotted];
+    151 -> {161};
     151 -> {152} [style=dotted];
-    152 -> {153};
+    152 -> {153} [style=dotted];
-    153 -> {154};
+    153 -> {154} [style=dotted];
-    154 -> {155};
+    154 -> {155} [style=dotted];
     155 -> {156};
     156 -> {157};
-    157 -> {158} [style=dotted];
+    157 -> {158};
-    157 -> {137} [color=green style=dashed];
     158 -> {159};
     159 -> {160};
-    160 -> {161};
+    160 -> {161} [style=dotted];
+    160 -> {140} [color=green style=dashed];
     161 -> {162};
-
+    162 -> {163};
-    subgraph cluster_50 {
-        color=red
-        163 [label="Enter function test_6" style="filled" fillcolor=red];
-        subgraph cluster_51 {
-            color=blue
-            164 [label="Enter block"];
-            subgraph cluster_52 {
-                color=blue
-                165 [label="Enter do-while loop"];
-                subgraph cluster_53 {
-                    color=blue
-                    166 [label="Enter loop block"];
-                    subgraph cluster_54 {
-                        color=blue
-                        167 [label="Enter block"];
-                        168 [label="Access variable R|<local>/x|"];
-                        169 [label="Type operator: (R|<local>/x| as R|A|)"];
-                        subgraph cluster_55 {
-                            color=blue
-                            170 [label="Enter when"];
-                            subgraph cluster_56 {
-                                color=blue
-                                171 [label="Enter when branch condition "];
-                                172 [label="Access variable R|<local>/b|"];
-                                173 [label="Exit when branch condition"];
-                            }
-                            174 [label="Synthetic else branch"];
-                            175 [label="Enter when branch result"];
-                            subgraph cluster_57 {
-                                color=blue
-                                176 [label="Enter block"];
-                                177 [label="Jump: break@@@[Boolean(true)] "];
-                                178 [label="Stub" style="filled" fillcolor=gray];
-                                179 [label="Exit block" style="filled" fillcolor=gray];
-                            }
-                            180 [label="Exit when branch result" style="filled" fillcolor=gray];
-                            181 [label="Exit when"];
-                        }
-                        182 [label="Exit block"];
-                    }
-                    183 [label="Exit loop block"];
-                }
-                subgraph cluster_58 {
-                    color=blue
-                    184 [label="Enter loop condition"];
-                    185 [label="Const: Boolean(true)"];
-                    186 [label="Exit loop condition"];
-                }
-                187 [label="Exit do-whileloop"];
-            }
-            188 [label="Access variable R|<local>/x|"];
-            189 [label="Function call: R|<local>/x|.R|/A.foo|()"];
-            190 [label="Exit block"];
-        }
-        191 [label="Exit function test_6" style="filled" fillcolor=red];
-    }
     163 -> {164};
     164 -> {165};
     165 -> {166};
-    166 -> {167};
+
+    subgraph cluster_50 {
+        color=red
+        167 [label="Enter function test_6" style="filled" fillcolor=red];
+        subgraph cluster_51 {
+            color=blue
+            168 [label="Enter block"];
+            subgraph cluster_52 {
+                color=blue
+                169 [label="Enter do-while loop"];
+                subgraph cluster_53 {
+                    color=blue
+                    170 [label="Enter loop block"];
+                    subgraph cluster_54 {
+                        color=blue
+                        171 [label="Enter block"];
+                        172 [label="Access variable R|<local>/x|"];
+                        173 [label="Type operator: (R|<local>/x| as R|A|)"];
+                        subgraph cluster_55 {
+                            color=blue
+                            174 [label="Enter when"];
+                            subgraph cluster_56 {
+                                color=blue
+                                175 [label="Enter when branch condition "];
+                                176 [label="Access variable R|<local>/b|"];
+                                177 [label="Exit when branch condition"];
+                            }
+                            178 [label="Synthetic else branch"];
+                            179 [label="Enter when branch result"];
+                            subgraph cluster_57 {
+                                color=blue
+                                180 [label="Enter block"];
+                                181 [label="Jump: break@@@[Boolean(true)] "];
+                                182 [label="Stub" style="filled" fillcolor=gray];
+                                183 [label="Exit block" style="filled" fillcolor=gray];
+                            }
+                            184 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            185 [label="Exit when"];
+                        }
+                        186 [label="Exit block"];
+                    }
+                    187 [label="Exit loop block"];
+                }
+                subgraph cluster_58 {
+                    color=blue
+                    188 [label="Enter loop condition"];
+                    189 [label="Const: Boolean(true)"];
+                    190 [label="Exit loop condition"];
+                }
+                191 [label="Exit do-whileloop"];
+            }
+            192 [label="Access variable R|<local>/x|"];
+            193 [label="Smart cast: R|<local>/x|"];
+            194 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+            195 [label="Exit block"];
+        }
+        196 [label="Exit function test_6" style="filled" fillcolor=red];
+    }
     167 -> {168};
     168 -> {169};
     169 -> {170};
     170 -> {171};
     171 -> {172};
     172 -> {173};
-    173 -> {175 174};
+    173 -> {174};
-    174 -> {181};
+    174 -> {175};
     175 -> {176};
     176 -> {177};
-    177 -> {187};
+    177 -> {179 178};
-    177 -> {178} [style=dotted];
+    178 -> {185};
-    178 -> {179} [style=dotted];
+    179 -> {180};
-    179 -> {180} [style=dotted];
+    180 -> {181};
-    180 -> {181} [style=dotted];
+    181 -> {191};
-    181 -> {182};
+    181 -> {182} [style=dotted];
-    182 -> {183};
+    182 -> {183} [style=dotted];
-    183 -> {184};
+    183 -> {184} [style=dotted];
-    184 -> {185};
+    184 -> {185} [style=dotted];
     185 -> {186};
-    186 -> {187} [style=dotted];
+    186 -> {187};
-    186 -> {166} [color=green style=dashed];
     187 -> {188};
     188 -> {189};
     189 -> {190};
-    190 -> {191};
+    190 -> {191} [style=dotted];
-
+    190 -> {170} [color=green style=dashed];
-    subgraph cluster_59 {
+    191 -> {192};
-        color=red
-        192 [label="Enter function test_7" style="filled" fillcolor=red];
-        subgraph cluster_60 {
-            color=blue
-            193 [label="Enter block"];
-            subgraph cluster_61 {
-                color=blue
-                194 [label="Enter do-while loop"];
-                subgraph cluster_62 {
-                    color=blue
-                    195 [label="Enter loop block"];
-                    subgraph cluster_63 {
-                        color=blue
-                        196 [label="Enter block"];
-                        197 [label="Access variable R|<local>/x|"];
-                        198 [label="Type operator: (R|<local>/x| as R|A|)"];
-                        199 [label="Exit block"];
-                    }
-                    200 [label="Exit loop block"];
-                }
-                subgraph cluster_64 {
-                    color=blue
-                    201 [label="Enter loop condition"];
-                    202 [label="Const: Boolean(true)"];
-                    203 [label="Exit loop condition"];
-                }
-                204 [label="Exit do-whileloop" style="filled" fillcolor=gray];
-            }
-            205 [label="Access variable R|<local>/x|" style="filled" fillcolor=gray];
-            206 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=gray];
-            207 [label="Exit block" style="filled" fillcolor=gray];
-        }
-        208 [label="Exit function test_7" style="filled" fillcolor=red style="filled" fillcolor=gray];
-    }
     192 -> {193};
     193 -> {194};
     194 -> {195};
     195 -> {196};
-    196 -> {197};
+
+    subgraph cluster_59 {
+        color=red
+        197 [label="Enter function test_7" style="filled" fillcolor=red];
+        subgraph cluster_60 {
+            color=blue
+            198 [label="Enter block"];
+            subgraph cluster_61 {
+                color=blue
+                199 [label="Enter do-while loop"];
+                subgraph cluster_62 {
+                    color=blue
+                    200 [label="Enter loop block"];
+                    subgraph cluster_63 {
+                        color=blue
+                        201 [label="Enter block"];
+                        202 [label="Access variable R|<local>/x|"];
+                        203 [label="Type operator: (R|<local>/x| as R|A|)"];
+                        204 [label="Exit block"];
+                    }
+                    205 [label="Exit loop block"];
+                }
+                subgraph cluster_64 {
+                    color=blue
+                    206 [label="Enter loop condition"];
+                    207 [label="Const: Boolean(true)"];
+                    208 [label="Exit loop condition"];
+                }
+                209 [label="Exit do-whileloop" style="filled" fillcolor=gray];
+            }
+            210 [label="Access variable R|<local>/x|" style="filled" fillcolor=gray];
+            211 [label="Smart cast: R|<local>/x|" style="filled" fillcolor=gray];
+            212 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=gray];
+            213 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        214 [label="Exit function test_7" style="filled" fillcolor=red style="filled" fillcolor=gray];
+    }
     197 -> {198};
     198 -> {199};
     199 -> {200};
     200 -> {201};
     201 -> {202};
     202 -> {203};
-    203 -> {204} [style=dotted];
+    203 -> {204};
-    203 -> {195} [color=green style=dashed];
+    204 -> {205};
-    204 -> {205} [style=dotted];
+    205 -> {206};
-    205 -> {206} [style=dotted];
+    206 -> {207};
-    206 -> {207} [style=dotted];
+    207 -> {208};
-    207 -> {208} [style=dotted];
+    208 -> {209} [style=dotted];
+    208 -> {200} [color=green style=dashed];
+    209 -> {210} [style=dotted];
+    210 -> {211} [style=dotted];
+    211 -> {212} [style=dotted];
+    212 -> {213} [style=dotted];
+    213 -> {214} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/multipleCasts.dot

@@ -65,14 +65,16 @@ digraph multipleCasts_kt {
             21 [label="Access variable R|<local>/a|"];
             22 [label="Type operator: (R|<local>/a| as R|A|)"];
             23 [label="Access variable R|<local>/a|"];
-            24 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            24 [label="Smart cast: R|<local>/a|"];
-            25 [label="Access variable R|<local>/b|"];
+            25 [label="Function call: R|<local>/a|.R|/A.foo|()"];
-            26 [label="Type operator: (R|<local>/b| as R|B|)"];
+            26 [label="Access variable R|<local>/b|"];
-            27 [label="Access variable R|<local>/b|"];
+            27 [label="Type operator: (R|<local>/b| as R|B|)"];
-            28 [label="Function call: R|<local>/b|.R|/B.foo|()"];
+            28 [label="Access variable R|<local>/b|"];
-            29 [label="Exit block"];
+            29 [label="Smart cast: R|<local>/b|"];
+            30 [label="Function call: R|<local>/b|.R|/B.foo|()"];
+            31 [label="Exit block"];
         }
-        30 [label="Exit function test_0" style="filled" fillcolor=red];
+        32 [label="Exit function test_0" style="filled" fillcolor=red];
     }
     15 -> {16};
     16 -> {17};
@@ -89,56 +91,58 @@ digraph multipleCasts_kt {
     27 -> {28};
     28 -> {29};
     29 -> {30};
+    30 -> {31};
+    31 -> {32};
 
     subgraph cluster_8 {
         color=red
-        31 [label="Enter function test_1" style="filled" fillcolor=red];
+        33 [label="Enter function test_1" style="filled" fillcolor=red];
         subgraph cluster_9 {
             color=blue
-            32 [label="Enter block"];
+            34 [label="Enter block"];
-            33 [label="Function call: R|/getAny|()"];
-            34 [label="Variable declaration: lval a: R|kotlin/Any?|"];
             35 [label="Function call: R|/getAny|()"];
-            36 [label="Variable declaration: lval b: R|kotlin/Any?|"];
+            36 [label="Variable declaration: lval a: R|kotlin/Any?|"];
+            37 [label="Function call: R|/getAny|()"];
+            38 [label="Variable declaration: lval b: R|kotlin/Any?|"];
             subgraph cluster_10 {
                 color=blue
-                37 [label="Enter when"];
+                39 [label="Enter when"];
                 subgraph cluster_11 {
                     color=blue
-                    38 [label="Enter when branch condition "];
+                    40 [label="Enter when branch condition "];
                     subgraph cluster_12 {
                         color=blue
-                        39 [label="Enter &&"];
+                        41 [label="Enter &&"];
-                        40 [label="Access variable R|<local>/a|"];
+                        42 [label="Access variable R|<local>/a|"];
-                        41 [label="Type operator: (R|<local>/a| is R|A|)"];
+                        43 [label="Type operator: (R|<local>/a| is R|A|)"];
-                        42 [label="Exit left part of &&"];
+                        44 [label="Exit left part of &&"];
-                        43 [label="Enter right part of &&"];
+                        45 [label="Enter right part of &&"];
-                        44 [label="Access variable R|<local>/b|"];
+                        46 [label="Access variable R|<local>/b|"];
-                        45 [label="Type operator: (R|<local>/b| is R|B|)"];
+                        47 [label="Type operator: (R|<local>/b| is R|B|)"];
-                        46 [label="Exit &&"];
+                        48 [label="Exit &&"];
                     }
-                    47 [label="Exit when branch condition"];
+                    49 [label="Exit when branch condition"];
                 }
-                48 [label="Synthetic else branch"];
+                50 [label="Synthetic else branch"];
-                49 [label="Enter when branch result"];
+                51 [label="Enter when branch result"];
                 subgraph cluster_13 {
                     color=blue
-                    50 [label="Enter block"];
+                    52 [label="Enter block"];
-                    51 [label="Access variable R|<local>/a|"];
+                    53 [label="Access variable R|<local>/a|"];
-                    52 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+                    54 [label="Smart cast: R|<local>/a|"];
-                    53 [label="Access variable R|<local>/b|"];
+                    55 [label="Function call: R|<local>/a|.R|/A.foo|()"];
-                    54 [label="Function call: R|<local>/b|.R|/B.foo|()"];
+                    56 [label="Access variable R|<local>/b|"];
-                    55 [label="Exit block"];
+                    57 [label="Smart cast: R|<local>/b|"];
+                    58 [label="Function call: R|<local>/b|.R|/B.foo|()"];
+                    59 [label="Exit block"];
                 }
-                56 [label="Exit when branch result"];
+                60 [label="Exit when branch result"];
-                57 [label="Exit when"];
+                61 [label="Exit when"];
             }
-            58 [label="Exit block"];
+            62 [label="Exit block"];
         }
-        59 [label="Exit function test_1" style="filled" fillcolor=red];
+        63 [label="Exit function test_1" style="filled" fillcolor=red];
     }
-    31 -> {32};
-    32 -> {33};
     33 -> {34};
     34 -> {35};
     35 -> {36};
@@ -148,15 +152,15 @@ digraph multipleCasts_kt {
     39 -> {40};
     40 -> {41};
     41 -> {42};
-    42 -> {46 43};
+    42 -> {43};
     43 -> {44};
-    44 -> {45};
+    44 -> {48 45};
     45 -> {46};
     46 -> {47};
-    47 -> {49 48};
+    47 -> {48};
-    48 -> {57};
+    48 -> {49};
-    49 -> {50};
+    49 -> {51 50};
-    50 -> {51};
+    50 -> {61};
     51 -> {52};
     52 -> {53};
     53 -> {54};
@@ -165,5 +169,9 @@ digraph multipleCasts_kt {
     56 -> {57};
     57 -> {58};
     58 -> {59};
+    59 -> {60};
+    60 -> {61};
+    61 -> {62};
+    62 -> {63};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/implicitReceiverAsWhenSubject.dot

@@ -53,13 +53,14 @@ digraph implicitReceiverAsWhenSubject_kt {
                     color=blue
                     25 [label="Enter block"];
                     26 [label="Access variable this@R|/test_1|"];
-                    27 [label="Access variable R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|"];
+                    27 [label="Smart cast: this@R|/test_1|"];
-                    28 [label="Exit block"];
+                    28 [label="Access variable R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|"];
+                    29 [label="Exit block"];
                 }
-                29 [label="Exit when branch result"];
+                30 [label="Exit when branch result"];
-                30 [label="Exit when"];
+                31 [label="Exit when"];
             }
-            31 [label="Jump: ^test_1 when (this@R|/test_1|) {
+            32 [label="Jump: ^test_1 when (this@R|/test_1|) {
     ($subj$ is R|kotlin/collections/List<*>|) ->  {
         this@R|/test_1|.R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|
     }
@@ -71,10 +72,10 @@ digraph implicitReceiverAsWhenSubject_kt {
     }
 }
 "];
-            32 [label="Stub" style="filled" fillcolor=gray];
+            33 [label="Stub" style="filled" fillcolor=gray];
-            33 [label="Exit block" style="filled" fillcolor=gray];
+            34 [label="Exit block" style="filled" fillcolor=gray];
         }
-        34 [label="Exit function test_1" style="filled" fillcolor=red];
+        35 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     0 -> {1};
     1 -> {2};
@@ -94,12 +95,12 @@ digraph implicitReceiverAsWhenSubject_kt {
     15 -> {16};
     16 -> {17};
     17 -> {18};
-    18 -> {30};
+    18 -> {31};
     19 -> {20};
     20 -> {21};
     21 -> {22};
     22 -> {23};
-    23 -> {30};
+    23 -> {31};
     24 -> {25};
     25 -> {26};
     26 -> {27};
@@ -107,73 +108,77 @@ digraph implicitReceiverAsWhenSubject_kt {
     28 -> {29};
     29 -> {30};
     30 -> {31};
-    31 -> {34};
+    31 -> {32};
-    31 -> {32} [style=dotted];
+    32 -> {35};
     32 -> {33} [style=dotted];
     33 -> {34} [style=dotted];
+    34 -> {35} [style=dotted];
 
     subgraph cluster_9 {
         color=red
-        35 [label="Enter function test_2" style="filled" fillcolor=red];
+        36 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_10 {
             color=blue
-            36 [label="Enter block"];
+            37 [label="Enter block"];
             subgraph cluster_11 {
                 color=blue
-                37 [label="Enter when"];
+                38 [label="Enter when"];
-                38 [label="Access variable this@R|/test_2|"];
+                39 [label="Access variable this@R|/test_2|"];
-                39 [label="Variable declaration: lval x: R|kotlin/Any|"];
+                40 [label="Variable declaration: lval x: R|kotlin/Any|"];
                 subgraph cluster_12 {
                     color=blue
-                    40 [label="Enter when branch condition "];
+                    41 [label="Enter when branch condition "];
-                    41 [label="Exit $subj"];
+                    42 [label="Exit $subj"];
-                    42 [label="Type operator: ($subj$ is R|kotlin/collections/List<*>|)"];
+                    43 [label="Type operator: ($subj$ is R|kotlin/collections/List<*>|)"];
-                    43 [label="Exit when branch condition"];
+                    44 [label="Exit when branch condition"];
                 }
                 subgraph cluster_13 {
                     color=blue
-                    44 [label="Enter when branch condition "];
+                    45 [label="Enter when branch condition "];
-                    45 [label="Exit $subj"];
+                    46 [label="Exit $subj"];
-                    46 [label="Type operator: ($subj$ is R|kotlin/String|)"];
+                    47 [label="Type operator: ($subj$ is R|kotlin/String|)"];
-                    47 [label="Exit when branch condition"];
+                    48 [label="Exit when branch condition"];
                 }
                 subgraph cluster_14 {
                     color=blue
-                    48 [label="Enter when branch condition else"];
+                    49 [label="Enter when branch condition else"];
-                    49 [label="Exit when branch condition"];
+                    50 [label="Exit when branch condition"];
                 }
-                50 [label="Enter when branch result"];
+                51 [label="Enter when branch result"];
                 subgraph cluster_15 {
                     color=blue
-                    51 [label="Enter block"];
+                    52 [label="Enter block"];
-                    52 [label="Const: Int(0)"];
+                    53 [label="Const: Int(0)"];
-                    53 [label="Exit block"];
+                    54 [label="Exit block"];
                 }
-                54 [label="Exit when branch result"];
+                55 [label="Exit when branch result"];
-                55 [label="Enter when branch result"];
+                56 [label="Enter when branch result"];
                 subgraph cluster_16 {
                     color=blue
-                    56 [label="Enter block"];
+                    57 [label="Enter block"];
-                    57 [label="Access variable R|<local>/x|"];
+                    58 [label="Access variable R|<local>/x|"];
-                    58 [label="Access variable R|kotlin/String.length|"];
+                    59 [label="Smart cast: R|<local>/x|"];
-                    59 [label="Access variable R|kotlin/String.length|"];
+                    60 [label="Access variable R|kotlin/String.length|"];
-                    60 [label="Exit block"];
+                    61 [label="Access variable R|kotlin/String.length|"];
+                    62 [label="Exit block"];
                 }
-                61 [label="Exit when branch result"];
+                63 [label="Exit when branch result"];
-                62 [label="Enter when branch result"];
+                64 [label="Enter when branch result"];
                 subgraph cluster_17 {
                     color=blue
-                    63 [label="Enter block"];
+                    65 [label="Enter block"];
-                    64 [label="Access variable R|<local>/x|"];
+                    66 [label="Access variable R|<local>/x|"];
-                    65 [label="Access variable R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|"];
+                    67 [label="Smart cast: R|<local>/x|"];
-                    66 [label="Access variable this@R|/test_2|"];
+                    68 [label="Access variable R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|"];
-                    67 [label="Access variable R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|"];
+                    69 [label="Access variable this@R|/test_2|"];
-                    68 [label="Exit block"];
+                    70 [label="Smart cast: this@R|/test_2|"];
+                    71 [label="Access variable R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|"];
+                    72 [label="Exit block"];
                 }
-                69 [label="Exit when branch result"];
+                73 [label="Exit when branch result"];
-                70 [label="Exit when"];
+                74 [label="Exit when"];
             }
-            71 [label="Jump: ^test_2 when (lval x: R|kotlin/Any| = this@R|/test_2|) {
+            75 [label="Jump: ^test_2 when (lval x: R|kotlin/Any| = this@R|/test_2|) {
     ($subj$ is R|kotlin/collections/List<*>|) ->  {
         R|<local>/x|.R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|
         this@R|/test_2|.R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|
@@ -187,12 +192,11 @@ digraph implicitReceiverAsWhenSubject_kt {
     }
 }
 "];
-            72 [label="Stub" style="filled" fillcolor=gray];
+            76 [label="Stub" style="filled" fillcolor=gray];
-            73 [label="Exit block" style="filled" fillcolor=gray];
+            77 [label="Exit block" style="filled" fillcolor=gray];
         }
-        74 [label="Exit function test_2" style="filled" fillcolor=red];
+        78 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    35 -> {36};
     36 -> {37};
     37 -> {38};
     38 -> {39};
@@ -200,27 +204,27 @@ digraph implicitReceiverAsWhenSubject_kt {
     40 -> {41};
     41 -> {42};
     42 -> {43};
-    43 -> {62 44};
+    43 -> {44};
-    44 -> {45};
+    44 -> {64 45};
     45 -> {46};
     46 -> {47};
-    47 -> {55 48};
+    47 -> {48};
-    48 -> {49};
+    48 -> {56 49};
     49 -> {50};
     50 -> {51};
     51 -> {52};
     52 -> {53};
     53 -> {54};
-    54 -> {70};
+    54 -> {55};
-    55 -> {56};
+    55 -> {74};
     56 -> {57};
     57 -> {58};
     58 -> {59};
     59 -> {60};
     60 -> {61};
-    61 -> {70};
+    61 -> {62};
     62 -> {63};
-    63 -> {64};
+    63 -> {74};
     64 -> {65};
     65 -> {66};
     66 -> {67};
@@ -228,9 +232,13 @@ digraph implicitReceiverAsWhenSubject_kt {
     68 -> {69};
     69 -> {70};
     70 -> {71};
-    71 -> {74};
+    71 -> {72};
-    71 -> {72} [style=dotted];
+    72 -> {73};
-    72 -> {73} [style=dotted];
+    73 -> {74};
-    73 -> {74} [style=dotted];
+    74 -> {75};
+    75 -> {78};
+    75 -> {76} [style=dotted];
+    76 -> {77} [style=dotted];
+    77 -> {78} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/implicitReceivers.dot

@@ -113,19 +113,20 @@ digraph implicitReceivers_kt {
                     color=blue
                     39 [label="Enter block"];
                     40 [label="Access variable this@R|/test_1|"];
-                    41 [label="Function call: this@R|/test_1|.R|/A.foo|()"];
+                    41 [label="Smart cast: this@R|/test_1|"];
                     42 [label="Function call: this@R|/test_1|.R|/A.foo|()"];
-                    43 [label="Exit block"];
+                    43 [label="Function call: this@R|/test_1|.R|/A.foo|()"];
+                    44 [label="Exit block"];
                 }
-                44 [label="Exit when branch result"];
+                45 [label="Exit when branch result"];
-                45 [label="Exit when"];
+                46 [label="Exit when"];
             }
-            46 [label="Access variable this@R|/test_1|"];
+            47 [label="Access variable this@R|/test_1|"];
-            47 [label="Function call: this@R|/test_1|.<Unresolved name: foo>#()"];
+            48 [label="Function call: this@R|/test_1|.<Unresolved name: foo>#()"];
-            48 [label="Function call: <Unresolved name: foo>#()"];
+            49 [label="Function call: <Unresolved name: foo>#()"];
-            49 [label="Exit block"];
+            50 [label="Exit block"];
         }
-        50 [label="Exit function test_1" style="filled" fillcolor=red];
+        51 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     22 -> {23};
     23 -> {24};
@@ -142,7 +143,7 @@ digraph implicitReceivers_kt {
     34 -> {35};
     35 -> {36};
     36 -> {37};
-    37 -> {45};
+    37 -> {46};
     38 -> {39};
     39 -> {40};
     40 -> {41};
@@ -155,65 +156,66 @@ digraph implicitReceivers_kt {
     47 -> {48};
     48 -> {49};
     49 -> {50};
+    50 -> {51};
 
     subgraph cluster_17 {
         color=red
-        51 [label="Enter function test_2" style="filled" fillcolor=red];
+        52 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_18 {
             color=blue
-            52 [label="Enter block"];
+            53 [label="Enter block"];
             subgraph cluster_19 {
                 color=blue
-                53 [label="Enter when"];
+                54 [label="Enter when"];
                 subgraph cluster_20 {
                     color=blue
-                    54 [label="Enter when branch condition "];
+                    55 [label="Enter when branch condition "];
-                    55 [label="Access variable this@R|/test_2|"];
+                    56 [label="Access variable this@R|/test_2|"];
-                    56 [label="Type operator: (this@R|/test_2| !is R|A|)"];
+                    57 [label="Type operator: (this@R|/test_2| !is R|A|)"];
-                    57 [label="Exit when branch condition"];
+                    58 [label="Exit when branch condition"];
                 }
                 subgraph cluster_21 {
                     color=blue
-                    58 [label="Enter when branch condition else"];
+                    59 [label="Enter when branch condition else"];
-                    59 [label="Exit when branch condition"];
+                    60 [label="Exit when branch condition"];
                 }
-                60 [label="Enter when branch result"];
+                61 [label="Enter when branch result"];
                 subgraph cluster_22 {
                     color=blue
-                    61 [label="Enter block"];
+                    62 [label="Enter block"];
-                    62 [label="Access variable this@R|/test_2|"];
+                    63 [label="Access variable this@R|/test_2|"];
-                    63 [label="Function call: this@R|/test_2|.R|/A.foo|()"];
+                    64 [label="Smart cast: this@R|/test_2|"];
-                    64 [label="Function call: this@R|/test_2|.R|/A.foo|()"];
+                    65 [label="Function call: this@R|/test_2|.R|/A.foo|()"];
-                    65 [label="Exit block"];
+                    66 [label="Function call: this@R|/test_2|.R|/A.foo|()"];
+                    67 [label="Exit block"];
                 }
-                66 [label="Exit when branch result"];
+                68 [label="Exit when branch result"];
-                67 [label="Enter when branch result"];
+                69 [label="Enter when branch result"];
                 subgraph cluster_23 {
                     color=blue
-                    68 [label="Enter block"];
+                    70 [label="Enter block"];
-                    69 [label="Access variable this@R|/test_2|"];
+                    71 [label="Access variable this@R|/test_2|"];
-                    70 [label="Function call: this@R|/test_2|.<Unresolved name: foo>#()"];
+                    72 [label="Function call: this@R|/test_2|.<Unresolved name: foo>#()"];
-                    71 [label="Function call: <Unresolved name: foo>#()"];
+                    73 [label="Function call: <Unresolved name: foo>#()"];
-                    72 [label="Exit block"];
+                    74 [label="Exit block"];
                 }
-                73 [label="Exit when branch result"];
+                75 [label="Exit when branch result"];
-                74 [label="Exit when"];
+                76 [label="Exit when"];
             }
-            75 [label="Access variable this@R|/test_2|"];
+            77 [label="Access variable this@R|/test_2|"];
-            76 [label="Function call: this@R|/test_2|.<Unresolved name: foo>#()"];
+            78 [label="Function call: this@R|/test_2|.<Unresolved name: foo>#()"];
-            77 [label="Function call: <Unresolved name: foo>#()"];
+            79 [label="Function call: <Unresolved name: foo>#()"];
-            78 [label="Exit block"];
+            80 [label="Exit block"];
         }
-        79 [label="Exit function test_2" style="filled" fillcolor=red];
+        81 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    51 -> {52};
     52 -> {53};
     53 -> {54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
-    57 -> {67 58};
+    57 -> {58};
-    58 -> {59};
+    58 -> {69 59};
     59 -> {60};
     60 -> {61};
     61 -> {62};
@@ -221,9 +223,9 @@ digraph implicitReceivers_kt {
     63 -> {64};
     64 -> {65};
     65 -> {66};
-    66 -> {74};
+    66 -> {67};
     67 -> {68};
-    68 -> {69};
+    68 -> {76};
     69 -> {70};
     70 -> {71};
     71 -> {72};
@@ -234,227 +236,234 @@ digraph implicitReceivers_kt {
     76 -> {77};
     77 -> {78};
     78 -> {79};
+    79 -> {80};
+    80 -> {81};
 
     subgraph cluster_24 {
         color=red
-        80 [label="Enter function test_3" style="filled" fillcolor=red];
+        82 [label="Enter function test_3" style="filled" fillcolor=red];
         subgraph cluster_25 {
             color=blue
-            81 [label="Enter block"];
+            83 [label="Enter block"];
-            82 [label="Access variable R|<local>/a|"];
+            84 [label="Access variable R|<local>/a|"];
-            83 [label="Postponed enter to lambda"];
+            85 [label="Postponed enter to lambda"];
             subgraph cluster_26 {
                 color=blue
-                89 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                91 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_27 {
                     color=blue
-                    90 [label="Enter block"];
+                    92 [label="Enter block"];
-                    91 [label="Access variable R|<local>/b|"];
+                    93 [label="Access variable R|<local>/b|"];
-                    92 [label="Postponed enter to lambda"];
+                    94 [label="Postponed enter to lambda"];
                     subgraph cluster_28 {
                         color=blue
-                        97 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                        99 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                         subgraph cluster_29 {
                             color=blue
-                            98 [label="Enter block"];
+                            100 [label="Enter block"];
-                            99 [label="Access variable R|<local>/c|"];
+                            101 [label="Access variable R|<local>/c|"];
-                            100 [label="Postponed enter to lambda"];
+                            102 [label="Postponed enter to lambda"];
                             subgraph cluster_30 {
                                 color=blue
-                                109 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                                112 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                                 subgraph cluster_31 {
                                     color=blue
-                                    110 [label="Enter block"];
+                                    113 [label="Enter block"];
-                                    111 [label="Access variable this@R|special/anonymous|"];
+                                    114 [label="Access variable this@R|special/anonymous|"];
-                                    112 [label="Type operator: (this@R|special/anonymous| as R|A|)"];
+                                    115 [label="Type operator: (this@R|special/anonymous| as R|A|)"];
-                                    113 [label="Access variable this@R|special/anonymous|"];
+                                    116 [label="Access variable this@R|special/anonymous|"];
-                                    114 [label="Function call: this@R|special/anonymous|.R|/A.foo|()"];
+                                    117 [label="Smart cast: this@R|special/anonymous|"];
-                                    115 [label="Function call: this@R|special/anonymous|.R|/A.foo|()"];
+                                    118 [label="Function call: this@R|special/anonymous|.R|/A.foo|()"];
-                                    116 [label="Exit block"];
+                                    119 [label="Function call: this@R|special/anonymous|.R|/A.foo|()"];
+                                    120 [label="Exit block"];
                                 }
-                                117 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                                121 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
                             }
-                            101 [label="Call arguments union" style="filled" fillcolor=yellow];
+                            103 [label="Call arguments union" style="filled" fillcolor=yellow];
-                            102 [label="Postponed exit from lambda"];
+                            104 [label="Postponed exit from lambda"];
-                            103 [label="Function call: R|kotlin/with|<R|kotlin/Any|, R|kotlin/Unit|>(...)"];
+                            105 [label="Function call: R|kotlin/with|<R|kotlin/Any|, R|kotlin/Unit|>(...)"];
-                            104 [label="Access variable this@R|special/anonymous|"];
+                            106 [label="Access variable this@R|special/anonymous|"];
-                            105 [label="Function call: this@R|special/anonymous|.R|/A.foo|()"];
+                            107 [label="Smart cast: this@R|special/anonymous|"];
-                            106 [label="Function call: this@R|special/anonymous|.R|/A.foo|()"];
+                            108 [label="Function call: this@R|special/anonymous|.R|/A.foo|()"];
-                            107 [label="Exit block"];
+                            109 [label="Function call: this@R|special/anonymous|.R|/A.foo|()"];
+                            110 [label="Exit block"];
                         }
-                        108 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                        111 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
                     }
-                    93 [label="Postponed exit from lambda"];
+                    95 [label="Postponed exit from lambda"];
-                    94 [label="Function call: R|kotlin/with|<R|kotlin/Any|, R|kotlin/Unit|>(...)"];
+                    96 [label="Function call: R|kotlin/with|<R|kotlin/Any|, R|kotlin/Unit|>(...)"];
-                    95 [label="Exit block"];
+                    97 [label="Exit block"];
                 }
-                96 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                98 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            84 [label="Call arguments union" style="filled" fillcolor=yellow];
+            86 [label="Call arguments union" style="filled" fillcolor=yellow];
-            85 [label="Postponed exit from lambda"];
+            87 [label="Postponed exit from lambda"];
-            86 [label="Function call: R|kotlin/with|<R|kotlin/Any|, R|kotlin/Unit|>(...)"];
+            88 [label="Function call: R|kotlin/with|<R|kotlin/Any|, R|kotlin/Unit|>(...)"];
-            87 [label="Exit block"];
+            89 [label="Exit block"];
         }
-        88 [label="Exit function test_3" style="filled" fillcolor=red];
+        90 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    80 -> {81};
-    81 -> {82};
     82 -> {83};
-    83 -> {89};
+    83 -> {84};
-    83 -> {85} [color=red];
+    84 -> {85};
-    83 -> {89} [style=dashed];
+    85 -> {91};
-    84 -> {86} [color=red];
+    85 -> {87} [color=red];
-    85 -> {86} [color=green];
+    85 -> {91} [style=dashed];
-    86 -> {87};
+    86 -> {88} [color=red];
-    87 -> {88};
+    87 -> {88} [color=green];
+    88 -> {89};
     89 -> {90};
-    90 -> {91};
     91 -> {92};
-    92 -> {97};
+    92 -> {93};
-    92 -> {93} [color=red];
-    92 -> {97} [style=dashed];
     93 -> {94};
-    94 -> {95};
+    94 -> {99};
+    94 -> {95} [color=red];
+    94 -> {99} [style=dashed];
     95 -> {96};
-    96 -> {84} [color=red];
+    96 -> {97};
-    96 -> {85} [color=green];
     97 -> {98};
-    98 -> {99};
+    98 -> {86} [color=red];
+    98 -> {87} [color=green];
     99 -> {100};
-    100 -> {109};
+    100 -> {101};
-    100 -> {102} [color=red];
+    101 -> {102};
-    100 -> {109} [style=dashed];
+    102 -> {112};
-    101 -> {103} [color=red];
+    102 -> {104} [color=red];
-    102 -> {103} [color=green];
+    102 -> {112} [style=dashed];
-    103 -> {104};
+    103 -> {105} [color=red];
-    104 -> {105};
+    104 -> {105} [color=green];
     105 -> {106};
     106 -> {107};
     107 -> {108};
-    108 -> {93} [color=green];
+    108 -> {109};
     109 -> {110};
     110 -> {111};
-    111 -> {112};
+    111 -> {95} [color=green];
     112 -> {113};
     113 -> {114};
     114 -> {115};
     115 -> {116};
     116 -> {117};
-    117 -> {101} [color=red];
+    117 -> {118};
-    117 -> {102} [color=green];
-
-    subgraph cluster_32 {
-        color=red
-        118 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_33 {
-            color=blue
-            119 [label="Enter block"];
-            subgraph cluster_34 {
-                color=blue
-                120 [label="Enter when"];
-                subgraph cluster_35 {
-                    color=blue
-                    121 [label="Enter when branch condition "];
-                    122 [label="Access variable this@R|/test_4|"];
-                    123 [label="Type operator: (this@R|/test_4| !is R|A|)"];
-                    124 [label="Exit when branch condition"];
-                }
-                subgraph cluster_36 {
-                    color=blue
-                    125 [label="Enter when branch condition "];
-                    126 [label="Access variable this@R|/test_4|"];
-                    127 [label="Type operator: (this@R|/test_4| !is R|B|)"];
-                    128 [label="Exit when branch condition"];
-                }
-                subgraph cluster_37 {
-                    color=blue
-                    129 [label="Enter when branch condition else"];
-                    130 [label="Exit when branch condition"];
-                }
-                131 [label="Enter when branch result"];
-                subgraph cluster_38 {
-                    color=blue
-                    132 [label="Enter block"];
-                    133 [label="Access variable this@R|/test_4|"];
-                    134 [label="Function call: this@R|/test_4|.R|/A.foo|()"];
-                    135 [label="Function call: this@R|/test_4|.R|/A.foo|()"];
-                    136 [label="Access variable this@R|/test_4|"];
-                    137 [label="Function call: this@R|/test_4|.R|/B.bar|()"];
-                    138 [label="Function call: this@R|/test_4|.R|/B.bar|()"];
-                    139 [label="Exit block"];
-                }
-                140 [label="Exit when branch result"];
-                141 [label="Enter when branch result"];
-                subgraph cluster_39 {
-                    color=blue
-                    142 [label="Enter block"];
-                    143 [label="Access variable this@R|/test_4|"];
-                    144 [label="Function call: this@R|/test_4|.<Unresolved name: bar>#()"];
-                    145 [label="Function call: <Unresolved name: bar>#()"];
-                    146 [label="Access variable this@R|/test_4|"];
-                    147 [label="Function call: this@R|/test_4|.R|/A.foo|()"];
-                    148 [label="Function call: this@R|/test_4|.R|/A.foo|()"];
-                    149 [label="Exit block"];
-                }
-                150 [label="Exit when branch result"];
-                151 [label="Enter when branch result"];
-                subgraph cluster_40 {
-                    color=blue
-                    152 [label="Enter block"];
-                    153 [label="Access variable this@R|/test_4|"];
-                    154 [label="Function call: this@R|/test_4|.<Unresolved name: foo>#()"];
-                    155 [label="Function call: <Unresolved name: foo>#()"];
-                    156 [label="Access variable this@R|/test_4|"];
-                    157 [label="Function call: this@R|/test_4|.<Unresolved name: bar>#()"];
-                    158 [label="Function call: <Unresolved name: bar>#()"];
-                    159 [label="Exit block"];
-                }
-                160 [label="Exit when branch result"];
-                161 [label="Exit when"];
-            }
-            162 [label="Access variable this@R|/test_4|"];
-            163 [label="Function call: this@R|/test_4|.<Unresolved name: foo>#()"];
-            164 [label="Function call: <Unresolved name: foo>#()"];
-            165 [label="Access variable this@R|/test_4|"];
-            166 [label="Function call: this@R|/test_4|.<Unresolved name: bar>#()"];
-            167 [label="Function call: <Unresolved name: bar>#()"];
-            168 [label="Exit block"];
-        }
-        169 [label="Exit function test_4" style="filled" fillcolor=red];
-    }
     118 -> {119};
     119 -> {120};
     120 -> {121};
-    121 -> {122};
+    121 -> {103} [color=red];
+    121 -> {104} [color=green];
+
+    subgraph cluster_32 {
+        color=red
+        122 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_33 {
+            color=blue
+            123 [label="Enter block"];
+            subgraph cluster_34 {
+                color=blue
+                124 [label="Enter when"];
+                subgraph cluster_35 {
+                    color=blue
+                    125 [label="Enter when branch condition "];
+                    126 [label="Access variable this@R|/test_4|"];
+                    127 [label="Type operator: (this@R|/test_4| !is R|A|)"];
+                    128 [label="Exit when branch condition"];
+                }
+                subgraph cluster_36 {
+                    color=blue
+                    129 [label="Enter when branch condition "];
+                    130 [label="Access variable this@R|/test_4|"];
+                    131 [label="Smart cast: this@R|/test_4|"];
+                    132 [label="Type operator: (this@R|/test_4| !is R|B|)"];
+                    133 [label="Exit when branch condition"];
+                }
+                subgraph cluster_37 {
+                    color=blue
+                    134 [label="Enter when branch condition else"];
+                    135 [label="Exit when branch condition"];
+                }
+                136 [label="Enter when branch result"];
+                subgraph cluster_38 {
+                    color=blue
+                    137 [label="Enter block"];
+                    138 [label="Access variable this@R|/test_4|"];
+                    139 [label="Smart cast: this@R|/test_4|"];
+                    140 [label="Function call: this@R|/test_4|.R|/A.foo|()"];
+                    141 [label="Function call: this@R|/test_4|.R|/A.foo|()"];
+                    142 [label="Access variable this@R|/test_4|"];
+                    143 [label="Smart cast: this@R|/test_4|"];
+                    144 [label="Function call: this@R|/test_4|.R|/B.bar|()"];
+                    145 [label="Function call: this@R|/test_4|.R|/B.bar|()"];
+                    146 [label="Exit block"];
+                }
+                147 [label="Exit when branch result"];
+                148 [label="Enter when branch result"];
+                subgraph cluster_39 {
+                    color=blue
+                    149 [label="Enter block"];
+                    150 [label="Access variable this@R|/test_4|"];
+                    151 [label="Smart cast: this@R|/test_4|"];
+                    152 [label="Function call: this@R|/test_4|.<Unresolved name: bar>#()"];
+                    153 [label="Function call: <Unresolved name: bar>#()"];
+                    154 [label="Access variable this@R|/test_4|"];
+                    155 [label="Smart cast: this@R|/test_4|"];
+                    156 [label="Function call: this@R|/test_4|.R|/A.foo|()"];
+                    157 [label="Function call: this@R|/test_4|.R|/A.foo|()"];
+                    158 [label="Exit block"];
+                }
+                159 [label="Exit when branch result"];
+                160 [label="Enter when branch result"];
+                subgraph cluster_40 {
+                    color=blue
+                    161 [label="Enter block"];
+                    162 [label="Access variable this@R|/test_4|"];
+                    163 [label="Function call: this@R|/test_4|.<Unresolved name: foo>#()"];
+                    164 [label="Function call: <Unresolved name: foo>#()"];
+                    165 [label="Access variable this@R|/test_4|"];
+                    166 [label="Function call: this@R|/test_4|.<Unresolved name: bar>#()"];
+                    167 [label="Function call: <Unresolved name: bar>#()"];
+                    168 [label="Exit block"];
+                }
+                169 [label="Exit when branch result"];
+                170 [label="Exit when"];
+            }
+            171 [label="Access variable this@R|/test_4|"];
+            172 [label="Function call: this@R|/test_4|.<Unresolved name: foo>#()"];
+            173 [label="Function call: <Unresolved name: foo>#()"];
+            174 [label="Access variable this@R|/test_4|"];
+            175 [label="Function call: this@R|/test_4|.<Unresolved name: bar>#()"];
+            176 [label="Function call: <Unresolved name: bar>#()"];
+            177 [label="Exit block"];
+        }
+        178 [label="Exit function test_4" style="filled" fillcolor=red];
+    }
     122 -> {123};
     123 -> {124};
-    124 -> {151 125};
+    124 -> {125};
     125 -> {126};
     126 -> {127};
     127 -> {128};
-    128 -> {141 129};
+    128 -> {160 129};
     129 -> {130};
     130 -> {131};
     131 -> {132};
     132 -> {133};
-    133 -> {134};
+    133 -> {148 134};
     134 -> {135};
     135 -> {136};
     136 -> {137};
     137 -> {138};
     138 -> {139};
     139 -> {140};
-    140 -> {161};
+    140 -> {141};
     141 -> {142};
     142 -> {143};
     143 -> {144};
     144 -> {145};
     145 -> {146};
     146 -> {147};
-    147 -> {148};
+    147 -> {170};
     148 -> {149};
     149 -> {150};
-    150 -> {161};
+    150 -> {151};
     151 -> {152};
     152 -> {153};
     153 -> {154};
@@ -463,7 +472,7 @@ digraph implicitReceivers_kt {
     156 -> {157};
     157 -> {158};
     158 -> {159};
-    159 -> {160};
+    159 -> {170};
     160 -> {161};
     161 -> {162};
     162 -> {163};
@@ -473,62 +482,71 @@ digraph implicitReceivers_kt {
     166 -> {167};
     167 -> {168};
     168 -> {169};
+    169 -> {170};
+    170 -> {171};
+    171 -> {172};
+    172 -> {173};
+    173 -> {174};
+    174 -> {175};
+    175 -> {176};
+    176 -> {177};
+    177 -> {178};
 
     subgraph cluster_41 {
         color=red
-        170 [label="Enter function test_5" style="filled" fillcolor=red];
+        179 [label="Enter function test_5" style="filled" fillcolor=red];
         subgraph cluster_42 {
             color=blue
-            171 [label="Enter block"];
+            180 [label="Enter block"];
             subgraph cluster_43 {
                 color=blue
-                172 [label="Enter when"];
+                181 [label="Enter when"];
                 subgraph cluster_44 {
                     color=blue
-                    173 [label="Enter when branch condition "];
+                    182 [label="Enter when branch condition "];
-                    174 [label="Access variable this@R|/test_5|"];
+                    183 [label="Access variable this@R|/test_5|"];
-                    175 [label="Type operator: (this@R|/test_5| is R|kotlin/collections/List<*>|)"];
+                    184 [label="Type operator: (this@R|/test_5| is R|kotlin/collections/List<*>|)"];
-                    176 [label="Exit when branch condition"];
+                    185 [label="Exit when branch condition"];
                 }
                 subgraph cluster_45 {
                     color=blue
-                    177 [label="Enter when branch condition "];
+                    186 [label="Enter when branch condition "];
-                    178 [label="Access variable this@R|/test_5|"];
+                    187 [label="Access variable this@R|/test_5|"];
-                    179 [label="Type operator: (this@R|/test_5| is R|kotlin/String|)"];
+                    188 [label="Type operator: (this@R|/test_5| is R|kotlin/String|)"];
-                    180 [label="Exit when branch condition"];
+                    189 [label="Exit when branch condition"];
                 }
                 subgraph cluster_46 {
                     color=blue
-                    181 [label="Enter when branch condition else"];
+                    190 [label="Enter when branch condition else"];
-                    182 [label="Exit when branch condition"];
+                    191 [label="Exit when branch condition"];
                 }
-                183 [label="Enter when branch result"];
+                192 [label="Enter when branch result"];
                 subgraph cluster_47 {
                     color=blue
-                    184 [label="Enter block"];
+                    193 [label="Enter block"];
-                    185 [label="Const: Int(0)"];
+                    194 [label="Const: Int(0)"];
-                    186 [label="Exit block"];
+                    195 [label="Exit block"];
                 }
-                187 [label="Exit when branch result"];
+                196 [label="Exit when branch result"];
-                188 [label="Enter when branch result"];
+                197 [label="Enter when branch result"];
                 subgraph cluster_48 {
                     color=blue
-                    189 [label="Enter block"];
+                    198 [label="Enter block"];
-                    190 [label="Access variable R|kotlin/String.length|"];
+                    199 [label="Access variable R|kotlin/String.length|"];
-                    191 [label="Exit block"];
+                    200 [label="Exit block"];
                 }
-                192 [label="Exit when branch result"];
+                201 [label="Exit when branch result"];
-                193 [label="Enter when branch result"];
+                202 [label="Enter when branch result"];
                 subgraph cluster_49 {
                     color=blue
-                    194 [label="Enter block"];
+                    203 [label="Enter block"];
-                    195 [label="Access variable R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|"];
+                    204 [label="Access variable R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|"];
-                    196 [label="Exit block"];
+                    205 [label="Exit block"];
                 }
-                197 [label="Exit when branch result"];
+                206 [label="Exit when branch result"];
-                198 [label="Exit when"];
+                207 [label="Exit when"];
             }
-            199 [label="Jump: ^test_5 when () {
+            208 [label="Jump: ^test_5 when () {
     (this@R|/test_5| is R|kotlin/collections/List<*>|) ->  {
         this@R|/test_5|.R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|
     }
@@ -540,69 +558,71 @@ digraph implicitReceivers_kt {
     }
 }
 "];
-            200 [label="Stub" style="filled" fillcolor=gray];
+            209 [label="Stub" style="filled" fillcolor=gray];
-            201 [label="Exit block" style="filled" fillcolor=gray];
+            210 [label="Exit block" style="filled" fillcolor=gray];
         }
-        202 [label="Exit function test_5" style="filled" fillcolor=red];
+        211 [label="Exit function test_5" style="filled" fillcolor=red];
     }
-    170 -> {171};
-    171 -> {172};
-    172 -> {173};
-    173 -> {174};
-    174 -> {175};
-    175 -> {176};
-    176 -> {193 177};
-    177 -> {178};
-    178 -> {179};
     179 -> {180};
-    180 -> {188 181};
+    180 -> {181};
     181 -> {182};
     182 -> {183};
     183 -> {184};
     184 -> {185};
-    185 -> {186};
+    185 -> {202 186};
     186 -> {187};
-    187 -> {198};
+    187 -> {188};
     188 -> {189};
-    189 -> {190};
+    189 -> {197 190};
     190 -> {191};
     191 -> {192};
-    192 -> {198};
+    192 -> {193};
     193 -> {194};
     194 -> {195};
     195 -> {196};
-    196 -> {197};
+    196 -> {207};
     197 -> {198};
     198 -> {199};
-    199 -> {202};
+    199 -> {200};
-    199 -> {200} [style=dotted];
+    200 -> {201};
-    200 -> {201} [style=dotted];
+    201 -> {207};
-    201 -> {202} [style=dotted];
+    202 -> {203};
-
-    subgraph cluster_50 {
-        color=red
-        203 [label="Enter function test_6" style="filled" fillcolor=red];
-        subgraph cluster_51 {
-            color=blue
-            204 [label="Enter block"];
-            205 [label="Access variable this@R|/test_6|"];
-            206 [label="Type operator: (this@R|/test_6| as R|kotlin/collections/List<*>|)"];
-            207 [label="Access variable R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|"];
-            208 [label="Access variable this@R|/test_6|"];
-            209 [label="Type operator: (this@R|/test_6| as R|kotlin/String|)"];
-            210 [label="Access variable R|kotlin/String.length|"];
-            211 [label="Exit block"];
-        }
-        212 [label="Exit function test_6" style="filled" fillcolor=red];
-    }
     203 -> {204};
     204 -> {205};
     205 -> {206};
     206 -> {207};
     207 -> {208};
-    208 -> {209};
+    208 -> {211};
-    209 -> {210};
+    208 -> {209} [style=dotted];
-    210 -> {211};
+    209 -> {210} [style=dotted];
-    211 -> {212};
+    210 -> {211} [style=dotted];
+
+    subgraph cluster_50 {
+        color=red
+        212 [label="Enter function test_6" style="filled" fillcolor=red];
+        subgraph cluster_51 {
+            color=blue
+            213 [label="Enter block"];
+            214 [label="Access variable this@R|/test_6|"];
+            215 [label="Type operator: (this@R|/test_6| as R|kotlin/collections/List<*>|)"];
+            216 [label="Access variable R|SubstitutionOverride<kotlin/collections/List.size: R|kotlin/Int|>|"];
+            217 [label="Access variable this@R|/test_6|"];
+            218 [label="Smart cast: this@R|/test_6|"];
+            219 [label="Type operator: (this@R|/test_6| as R|kotlin/String|)"];
+            220 [label="Access variable R|kotlin/String.length|"];
+            221 [label="Exit block"];
+        }
+        222 [label="Exit function test_6" style="filled" fillcolor=red];
+    }
+    212 -> {213};
+    213 -> {214};
+    214 -> {215};
+    215 -> {216};
+    216 -> {217};
+    217 -> {218};
+    218 -> {219};
+    219 -> {220};
+    220 -> {221};
+    221 -> {222};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/thisOfExtensionProperty.dot

@@ -67,28 +67,30 @@ digraph thisOfExtensionProperty_kt {
                 22 [label="Exit left part of &&"];
                 23 [label="Enter right part of &&"];
                 24 [label="Access variable this@R|/check_2|"];
-                25 [label="Access variable R|/B.b|"];
+                25 [label="Smart cast: this@R|/check_2|"];
-                26 [label="Exit &&"];
+                26 [label="Access variable R|/B.b|"];
+                27 [label="Exit &&"];
             }
-            27 [label="Jump: ^ (this@R|/check_2| is R|B|) && this@R|/check_2|.R|/B.b|"];
+            28 [label="Jump: ^ (this@R|/check_2| is R|B|) && this@R|/check_2|.R|/B.b|"];
-            28 [label="Stub" style="filled" fillcolor=gray];
+            29 [label="Stub" style="filled" fillcolor=gray];
-            29 [label="Exit block" style="filled" fillcolor=gray];
+            30 [label="Exit block" style="filled" fillcolor=gray];
         }
-        30 [label="Exit function getter" style="filled" fillcolor=red];
+        31 [label="Exit function getter" style="filled" fillcolor=red];
     }
     17 -> {18};
     18 -> {19};
     19 -> {20};
     20 -> {21};
     21 -> {22};
-    22 -> {26 23};
+    22 -> {27 23};
     23 -> {24};
     24 -> {25};
     25 -> {26};
     26 -> {27};
-    27 -> {30};
+    27 -> {28};
-    27 -> {28} [style=dotted];
+    28 -> {31};
     28 -> {29} [style=dotted];
     29 -> {30} [style=dotted];
+    30 -> {31} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/assignSafeCall.dot

@@ -96,15 +96,16 @@ digraph assignSafeCall_kt {
                     color=blue
                     35 [label="Enter block"];
                     36 [label="Access variable R|<local>/a|"];
-                    37 [label="Function call: R|<local>/a|.R|/A.bar|()"];
+                    37 [label="Smart cast: R|<local>/a|"];
-                    38 [label="Exit block"];
+                    38 [label="Function call: R|<local>/a|.R|/A.bar|()"];
+                    39 [label="Exit block"];
                 }
-                39 [label="Exit when branch result"];
+                40 [label="Exit when branch result"];
-                40 [label="Exit when"];
+                41 [label="Exit when"];
             }
-            41 [label="Exit block"];
+            42 [label="Exit block"];
         }
-        42 [label="Exit function test_1" style="filled" fillcolor=red];
+        43 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     20 -> {21};
     21 -> {22};
@@ -119,7 +120,7 @@ digraph assignSafeCall_kt {
     30 -> {31};
     31 -> {32};
     32 -> {34 33};
-    33 -> {40};
+    33 -> {41};
     34 -> {35};
     35 -> {36};
     36 -> {37};
@@ -128,49 +129,50 @@ digraph assignSafeCall_kt {
     39 -> {40};
     40 -> {41};
     41 -> {42};
+    42 -> {43};
 
     subgraph cluster_12 {
         color=red
-        43 [label="Enter function test_2" style="filled" fillcolor=red];
+        44 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_13 {
             color=blue
-            44 [label="Enter block"];
+            45 [label="Enter block"];
-            45 [label="Access variable R|<local>/a|"];
+            46 [label="Access variable R|<local>/a|"];
-            46 [label="Enter safe call"];
+            47 [label="Enter safe call"];
-            47 [label="Function call: $subj$.R|/A.foo|()"];
+            48 [label="Function call: $subj$.R|/A.foo|()"];
-            48 [label="Exit safe call"];
+            49 [label="Exit safe call"];
-            49 [label="Variable declaration: lval x: R|kotlin/Int?|"];
+            50 [label="Variable declaration: lval x: R|kotlin/Int?|"];
             subgraph cluster_14 {
                 color=blue
-                50 [label="Enter when"];
+                51 [label="Enter when"];
                 subgraph cluster_15 {
                     color=blue
-                    51 [label="Enter when branch condition "];
+                    52 [label="Enter when branch condition "];
-                    52 [label="Access variable R|<local>/x|"];
+                    53 [label="Access variable R|<local>/x|"];
-                    53 [label="Const: Null(null)"];
+                    54 [label="Const: Null(null)"];
-                    54 [label="Equality operator !="];
+                    55 [label="Equality operator !="];
-                    55 [label="Exit when branch condition"];
+                    56 [label="Exit when branch condition"];
                 }
-                56 [label="Synthetic else branch"];
+                57 [label="Synthetic else branch"];
-                57 [label="Enter when branch result"];
+                58 [label="Enter when branch result"];
                 subgraph cluster_16 {
                     color=blue
-                    58 [label="Enter block"];
+                    59 [label="Enter block"];
-                    59 [label="Access variable R|<local>/a|"];
+                    60 [label="Access variable R|<local>/a|"];
-                    60 [label="Function call: R|<local>/a|.R|/A.bar|()"];
+                    61 [label="Smart cast: R|<local>/a|"];
-                    61 [label="Exit block"];
+                    62 [label="Function call: R|<local>/a|.R|/A.bar|()"];
+                    63 [label="Exit block"];
                 }
-                62 [label="Exit when branch result"];
+                64 [label="Exit when branch result"];
-                63 [label="Exit when"];
+                65 [label="Exit when"];
             }
-            64 [label="Exit block"];
+            66 [label="Exit block"];
         }
-        65 [label="Exit function test_2" style="filled" fillcolor=red];
+        67 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    43 -> {44};
     44 -> {45};
-    45 -> {46 48};
+    45 -> {46};
-    46 -> {47};
+    46 -> {47 49};
     47 -> {48};
     48 -> {49};
     49 -> {50};
@@ -179,9 +181,9 @@ digraph assignSafeCall_kt {
     52 -> {53};
     53 -> {54};
     54 -> {55};
-    55 -> {57 56};
+    55 -> {56};
-    56 -> {63};
+    56 -> {58 57};
-    57 -> {58};
+    57 -> {65};
     58 -> {59};
     59 -> {60};
     60 -> {61};
@@ -189,230 +191,240 @@ digraph assignSafeCall_kt {
     62 -> {63};
     63 -> {64};
     64 -> {65};
+    65 -> {66};
+    66 -> {67};
 
     subgraph cluster_17 {
         color=red
-        66 [label="Enter function test_3" style="filled" fillcolor=red];
+        68 [label="Enter function test_3" style="filled" fillcolor=red];
         subgraph cluster_18 {
             color=blue
-            67 [label="Enter block"];
+            69 [label="Enter block"];
-            68 [label="Access variable R|<local>/x|"];
+            70 [label="Access variable R|<local>/x|"];
-            69 [label="Type operator: (R|<local>/x| as? R|A|)"];
+            71 [label="Type operator: (R|<local>/x| as? R|A|)"];
-            70 [label="Exit lhs of ?:"];
+            72 [label="Exit lhs of ?:"];
-            71 [label="Enter rhs of ?:"];
+            73 [label="Enter rhs of ?:"];
-            72 [label="Jump: ^test_3 Unit"];
+            74 [label="Jump: ^test_3 Unit"];
-            73 [label="Stub" style="filled" fillcolor=gray];
+            75 [label="Stub" style="filled" fillcolor=gray];
-            74 [label="Lhs of ?: is not null"];
+            76 [label="Lhs of ?: is not null"];
-            75 [label="Exit ?:"];
+            77 [label="Exit ?:"];
-            76 [label="Variable declaration: lval a: R|A|"];
+            78 [label="Variable declaration: lval a: R|A|"];
-            77 [label="Access variable R|<local>/a|"];
+            79 [label="Access variable R|<local>/a|"];
-            78 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+            80 [label="Function call: R|<local>/a|.R|/A.foo|()"];
-            79 [label="Access variable R|<local>/x|"];
+            81 [label="Access variable R|<local>/x|"];
-            80 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+            82 [label="Smart cast: R|<local>/x|"];
-            81 [label="Exit block"];
+            83 [label="Function call: R|<local>/x|.R|/A.foo|()"];
+            84 [label="Exit block"];
         }
-        82 [label="Exit function test_3" style="filled" fillcolor=red];
+        85 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    66 -> {67};
-    67 -> {68};
     68 -> {69};
     69 -> {70};
-    70 -> {74 71};
+    70 -> {71};
     71 -> {72};
-    72 -> {82};
+    72 -> {76 73};
-    72 -> {73} [style=dotted];
+    73 -> {74};
-    73 -> {75} [style=dotted];
+    74 -> {85};
-    74 -> {75};
+    74 -> {75} [style=dotted];
-    75 -> {76};
+    75 -> {77} [style=dotted];
     76 -> {77};
     77 -> {78};
     78 -> {79};
     79 -> {80};
     80 -> {81};
     81 -> {82};
+    82 -> {83};
+    83 -> {84};
+    84 -> {85};
 
     subgraph cluster_19 {
         color=red
-        83 [label="Enter function foo" style="filled" fillcolor=red];
+        86 [label="Enter function foo" style="filled" fillcolor=red];
-        84 [label="Exit function foo" style="filled" fillcolor=red];
+        87 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    83 -> {84};
+    86 -> {87};
 
     subgraph cluster_20 {
         color=red
-        85 [label="Enter function bar" style="filled" fillcolor=red];
+        88 [label="Enter function bar" style="filled" fillcolor=red];
-        86 [label="Exit function bar" style="filled" fillcolor=red];
+        89 [label="Exit function bar" style="filled" fillcolor=red];
     }
-    85 -> {86};
+    88 -> {89};
 
     subgraph cluster_21 {
         color=red
-        87 [label="Enter class B" style="filled" fillcolor=red];
+        90 [label="Enter class B" style="filled" fillcolor=red];
-        88 [label="Exit class B" style="filled" fillcolor=red];
+        91 [label="Exit class B" style="filled" fillcolor=red];
     }
-    87 -> {88} [color=green];
+    90 -> {91} [color=green];
 
     subgraph cluster_22 {
         color=red
-        89 [label="Enter function test_1" style="filled" fillcolor=red];
+        92 [label="Enter function test_1" style="filled" fillcolor=red];
         subgraph cluster_23 {
             color=blue
-            90 [label="Enter block"];
+            93 [label="Enter block"];
-            91 [label="Access variable R|<local>/a|"];
+            94 [label="Access variable R|<local>/a|"];
-            92 [label="Enter safe call"];
+            95 [label="Enter safe call"];
-            93 [label="Access variable R|/B.x|"];
+            96 [label="Access variable R|/B.x|"];
-            94 [label="Exit safe call"];
+            97 [label="Exit safe call"];
-            95 [label="Variable declaration: lval x: R|kotlin/Int?|"];
+            98 [label="Variable declaration: lval x: R|kotlin/Int?|"];
             subgraph cluster_24 {
                 color=blue
-                96 [label="Enter when"];
+                99 [label="Enter when"];
                 subgraph cluster_25 {
                     color=blue
-                    97 [label="Enter when branch condition "];
+                    100 [label="Enter when branch condition "];
-                    98 [label="Access variable R|<local>/x|"];
+                    101 [label="Access variable R|<local>/x|"];
-                    99 [label="Const: Null(null)"];
+                    102 [label="Const: Null(null)"];
-                    100 [label="Equality operator !="];
+                    103 [label="Equality operator !="];
-                    101 [label="Exit when branch condition"];
+                    104 [label="Exit when branch condition"];
                 }
-                102 [label="Synthetic else branch"];
+                105 [label="Synthetic else branch"];
-                103 [label="Enter when branch result"];
+                106 [label="Enter when branch result"];
                 subgraph cluster_26 {
                     color=blue
-                    104 [label="Enter block"];
+                    107 [label="Enter block"];
-                    105 [label="Access variable R|<local>/a|"];
+                    108 [label="Access variable R|<local>/a|"];
-                    106 [label="Function call: R|<local>/a|.R|/B.bar|()"];
+                    109 [label="Smart cast: R|<local>/a|"];
-                    107 [label="Exit block"];
+                    110 [label="Function call: R|<local>/a|.R|/B.bar|()"];
+                    111 [label="Exit block"];
                 }
-                108 [label="Exit when branch result"];
+                112 [label="Exit when branch result"];
-                109 [label="Exit when"];
+                113 [label="Exit when"];
             }
-            110 [label="Exit block"];
+            114 [label="Exit block"];
         }
-        111 [label="Exit function test_1" style="filled" fillcolor=red];
+        115 [label="Exit function test_1" style="filled" fillcolor=red];
     }
-    89 -> {90};
-    90 -> {91};
-    91 -> {92 94};
     92 -> {93};
     93 -> {94};
-    94 -> {95};
+    94 -> {95 97};
     95 -> {96};
     96 -> {97};
     97 -> {98};
     98 -> {99};
     99 -> {100};
     100 -> {101};
-    101 -> {103 102};
+    101 -> {102};
-    102 -> {109};
+    102 -> {103};
     103 -> {104};
-    104 -> {105};
+    104 -> {106 105};
-    105 -> {106};
+    105 -> {113};
     106 -> {107};
     107 -> {108};
     108 -> {109};
     109 -> {110};
     110 -> {111};
+    111 -> {112};
+    112 -> {113};
+    113 -> {114};
+    114 -> {115};
 
     subgraph cluster_27 {
         color=red
-        112 [label="Enter function test_2" style="filled" fillcolor=red];
+        116 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_28 {
             color=blue
-            113 [label="Enter block"];
+            117 [label="Enter block"];
-            114 [label="Access variable R|<local>/a|"];
+            118 [label="Access variable R|<local>/a|"];
-            115 [label="Enter safe call"];
+            119 [label="Enter safe call"];
-            116 [label="Function call: $subj$.R|/B.foo|()"];
+            120 [label="Function call: $subj$.R|/B.foo|()"];
-            117 [label="Exit safe call"];
+            121 [label="Exit safe call"];
-            118 [label="Variable declaration: lval x: R|kotlin/Int?|"];
+            122 [label="Variable declaration: lval x: R|kotlin/Int?|"];
             subgraph cluster_29 {
                 color=blue
-                119 [label="Enter when"];
+                123 [label="Enter when"];
                 subgraph cluster_30 {
                     color=blue
-                    120 [label="Enter when branch condition "];
+                    124 [label="Enter when branch condition "];
-                    121 [label="Access variable R|<local>/x|"];
+                    125 [label="Access variable R|<local>/x|"];
-                    122 [label="Const: Null(null)"];
+                    126 [label="Const: Null(null)"];
-                    123 [label="Equality operator !="];
+                    127 [label="Equality operator !="];
-                    124 [label="Exit when branch condition"];
+                    128 [label="Exit when branch condition"];
                 }
-                125 [label="Synthetic else branch"];
+                129 [label="Synthetic else branch"];
-                126 [label="Enter when branch result"];
+                130 [label="Enter when branch result"];
                 subgraph cluster_31 {
                     color=blue
-                    127 [label="Enter block"];
+                    131 [label="Enter block"];
-                    128 [label="Access variable R|<local>/a|"];
+                    132 [label="Access variable R|<local>/a|"];
-                    129 [label="Function call: R|<local>/a|.R|/B.bar|()"];
+                    133 [label="Smart cast: R|<local>/a|"];
-                    130 [label="Exit block"];
+                    134 [label="Function call: R|<local>/a|.R|/B.bar|()"];
+                    135 [label="Exit block"];
                 }
-                131 [label="Exit when branch result"];
+                136 [label="Exit when branch result"];
-                132 [label="Exit when"];
+                137 [label="Exit when"];
             }
-            133 [label="Exit block"];
+            138 [label="Exit block"];
         }
-        134 [label="Exit function test_2" style="filled" fillcolor=red];
+        139 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    112 -> {113};
-    113 -> {114};
-    114 -> {115 117};
-    115 -> {116};
     116 -> {117};
     117 -> {118};
-    118 -> {119};
+    118 -> {119 121};
     119 -> {120};
     120 -> {121};
     121 -> {122};
     122 -> {123};
     123 -> {124};
-    124 -> {126 125};
+    124 -> {125};
-    125 -> {132};
+    125 -> {126};
     126 -> {127};
     127 -> {128};
-    128 -> {129};
+    128 -> {130 129};
-    129 -> {130};
+    129 -> {137};
     130 -> {131};
     131 -> {132};
     132 -> {133};
     133 -> {134};
-
+    134 -> {135};
-    subgraph cluster_32 {
-        color=red
-        135 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_33 {
-            color=blue
-            136 [label="Enter block"];
-            137 [label="Access variable R|<local>/x|"];
-            138 [label="Type operator: (R|<local>/x| as? R|B|)"];
-            139 [label="Exit lhs of ?:"];
-            140 [label="Enter rhs of ?:"];
-            141 [label="Jump: ^test_3 Unit"];
-            142 [label="Stub" style="filled" fillcolor=gray];
-            143 [label="Lhs of ?: is not null"];
-            144 [label="Exit ?:"];
-            145 [label="Variable declaration: lval a: R|B|"];
-            146 [label="Access variable R|<local>/a|"];
-            147 [label="Function call: R|<local>/a|.R|/B.foo|()"];
-            148 [label="Access variable R|<local>/x|"];
-            149 [label="Function call: R|<local>/x|.R|/B.foo|()"];
-            150 [label="Exit block"];
-        }
-        151 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
     135 -> {136};
     136 -> {137};
     137 -> {138};
     138 -> {139};
-    139 -> {143 140};
+
+    subgraph cluster_32 {
+        color=red
+        140 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_33 {
+            color=blue
+            141 [label="Enter block"];
+            142 [label="Access variable R|<local>/x|"];
+            143 [label="Type operator: (R|<local>/x| as? R|B|)"];
+            144 [label="Exit lhs of ?:"];
+            145 [label="Enter rhs of ?:"];
+            146 [label="Jump: ^test_3 Unit"];
+            147 [label="Stub" style="filled" fillcolor=gray];
+            148 [label="Lhs of ?: is not null"];
+            149 [label="Exit ?:"];
+            150 [label="Variable declaration: lval a: R|B|"];
+            151 [label="Access variable R|<local>/a|"];
+            152 [label="Function call: R|<local>/a|.R|/B.foo|()"];
+            153 [label="Access variable R|<local>/x|"];
+            154 [label="Smart cast: R|<local>/x|"];
+            155 [label="Function call: R|<local>/x|.R|/B.foo|()"];
+            156 [label="Exit block"];
+        }
+        157 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
     140 -> {141};
-    141 -> {151};
+    141 -> {142};
-    141 -> {142} [style=dotted];
+    142 -> {143};
-    142 -> {144} [style=dotted];
     143 -> {144};
-    144 -> {145};
+    144 -> {148 145};
     145 -> {146};
-    146 -> {147};
+    146 -> {157};
-    147 -> {148};
+    146 -> {147} [style=dotted];
+    147 -> {149} [style=dotted];
     148 -> {149};
     149 -> {150};
     150 -> {151};
+    151 -> {152};
+    152 -> {153};
+    153 -> {154};
+    154 -> {155};
+    155 -> {156};
+    156 -> {157};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.dot

@@ -63,15 +63,16 @@ digraph safeCallAndEqualityToBool_kt {
                     color=blue
                     27 [label="Enter block"];
                     28 [label="Access variable R|<local>/s|"];
-                    29 [label="Access variable R|kotlin/String.length|"];
+                    29 [label="Smart cast: R|<local>/s|"];
-                    30 [label="Exit block"];
+                    30 [label="Access variable R|kotlin/String.length|"];
+                    31 [label="Exit block"];
                 }
-                31 [label="Exit when branch result"];
+                32 [label="Exit when branch result"];
-                32 [label="Exit when"];
+                33 [label="Exit when"];
             }
-            33 [label="Exit block"];
+            34 [label="Exit block"];
         }
-        34 [label="Exit function test_1" style="filled" fillcolor=red];
+        35 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     7 -> {8};
     8 -> {9};
@@ -91,7 +92,7 @@ digraph safeCallAndEqualityToBool_kt {
     22 -> {23};
     23 -> {24};
     24 -> {25};
-    25 -> {32};
+    25 -> {33};
     26 -> {27};
     27 -> {28};
     28 -> {29};
@@ -100,76 +101,77 @@ digraph safeCallAndEqualityToBool_kt {
     31 -> {32};
     32 -> {33};
     33 -> {34};
+    34 -> {35};
 
     subgraph cluster_9 {
         color=red
-        35 [label="Enter function test_2" style="filled" fillcolor=red];
+        36 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_10 {
             color=blue
-            36 [label="Enter block"];
+            37 [label="Enter block"];
             subgraph cluster_11 {
                 color=blue
-                37 [label="Enter when"];
+                38 [label="Enter when"];
                 subgraph cluster_12 {
                     color=blue
-                    38 [label="Enter when branch condition "];
+                    39 [label="Enter when branch condition "];
-                    39 [label="Access variable R|<local>/s|"];
+                    40 [label="Access variable R|<local>/s|"];
-                    40 [label="Enter safe call"];
+                    41 [label="Enter safe call"];
-                    41 [label="Function call: $subj$.R|/check|()"];
+                    42 [label="Function call: $subj$.R|/check|()"];
-                    42 [label="Exit safe call"];
+                    43 [label="Exit safe call"];
-                    43 [label="Const: Boolean(false)"];
+                    44 [label="Const: Boolean(false)"];
-                    44 [label="Equality operator =="];
+                    45 [label="Equality operator =="];
-                    45 [label="Exit when branch condition"];
+                    46 [label="Exit when branch condition"];
                 }
                 subgraph cluster_13 {
                     color=blue
-                    46 [label="Enter when branch condition else"];
+                    47 [label="Enter when branch condition else"];
-                    47 [label="Exit when branch condition"];
+                    48 [label="Exit when branch condition"];
                 }
-                48 [label="Enter when branch result"];
+                49 [label="Enter when branch result"];
                 subgraph cluster_14 {
                     color=blue
-                    49 [label="Enter block"];
+                    50 [label="Enter block"];
-                    50 [label="Access variable R|<local>/s|"];
+                    51 [label="Access variable R|<local>/s|"];
-                    51 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
+                    52 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
-                    52 [label="Exit block"];
+                    53 [label="Exit block"];
                 }
-                53 [label="Exit when branch result"];
+                54 [label="Exit when branch result"];
-                54 [label="Enter when branch result"];
+                55 [label="Enter when branch result"];
                 subgraph cluster_15 {
                     color=blue
-                    55 [label="Enter block"];
+                    56 [label="Enter block"];
-                    56 [label="Access variable R|<local>/s|"];
+                    57 [label="Access variable R|<local>/s|"];
-                    57 [label="Access variable R|kotlin/String.length|"];
+                    58 [label="Smart cast: R|<local>/s|"];
-                    58 [label="Exit block"];
+                    59 [label="Access variable R|kotlin/String.length|"];
+                    60 [label="Exit block"];
                 }
-                59 [label="Exit when branch result"];
+                61 [label="Exit when branch result"];
-                60 [label="Exit when"];
+                62 [label="Exit when"];
             }
-            61 [label="Exit block"];
+            63 [label="Exit block"];
         }
-        62 [label="Exit function test_2" style="filled" fillcolor=red];
+        64 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    35 -> {36};
     36 -> {37};
     37 -> {38};
     38 -> {39};
-    39 -> {40 42};
+    39 -> {40};
-    40 -> {41};
+    40 -> {41 43};
     41 -> {42};
     42 -> {43};
     43 -> {44};
     44 -> {45};
-    45 -> {54 46};
+    45 -> {46};
-    46 -> {47};
+    46 -> {55 47};
     47 -> {48};
     48 -> {49};
     49 -> {50};
     50 -> {51};
     51 -> {52};
     52 -> {53};
-    53 -> {60};
+    53 -> {54};
-    54 -> {55};
+    54 -> {62};
     55 -> {56};
     56 -> {57};
     57 -> {58};
@@ -177,159 +179,165 @@ digraph safeCallAndEqualityToBool_kt {
     59 -> {60};
     60 -> {61};
     61 -> {62};
+    62 -> {63};
+    63 -> {64};
 
     subgraph cluster_16 {
         color=red
-        63 [label="Enter function test_3" style="filled" fillcolor=red];
+        65 [label="Enter function test_3" style="filled" fillcolor=red];
         subgraph cluster_17 {
             color=blue
-            64 [label="Enter block"];
+            66 [label="Enter block"];
             subgraph cluster_18 {
                 color=blue
-                65 [label="Enter when"];
+                67 [label="Enter when"];
                 subgraph cluster_19 {
                     color=blue
-                    66 [label="Enter when branch condition "];
+                    68 [label="Enter when branch condition "];
-                    67 [label="Access variable R|<local>/s|"];
+                    69 [label="Access variable R|<local>/s|"];
-                    68 [label="Enter safe call"];
+                    70 [label="Enter safe call"];
-                    69 [label="Function call: $subj$.R|/check|()"];
+                    71 [label="Function call: $subj$.R|/check|()"];
-                    70 [label="Exit safe call"];
+                    72 [label="Exit safe call"];
-                    71 [label="Const: Boolean(true)"];
+                    73 [label="Const: Boolean(true)"];
-                    72 [label="Equality operator !="];
+                    74 [label="Equality operator !="];
-                    73 [label="Exit when branch condition"];
+                    75 [label="Exit when branch condition"];
                 }
                 subgraph cluster_20 {
                     color=blue
-                    74 [label="Enter when branch condition else"];
+                    76 [label="Enter when branch condition else"];
-                    75 [label="Exit when branch condition"];
+                    77 [label="Exit when branch condition"];
                 }
-                76 [label="Enter when branch result"];
+                78 [label="Enter when branch result"];
                 subgraph cluster_21 {
                     color=blue
-                    77 [label="Enter block"];
+                    79 [label="Enter block"];
-                    78 [label="Access variable R|<local>/s|"];
+                    80 [label="Access variable R|<local>/s|"];
-                    79 [label="Access variable R|kotlin/String.length|"];
+                    81 [label="Smart cast: R|<local>/s|"];
-                    80 [label="Exit block"];
+                    82 [label="Access variable R|kotlin/String.length|"];
+                    83 [label="Exit block"];
                 }
-                81 [label="Exit when branch result"];
+                84 [label="Exit when branch result"];
-                82 [label="Enter when branch result"];
+                85 [label="Enter when branch result"];
                 subgraph cluster_22 {
                     color=blue
-                    83 [label="Enter block"];
+                    86 [label="Enter block"];
-                    84 [label="Access variable R|<local>/s|"];
+                    87 [label="Access variable R|<local>/s|"];
-                    85 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
+                    88 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
-                    86 [label="Exit block"];
+                    89 [label="Exit block"];
                 }
-                87 [label="Exit when branch result"];
+                90 [label="Exit when branch result"];
-                88 [label="Exit when"];
+                91 [label="Exit when"];
             }
-            89 [label="Exit block"];
+            92 [label="Exit block"];
         }
-        90 [label="Exit function test_3" style="filled" fillcolor=red];
+        93 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    63 -> {64};
-    64 -> {65};
     65 -> {66};
     66 -> {67};
-    67 -> {68 70};
+    67 -> {68};
     68 -> {69};
-    69 -> {70};
+    69 -> {70 72};
     70 -> {71};
     71 -> {72};
     72 -> {73};
-    73 -> {82 74};
+    73 -> {74};
     74 -> {75};
-    75 -> {76};
+    75 -> {85 76};
     76 -> {77};
     77 -> {78};
     78 -> {79};
     79 -> {80};
     80 -> {81};
-    81 -> {88};
+    81 -> {82};
     82 -> {83};
     83 -> {84};
-    84 -> {85};
+    84 -> {91};
     85 -> {86};
     86 -> {87};
     87 -> {88};
     88 -> {89};
     89 -> {90};
+    90 -> {91};
+    91 -> {92};
+    92 -> {93};
 
     subgraph cluster_23 {
         color=red
-        91 [label="Enter function test_4" style="filled" fillcolor=red];
+        94 [label="Enter function test_4" style="filled" fillcolor=red];
         subgraph cluster_24 {
             color=blue
-            92 [label="Enter block"];
+            95 [label="Enter block"];
             subgraph cluster_25 {
                 color=blue
-                93 [label="Enter when"];
+                96 [label="Enter when"];
                 subgraph cluster_26 {
                     color=blue
-                    94 [label="Enter when branch condition "];
+                    97 [label="Enter when branch condition "];
-                    95 [label="Access variable R|<local>/s|"];
+                    98 [label="Access variable R|<local>/s|"];
-                    96 [label="Enter safe call"];
+                    99 [label="Enter safe call"];
-                    97 [label="Function call: $subj$.R|/check|()"];
+                    100 [label="Function call: $subj$.R|/check|()"];
-                    98 [label="Exit safe call"];
+                    101 [label="Exit safe call"];
-                    99 [label="Const: Boolean(false)"];
+                    102 [label="Const: Boolean(false)"];
-                    100 [label="Equality operator !="];
+                    103 [label="Equality operator !="];
-                    101 [label="Exit when branch condition"];
+                    104 [label="Exit when branch condition"];
                 }
                 subgraph cluster_27 {
                     color=blue
-                    102 [label="Enter when branch condition else"];
+                    105 [label="Enter when branch condition else"];
-                    103 [label="Exit when branch condition"];
+                    106 [label="Exit when branch condition"];
                 }
-                104 [label="Enter when branch result"];
+                107 [label="Enter when branch result"];
                 subgraph cluster_28 {
                     color=blue
-                    105 [label="Enter block"];
+                    108 [label="Enter block"];
-                    106 [label="Access variable R|<local>/s|"];
+                    109 [label="Access variable R|<local>/s|"];
-                    107 [label="Access variable R|kotlin/String.length|"];
+                    110 [label="Smart cast: R|<local>/s|"];
-                    108 [label="Exit block"];
+                    111 [label="Access variable R|kotlin/String.length|"];
+                    112 [label="Exit block"];
                 }
-                109 [label="Exit when branch result"];
+                113 [label="Exit when branch result"];
-                110 [label="Enter when branch result"];
+                114 [label="Enter when branch result"];
                 subgraph cluster_29 {
                     color=blue
-                    111 [label="Enter block"];
+                    115 [label="Enter block"];
-                    112 [label="Access variable R|<local>/s|"];
+                    116 [label="Access variable R|<local>/s|"];
-                    113 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
+                    117 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
-                    114 [label="Exit block"];
+                    118 [label="Exit block"];
                 }
-                115 [label="Exit when branch result"];
+                119 [label="Exit when branch result"];
-                116 [label="Exit when"];
+                120 [label="Exit when"];
             }
-            117 [label="Exit block"];
+            121 [label="Exit block"];
         }
-        118 [label="Exit function test_4" style="filled" fillcolor=red];
+        122 [label="Exit function test_4" style="filled" fillcolor=red];
     }
-    91 -> {92};
-    92 -> {93};
-    93 -> {94};
     94 -> {95};
-    95 -> {96 98};
+    95 -> {96};
     96 -> {97};
     97 -> {98};
-    98 -> {99};
+    98 -> {99 101};
     99 -> {100};
     100 -> {101};
-    101 -> {110 102};
+    101 -> {102};
     102 -> {103};
     103 -> {104};
-    104 -> {105};
+    104 -> {114 105};
     105 -> {106};
     106 -> {107};
     107 -> {108};
     108 -> {109};
-    109 -> {116};
+    109 -> {110};
     110 -> {111};
     111 -> {112};
     112 -> {113};
-    113 -> {114};
+    113 -> {120};
     114 -> {115};
     115 -> {116};
     116 -> {117};
     117 -> {118};
+    118 -> {119};
+    119 -> {120};
+    120 -> {121};
+    121 -> {122};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.dot

@@ -47,20 +47,21 @@ digraph safeCalls_kt {
             13 [label="Access variable R|<local>/x|"];
             14 [label="Enter safe call"];
             15 [label="Access variable R|<local>/x|"];
-            16 [label="Access variable R|kotlin/String.length|"];
+            16 [label="Smart cast: R|<local>/x|"];
-            17 [label="Const: Int(1)"];
+            17 [label="Access variable R|kotlin/String.length|"];
-            18 [label="Equality operator =="];
+            18 [label="Const: Int(1)"];
-            19 [label="Function call: $subj$.R|/foo|(...)"];
+            19 [label="Equality operator =="];
-            20 [label="Exit safe call"];
+            20 [label="Function call: $subj$.R|/foo|(...)"];
-            21 [label="Access variable R|<local>/x|"];
+            21 [label="Exit safe call"];
-            22 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
+            22 [label="Access variable R|<local>/x|"];
-            23 [label="Exit block"];
+            23 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
+            24 [label="Exit block"];
         }
-        24 [label="Exit function test" style="filled" fillcolor=red];
+        25 [label="Exit function test" style="filled" fillcolor=red];
     }
     11 -> {12};
     12 -> {13};
-    13 -> {14 20};
+    13 -> {14 21};
     14 -> {15};
     15 -> {16};
     16 -> {17};
@@ -71,239 +72,250 @@ digraph safeCalls_kt {
     21 -> {22};
     22 -> {23};
     23 -> {24};
+    24 -> {25};
 
     subgraph cluster_6 {
         color=red
-        25 [label="Enter function bar" style="filled" fillcolor=red];
+        26 [label="Enter function bar" style="filled" fillcolor=red];
-        26 [label="Exit function bar" style="filled" fillcolor=red];
+        27 [label="Exit function bar" style="filled" fillcolor=red];
     }
-    25 -> {26};
+    26 -> {27};
 
     subgraph cluster_7 {
         color=red
-        27 [label="Enter function bool" style="filled" fillcolor=red];
+        28 [label="Enter function bool" style="filled" fillcolor=red];
-        28 [label="Exit function bool" style="filled" fillcolor=red];
+        29 [label="Exit function bool" style="filled" fillcolor=red];
     }
-    27 -> {28};
+    28 -> {29};
 
     subgraph cluster_8 {
         color=red
-        29 [label="Enter function id" style="filled" fillcolor=red];
+        30 [label="Enter function id" style="filled" fillcolor=red];
-        30 [label="Exit function id" style="filled" fillcolor=red];
+        31 [label="Exit function id" style="filled" fillcolor=red];
     }
-    29 -> {30};
+    30 -> {31};
 
     subgraph cluster_9 {
         color=red
-        31 [label="Enter class A" style="filled" fillcolor=red];
+        32 [label="Enter class A" style="filled" fillcolor=red];
-        32 [label="Exit class A" style="filled" fillcolor=red];
+        33 [label="Exit class A" style="filled" fillcolor=red];
     }
-    31 -> {32} [color=green];
+    32 -> {33} [color=green];
 
     subgraph cluster_10 {
         color=red
-        33 [label="Enter function test_2" style="filled" fillcolor=red];
+        34 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_11 {
             color=blue
-            34 [label="Enter block"];
+            35 [label="Enter block"];
-            35 [label="Access variable R|<local>/x|"];
+            36 [label="Access variable R|<local>/x|"];
-            36 [label="Type operator: (R|<local>/x| as? R|A|)"];
+            37 [label="Type operator: (R|<local>/x| as? R|A|)"];
-            37 [label="Enter safe call"];
+            38 [label="Enter safe call"];
-            38 [label="Access variable R|<local>/x|"];
+            39 [label="Access variable R|<local>/x|"];
-            39 [label="Function call: $subj$.R|/A.bar|(...)"];
+            40 [label="Smart cast: R|<local>/x|"];
-            40 [label="Exit safe call"];
+            41 [label="Function call: $subj$.R|/A.bar|(...)"];
-            41 [label="Exit block"];
+            42 [label="Exit safe call"];
+            43 [label="Exit block"];
         }
-        42 [label="Exit function test_2" style="filled" fillcolor=red];
+        44 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    33 -> {34};
     34 -> {35};
     35 -> {36};
-    36 -> {37 40};
+    36 -> {37};
-    37 -> {38};
+    37 -> {38 42};
     38 -> {39};
     39 -> {40};
     40 -> {41};
     41 -> {42};
+    42 -> {43};
+    43 -> {44};
 
     subgraph cluster_12 {
         color=red
-        43 [label="Enter function test_3" style="filled" fillcolor=red];
+        45 [label="Enter function test_3" style="filled" fillcolor=red];
         subgraph cluster_13 {
             color=blue
-            44 [label="Enter block"];
+            46 [label="Enter block"];
-            45 [label="Access variable R|<local>/x|"];
+            47 [label="Access variable R|<local>/x|"];
-            46 [label="Type operator: (R|<local>/x| as? R|A|)"];
+            48 [label="Type operator: (R|<local>/x| as? R|A|)"];
-            47 [label="Enter safe call"];
+            49 [label="Enter safe call"];
-            48 [label="Access variable R|<local>/x|"];
+            50 [label="Access variable R|<local>/x|"];
-            49 [label="Function call: $subj$.R|/A.bar|(...)"];
+            51 [label="Smart cast: R|<local>/x|"];
-            50 [label="Exit safe call"];
+            52 [label="Function call: $subj$.R|/A.bar|(...)"];
-            51 [label="Enter safe call"];
+            53 [label="Exit safe call"];
-            52 [label="Access variable R|<local>/x|"];
+            54 [label="Enter safe call"];
-            53 [label="Function call: R|<local>/x|.R|/A.bool|()"];
+            55 [label="Access variable R|<local>/x|"];
-            54 [label="Function call: $subj$.R|/foo|(...)"];
+            56 [label="Smart cast: R|<local>/x|"];
-            55 [label="Exit safe call"];
+            57 [label="Function call: R|<local>/x|.R|/A.bool|()"];
-            56 [label="Enter safe call"];
+            58 [label="Function call: $subj$.R|/foo|(...)"];
-            57 [label="Postponed enter to lambda"];
+            59 [label="Exit safe call"];
+            60 [label="Enter safe call"];
+            61 [label="Postponed enter to lambda"];
             subgraph cluster_14 {
                 color=blue
-                65 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                69 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_15 {
                     color=blue
-                    66 [label="Enter block"];
+                    70 [label="Enter block"];
-                    67 [label="Access variable R|<local>/x|"];
+                    71 [label="Access variable R|<local>/x|"];
-                    68 [label="Function call: R|<local>/x|.R|/A.bool|()"];
+                    72 [label="Smart cast: R|<local>/x|"];
-                    69 [label="Exit block"];
+                    73 [label="Function call: R|<local>/x|.R|/A.bool|()"];
+                    74 [label="Exit block"];
                 }
-                70 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                75 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            58 [label="Postponed exit from lambda"];
+            62 [label="Postponed exit from lambda"];
-            59 [label="Function call: $subj$.R|/let|(...)"];
+            63 [label="Function call: $subj$.R|/let|(...)"];
-            60 [label="Exit safe call"];
+            64 [label="Exit safe call"];
-            61 [label="Access variable R|<local>/x|"];
+            65 [label="Access variable R|<local>/x|"];
-            62 [label="Function call: R|<local>/x|.<Unresolved name: bool>#()"];
+            66 [label="Function call: R|<local>/x|.<Unresolved name: bool>#()"];
-            63 [label="Exit block"];
+            67 [label="Exit block"];
         }
-        64 [label="Exit function test_3" style="filled" fillcolor=red];
+        68 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    43 -> {44};
-    44 -> {45};
     45 -> {46};
-    46 -> {47 50};
+    46 -> {47};
     47 -> {48};
-    48 -> {49};
+    48 -> {49 53};
     49 -> {50};
-    50 -> {51 55};
+    50 -> {51};
     51 -> {52};
     52 -> {53};
-    53 -> {54};
+    53 -> {54 59};
     54 -> {55};
-    55 -> {56 60};
+    55 -> {56};
     56 -> {57};
-    57 -> {58 65};
+    57 -> {58};
-    57 -> {65} [style=dashed];
     58 -> {59};
-    59 -> {60};
+    59 -> {60 64};
     60 -> {61};
-    61 -> {62};
+    61 -> {62 69};
+    61 -> {69} [style=dashed];
     62 -> {63};
     63 -> {64};
+    64 -> {65};
     65 -> {66};
     66 -> {67};
     67 -> {68};
-    68 -> {69};
     69 -> {70};
+    70 -> {71};
+    71 -> {72};
+    72 -> {73};
+    73 -> {74};
+    74 -> {75};
 
     subgraph cluster_16 {
         color=red
-        71 [label="Enter function test_4" style="filled" fillcolor=red];
+        76 [label="Enter function test_4" style="filled" fillcolor=red];
         subgraph cluster_17 {
             color=blue
-            72 [label="Enter block"];
+            77 [label="Enter block"];
-            73 [label="Access variable R|<local>/x|"];
+            78 [label="Access variable R|<local>/x|"];
-            74 [label="Enter safe call"];
+            79 [label="Enter safe call"];
-            75 [label="Function call: $subj$.R|/A.id|()"];
+            80 [label="Function call: $subj$.R|/A.id|()"];
-            76 [label="Exit safe call"];
+            81 [label="Exit safe call"];
-            77 [label="Enter safe call"];
+            82 [label="Enter safe call"];
-            78 [label="Function call: $subj$.R|/A.bool|()"];
+            83 [label="Function call: $subj$.R|/A.bool|()"];
-            79 [label="Exit safe call"];
+            84 [label="Exit safe call"];
-            80 [label="Access variable R|<local>/x|"];
+            85 [label="Access variable R|<local>/x|"];
-            81 [label="Function call: R|<local>/x|.<Inapplicable(UNSAFE_CALL): /A.id>#()"];
+            86 [label="Function call: R|<local>/x|.<Inapplicable(UNSAFE_CALL): /A.id>#()"];
-            82 [label="Exit block"];
+            87 [label="Exit block"];
         }
-        83 [label="Exit function test_4" style="filled" fillcolor=red];
+        88 [label="Exit function test_4" style="filled" fillcolor=red];
     }
-    71 -> {72};
+    76 -> {77};
-    72 -> {73};
-    73 -> {74 76};
-    74 -> {75};
-    75 -> {76};
-    76 -> {77 79};
     77 -> {78};
-    78 -> {79};
+    78 -> {79 81};
     79 -> {80};
     80 -> {81};
-    81 -> {82};
+    81 -> {82 84};
     82 -> {83};
-
+    83 -> {84};
-    subgraph cluster_18 {
-        color=red
-        84 [label="Enter function boo" style="filled" fillcolor=red];
-        subgraph cluster_19 {
-            color=blue
-            85 [label="Enter block"];
-            86 [label="Exit block"];
-        }
-        87 [label="Exit function boo" style="filled" fillcolor=red];
-    }
     84 -> {85};
     85 -> {86};
     86 -> {87};
+    87 -> {88};
+
+    subgraph cluster_18 {
+        color=red
+        89 [label="Enter function boo" style="filled" fillcolor=red];
+        subgraph cluster_19 {
+            color=blue
+            90 [label="Enter block"];
+            91 [label="Exit block"];
+        }
+        92 [label="Exit function boo" style="filled" fillcolor=red];
+    }
+    89 -> {90};
+    90 -> {91};
+    91 -> {92};
 
     subgraph cluster_20 {
         color=red
-        88 [label="Enter function test_5" style="filled" fillcolor=red];
+        93 [label="Enter function test_5" style="filled" fillcolor=red];
         subgraph cluster_21 {
             color=blue
-            89 [label="Enter block"];
+            94 [label="Enter block"];
-            90 [label="Access variable R|<local>/x|"];
+            95 [label="Access variable R|<local>/x|"];
-            91 [label="Enter safe call"];
+            96 [label="Enter safe call"];
-            92 [label="Postponed enter to lambda"];
+            97 [label="Postponed enter to lambda"];
             subgraph cluster_22 {
                 color=blue
-                107 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                113 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_23 {
                     color=blue
-                    108 [label="Enter block"];
+                    114 [label="Enter block"];
-                    109 [label="Jump: ^test_5 Unit"];
+                    115 [label="Jump: ^test_5 Unit"];
-                    110 [label="Stub" style="filled" fillcolor=gray];
+                    116 [label="Stub" style="filled" fillcolor=gray];
-                    111 [label="Exit block" style="filled" fillcolor=gray];
+                    117 [label="Exit block" style="filled" fillcolor=gray];
                 }
-                112 [label="Exit function anonymousFunction" style="filled" fillcolor=red style="filled" fillcolor=gray];
+                118 [label="Exit function anonymousFunction" style="filled" fillcolor=red style="filled" fillcolor=gray];
             }
-            93 [label="Call arguments union" style="filled" fillcolor=gray];
+            98 [label="Call arguments union" style="filled" fillcolor=gray];
-            94 [label="Postponed exit from lambda" style="filled" fillcolor=gray];
+            99 [label="Postponed exit from lambda" style="filled" fillcolor=gray];
-            95 [label="Function call: $subj$.R|kotlin/let|<R|A|, R|kotlin/Nothing|>(...)" style="filled" fillcolor=gray];
+            100 [label="Function call: $subj$.R|kotlin/let|<R|A|, R|kotlin/Nothing|>(...)" style="filled" fillcolor=gray];
-            96 [label="Stub" style="filled" fillcolor=gray];
+            101 [label="Stub" style="filled" fillcolor=gray];
-            97 [label="Exit safe call"];
-            98 [label="Enter safe call"];
-            99 [label="Access variable R|<local>/x|"];
-            100 [label="Function call: R|<local>/x|.R|/A.bool|()"];
-            101 [label="Function call: $subj$.R|/boo|(...)"];
             102 [label="Exit safe call"];
-            103 [label="Access variable R|<local>/x|"];
+            103 [label="Enter safe call"];
-            104 [label="Function call: R|<local>/x|.<Inapplicable(UNSAFE_CALL): /A.id>#()"];
+            104 [label="Access variable R|<local>/x|"];
-            105 [label="Exit block"];
+            105 [label="Smart cast: R|<local>/x|"];
+            106 [label="Function call: R|<local>/x|.R|/A.bool|()"];
+            107 [label="Function call: $subj$.R|/boo|(...)"];
+            108 [label="Exit safe call"];
+            109 [label="Access variable R|<local>/x|"];
+            110 [label="Function call: R|<local>/x|.<Inapplicable(UNSAFE_CALL): /A.id>#()"];
+            111 [label="Exit block"];
         }
-        106 [label="Exit function test_5" style="filled" fillcolor=red];
+        112 [label="Exit function test_5" style="filled" fillcolor=red];
     }
-    88 -> {89};
+    93 -> {94};
-    89 -> {90};
+    94 -> {95};
-    90 -> {91 97};
+    95 -> {96 102};
-    91 -> {92};
+    96 -> {97};
-    92 -> {107};
+    97 -> {113};
-    92 -> {94} [color=red];
+    97 -> {99} [color=red];
-    92 -> {107} [style=dashed];
+    97 -> {113} [style=dashed];
-    93 -> {95} [style=dotted];
+    98 -> {100} [style=dotted];
-    94 -> {95} [style=dotted];
+    99 -> {100} [style=dotted];
-    95 -> {96} [style=dotted];
+    100 -> {101} [style=dotted];
-    95 -> {106} [style=dotted]    [label=onUncaughtException];
+    100 -> {112} [style=dotted]    [label=onUncaughtException];
-    96 -> {97} [style=dotted];
+    101 -> {102} [style=dotted];
-    97 -> {98 102};
+    102 -> {103 108};
-    98 -> {99};
-    99 -> {100};
-    100 -> {101};
-    101 -> {102};
-    102 -> {103};
     103 -> {104};
     104 -> {105};
     105 -> {106};
+    106 -> {107};
     107 -> {108};
     108 -> {109};
-    109 -> {106};
+    109 -> {110};
-    109 -> {110} [style=dotted];
+    110 -> {111};
-    110 -> {111} [style=dotted];
+    111 -> {112};
-    111 -> {112} [style=dotted];
+    113 -> {114};
-    112 -> {94 93} [style=dotted];
+    114 -> {115};
+    115 -> {112};
+    115 -> {116} [style=dotted];
+    116 -> {117} [style=dotted];
+    117 -> {118} [style=dotted];
+    118 -> {99 98} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/unstableSmartCastOnSafeCallArgument.fir.txt

@@ -0,0 +1,38 @@
+FILE: unstableSmartCastOnSafeCallArgument.kt
+    public abstract class Foo : R|kotlin/Any| {
+        public constructor(): R|Foo| {
+            super<R|kotlin/Any|>()
+        }
+
+        public abstract val bar: R|Bar?|
+            public get(): R|Bar?|
+
+    }
+    public abstract class Bar : R|kotlin/Any| {
+        public constructor(): R|Bar| {
+            super<R|kotlin/Any|>()
+        }
+
+        public abstract val buz: R|Buz?|
+            public get(): R|Buz?|
+
+    }
+    public final class Buz : R|kotlin/Any| {
+        public constructor(): R|Buz| {
+            super<R|kotlin/Any|>()
+        }
+
+    }
+    public final fun takesNullable(b: R|Buz?|): R|kotlin/Unit| {
+    }
+    public final fun takesNonNull(b: R|Buz|): R|kotlin/Unit| {
+    }
+    public final fun foo(foo: R|Foo|): R|kotlin/Unit| {
+        when () {
+            !=(R|<local>/foo|.R|/Foo.bar|?.{ $subj$.R|/Bar.buz| }, Null(null)) ->  {
+                R|/takesNullable|(R|<local>/foo|.R|/Foo.bar|?.{ $subj$.R|/Bar.buz| })
+                <Inapplicable(INAPPLICABLE): /takesNonNull>#(R|<local>/foo|.R|/Foo.bar|?.{ $subj$.R|/Bar.buz| })
+            }
+        }
+
+    }

compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/unstableSmartCastOnSafeCallArgument.kt

@@ -0,0 +1,21 @@
+
+abstract class Foo {
+    abstract val bar: Bar?
+}
+
+abstract class Bar {
+    abstract val buz: Buz?
+}
+
+class Buz
+
+fun takesNullable(b: Buz?) {}
+fun takesNonNull(b: Buz) {}
+
+fun foo(foo: Foo) {
+    if (foo.bar?.buz != null) {
+        // Here we have unstable smart-cast on foo.bar?.buz
+        takesNullable(foo.bar?.buz) // OK
+        takesNonNull(<!ARGUMENT_TYPE_MISMATCH!>foo.bar?.buz<!>) // NOT OK
+    }
+}

compiler/fir/analysis-tests/testData/resolve/smartcasts/smartCastInInit.dot

@@ -65,10 +65,11 @@ digraph smartCastInInit_kt {
             19 [label="Function call: R|/s|()"];
             20 [label="Assignment: R|/Main.x|"];
             21 [label="Access variable R|/Main.x|"];
-            22 [label="Function call: this@R|/Main|.R|/Main.x|.R|/S.foo|()"];
+            22 [label="Smart cast: this@R|/Main|.R|/Main.x|"];
-            23 [label="Exit block"];
+            23 [label="Function call: this@R|/Main|.R|/Main.x|.R|/S.foo|()"];
+            24 [label="Exit block"];
         }
-        24 [label="Exit init block" style="filled" fillcolor=red];
+        25 [label="Exit init block" style="filled" fillcolor=red];
     }
     17 -> {18};
     18 -> {19};
@@ -77,17 +78,18 @@ digraph smartCastInInit_kt {
     21 -> {22};
     22 -> {23};
     23 -> {24};
-    24 -> {27} [color=green];
+    24 -> {25};
+    25 -> {28} [color=green];
 
     subgraph cluster_8 {
         color=red
-        25 [label="Enter class Main" style="filled" fillcolor=red];
+        26 [label="Enter class Main" style="filled" fillcolor=red];
-        26 [label="Part of class initialization"];
+        27 [label="Part of class initialization"];
-        27 [label="Exit class Main" style="filled" fillcolor=red];
+        28 [label="Exit class Main" style="filled" fillcolor=red];
     }
-    25 -> {26} [color=green];
+    26 -> {27} [color=green];
-    26 -> {27} [style=dotted];
+    27 -> {28} [style=dotted];
-    26 -> {17} [color=green];
+    27 -> {17} [color=green];
-    26 -> {17} [style=dashed];
+    27 -> {17} [style=dashed];
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastInByClause.dot

@@ -103,19 +103,20 @@ digraph smartcastInByClause_kt {
             36 [label="Exit ?:"];
             37 [label="Variable declaration: lval path: R|kotlin/String|"];
             38 [label="Access variable R|<local>/a|"];
-            39 [label="Access variable R|/A.index|"];
+            39 [label="Smart cast: R|<local>/a|"];
-            40 [label="Function call: R|/takeInt|(...)"];
+            40 [label="Access variable R|/A.index|"];
-            41 [label="Enter anonymous object"];
+            41 [label="Function call: R|/takeInt|(...)"];
+            42 [label="Enter anonymous object"];
             subgraph cluster_10 {
                 color=blue
-                48 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
+                49 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
-                49 [label="Part of class initialization"];
                 50 [label="Part of class initialization"];
-                51 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
+                51 [label="Part of class initialization"];
+                52 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
             }
-            42 [label="Exit anonymous object"];
+            43 [label="Exit anonymous object"];
-            43 [label="Exit anonymous object expression"];
+            44 [label="Exit anonymous object expression"];
-            44 [label="Jump: ^test object : R|Base| {
+            45 [label="Jump: ^test object : R|Base| {
     private constructor(): R|<anonymous>| {
         super<R|kotlin/Any|>()
     }
@@ -131,10 +132,10 @@ digraph smartcastInByClause_kt {
 
 }
 "];
-            45 [label="Stub" style="filled" fillcolor=gray];
+            46 [label="Stub" style="filled" fillcolor=gray];
-            46 [label="Exit block" style="filled" fillcolor=gray];
+            47 [label="Exit block" style="filled" fillcolor=gray];
         }
-        47 [label="Exit function test" style="filled" fillcolor=red];
+        48 [label="Exit function test" style="filled" fillcolor=red];
     }
     24 -> {25};
     25 -> {26};
@@ -147,7 +148,7 @@ digraph smartcastInByClause_kt {
     30 -> {35 31};
     31 -> {32};
     32 -> {33};
-    33 -> {47};
+    33 -> {48};
     33 -> {34} [style=dotted];
     34 -> {36} [style=dotted];
     35 -> {36};
@@ -156,94 +157,101 @@ digraph smartcastInByClause_kt {
     38 -> {39};
     39 -> {40};
     40 -> {41};
-    40 -> {52 55 60 64} [color=red];
+    41 -> {42};
-    41 -> {42} [color=red];
+    41 -> {53 56 62 67} [color=red];
-    41 -> {48} [color=green];
+    42 -> {43} [color=red];
-    41 -> {48} [style=dashed];
+    42 -> {49} [color=green];
-    42 -> {43};
+    42 -> {49} [style=dashed];
-    42 -> {52 64} [color=green];
-    42 -> {52 64} [style=dashed];
     43 -> {44};
-    44 -> {47};
+    43 -> {53 67} [color=green];
-    44 -> {45} [style=dotted];
+    43 -> {53 67} [style=dashed];
+    44 -> {45};
+    45 -> {48};
     45 -> {46} [style=dotted];
     46 -> {47} [style=dotted];
-    48 -> {49} [color=green];
+    47 -> {48} [style=dotted];
-    49 -> {50} [style=dotted];
+    49 -> {50} [color=green];
-    49 -> {55} [color=green];
-    49 -> {55} [style=dashed];
     50 -> {51} [style=dotted];
-    50 -> {60} [color=green];
+    50 -> {56} [color=green];
-    50 -> {60} [style=dashed];
+    50 -> {56} [style=dashed];
-    51 -> {42} [color=green];
+    51 -> {52} [style=dotted];
+    51 -> {62} [color=green];
+    51 -> {62} [style=dashed];
+    52 -> {43} [color=green];
 
     subgraph cluster_11 {
         color=red
-        52 [label="Enter function <init>" style="filled" fillcolor=red];
+        53 [label="Enter function <init>" style="filled" fillcolor=red];
-        53 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        54 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        54 [label="Exit function <init>" style="filled" fillcolor=red];
+        55 [label="Exit function <init>" style="filled" fillcolor=red];
     }
-    52 -> {53};
     53 -> {54};
+    54 -> {55};
 
     subgraph cluster_12 {
         color=red
-        55 [label="Enter field" style="filled" fillcolor=red];
+        56 [label="Enter field" style="filled" fillcolor=red];
-        56 [label="Access variable R|<local>/a|"];
+        57 [label="Access variable R|<local>/a|"];
-        57 [label="Access variable R|/A.index|"];
+        58 [label="Smart cast: R|<local>/a|"];
-        58 [label="Function call: R|/Derived.Derived|(...)"];
+        59 [label="Access variable R|/A.index|"];
-        59 [label="Exit field" style="filled" fillcolor=red];
+        60 [label="Function call: R|/Derived.Derived|(...)"];
+        61 [label="Exit field" style="filled" fillcolor=red];
     }
-    55 -> {56};
     56 -> {57};
     57 -> {58};
     58 -> {59};
-    59 -> {50} [color=green];
+    59 -> {60};
+    60 -> {61};
+    61 -> {51} [color=green];
 
     subgraph cluster_13 {
         color=red
-        60 [label="Enter property" style="filled" fillcolor=red];
+        62 [label="Enter property" style="filled" fillcolor=red];
-        61 [label="Access variable R|<local>/a|"];
+        63 [label="Access variable R|<local>/a|"];
-        62 [label="Access variable R|/A.index|"];
+        64 [label="Smart cast: R|<local>/a|"];
-        63 [label="Exit property" style="filled" fillcolor=red];
+        65 [label="Access variable R|/A.index|"];
+        66 [label="Exit property" style="filled" fillcolor=red];
     }
-    60 -> {61};
-    61 -> {62};
     62 -> {63};
-    63 -> {51} [color=green];
+    63 -> {64};
+    64 -> {65};
+    65 -> {66};
+    66 -> {52} [color=green];
 
     subgraph cluster_14 {
         color=red
-        64 [label="Enter function foo" style="filled" fillcolor=red];
+        67 [label="Enter function foo" style="filled" fillcolor=red];
         subgraph cluster_15 {
             color=blue
-            65 [label="Enter block"];
+            68 [label="Enter block"];
-            66 [label="Access variable R|<local>/a|"];
+            69 [label="Access variable R|<local>/a|"];
-            67 [label="Access variable R|/A.index|"];
+            70 [label="Smart cast: R|<local>/a|"];
-            68 [label="Function call: R|/takeInt|(...)"];
+            71 [label="Access variable R|/A.index|"];
-            69 [label="Exit block"];
+            72 [label="Function call: R|/takeInt|(...)"];
+            73 [label="Exit block"];
         }
-        70 [label="Exit function foo" style="filled" fillcolor=red];
+        74 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    64 -> {65};
-    65 -> {66};
-    66 -> {67};
     67 -> {68};
     68 -> {69};
     69 -> {70};
-
+    70 -> {71};
-    subgraph cluster_16 {
-        color=red
-        71 [label="Enter function takeInt" style="filled" fillcolor=red];
-        subgraph cluster_17 {
-            color=blue
-            72 [label="Enter block"];
-            73 [label="Exit block"];
-        }
-        74 [label="Exit function takeInt" style="filled" fillcolor=red];
-    }
     71 -> {72};
     72 -> {73};
     73 -> {74};
 
+    subgraph cluster_16 {
+        color=red
+        75 [label="Enter function takeInt" style="filled" fillcolor=red];
+        subgraph cluster_17 {
+            color=blue
+            76 [label="Enter block"];
+            77 [label="Exit block"];
+        }
+        78 [label="Exit function takeInt" style="filled" fillcolor=red];
+    }
+    75 -> {76};
+    76 -> {77};
+    77 -> {78};
+
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot

@@ -334,42 +334,44 @@ digraph smartcastToNothing_kt {
                     color=blue
                     116 [label="Enter block"];
                     117 [label="Access variable R|<local>/a|"];
-                    118 [label="Enter safe call"];
+                    118 [label="Smart cast: R|<local>/a|"];
-                    119 [label="Access variable R|kotlin/String.length|"];
+                    119 [label="Enter safe call"];
-                    120 [label="Exit safe call"];
+                    120 [label="Access variable R|kotlin/String.length|"];
-                    121 [label="Variable declaration: lval b: R|kotlin/Int?|"];
+                    121 [label="Exit safe call"];
-                    122 [label="Exit block"];
+                    122 [label="Variable declaration: lval b: R|kotlin/Int?|"];
+                    123 [label="Exit block"];
                 }
-                123 [label="Exit when branch result"];
+                124 [label="Exit when branch result"];
-                124 [label="Exit when"];
+                125 [label="Exit when"];
             }
             subgraph cluster_31 {
                 color=blue
-                125 [label="Enter when"];
+                126 [label="Enter when"];
                 subgraph cluster_32 {
                     color=blue
-                    126 [label="Enter when branch condition "];
+                    127 [label="Enter when branch condition "];
-                    127 [label="Access variable R|<local>/a|"];
+                    128 [label="Access variable R|<local>/a|"];
-                    128 [label="Type operator: (R|<local>/a| is R|kotlin/Nothing|)"];
+                    129 [label="Type operator: (R|<local>/a| is R|kotlin/Nothing|)"];
-                    129 [label="Exit when branch condition"];
+                    130 [label="Exit when branch condition"];
                 }
-                130 [label="Synthetic else branch"];
+                131 [label="Synthetic else branch"];
-                131 [label="Enter when branch result"];
+                132 [label="Enter when branch result"];
                 subgraph cluster_33 {
                     color=blue
-                    132 [label="Enter block"];
+                    133 [label="Enter block"];
-                    133 [label="Access variable R|<local>/a|"];
+                    134 [label="Access variable R|<local>/a|"];
-                    134 [label="Stub" style="filled" fillcolor=gray];
+                    135 [label="Smart cast: R|<local>/a|"];
-                    135 [label="Access variable R|kotlin/String.length|" style="filled" fillcolor=gray];
+                    136 [label="Stub" style="filled" fillcolor=gray];
-                    136 [label="Variable declaration: lval b: R|kotlin/Int|" style="filled" fillcolor=gray];
+                    137 [label="Access variable R|kotlin/String.length|" style="filled" fillcolor=gray];
-                    137 [label="Exit block" style="filled" fillcolor=gray];
+                    138 [label="Variable declaration: lval b: R|kotlin/Int|" style="filled" fillcolor=gray];
+                    139 [label="Exit block" style="filled" fillcolor=gray];
                 }
-                138 [label="Exit when branch result" style="filled" fillcolor=gray];
+                140 [label="Exit when branch result" style="filled" fillcolor=gray];
-                139 [label="Exit when"];
+                141 [label="Exit when"];
             }
-            140 [label="Exit block"];
+            142 [label="Exit block"];
         }
-        141 [label="Exit function test_1" style="filled" fillcolor=red];
+        143 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     107 -> {108};
     108 -> {109};
@@ -378,11 +380,11 @@ digraph smartcastToNothing_kt {
     111 -> {112};
     112 -> {113};
     113 -> {115 114};
-    114 -> {124};
+    114 -> {125};
     115 -> {116};
     116 -> {117};
-    117 -> {118 120};
+    117 -> {118};
-    118 -> {119};
+    118 -> {119 121};
     119 -> {120};
     120 -> {121};
     121 -> {122};
@@ -393,18 +395,20 @@ digraph smartcastToNothing_kt {
     126 -> {127};
     127 -> {128};
     128 -> {129};
-    129 -> {131 130};
+    129 -> {130};
-    130 -> {139};
+    130 -> {132 131};
-    131 -> {132};
+    131 -> {141};
     132 -> {133};
-    133 -> {141}    [label=onUncaughtException];
+    133 -> {134};
-    133 -> {134} [style=dotted];
+    134 -> {135};
-    134 -> {135} [style=dotted];
+    135 -> {143}    [label=onUncaughtException];
     135 -> {136} [style=dotted];
     136 -> {137} [style=dotted];
     137 -> {138} [style=dotted];
     138 -> {139} [style=dotted];
-    139 -> {140};
+    139 -> {140} [style=dotted];
-    140 -> {141};
+    140 -> {141} [style=dotted];
+    141 -> {142};
+    142 -> {143};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/stability/overridenOpenVal.dot

@@ -66,15 +66,16 @@ digraph overridenOpenVal_kt {
                     color=blue
                     22 [label="Enter block"];
                     23 [label="Access variable R|/A.x|"];
-                    24 [label="Access variable R|kotlin/String.length|"];
+                    24 [label="Smart cast: this@R|/B|.R|/A.x|"];
-                    25 [label="Exit block"];
+                    25 [label="Access variable R|kotlin/String.length|"];
+                    26 [label="Exit block"];
                 }
-                26 [label="Exit when branch result"];
+                27 [label="Exit when branch result"];
-                27 [label="Exit when"];
+                28 [label="Exit when"];
             }
-            28 [label="Exit block"];
+            29 [label="Exit block"];
         }
-        29 [label="Exit function test_1" style="filled" fillcolor=red];
+        30 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     13 -> {14};
     14 -> {15};
@@ -83,7 +84,7 @@ digraph overridenOpenVal_kt {
     17 -> {18};
     18 -> {19};
     19 -> {21 20};
-    20 -> {27};
+    20 -> {28};
     21 -> {22};
     22 -> {23};
     23 -> {24};
@@ -92,58 +93,59 @@ digraph overridenOpenVal_kt {
     26 -> {27};
     27 -> {28};
     28 -> {29};
+    29 -> {30};
 
     subgraph cluster_9 {
         color=red
-        30 [label="Enter class B" style="filled" fillcolor=red];
+        31 [label="Enter class B" style="filled" fillcolor=red];
-        31 [label="Exit class B" style="filled" fillcolor=red];
+        32 [label="Exit class B" style="filled" fillcolor=red];
     }
-    30 -> {31} [color=green];
+    31 -> {32} [color=green];
 
     subgraph cluster_10 {
         color=red
-        32 [label="Enter function test_2" style="filled" fillcolor=red];
+        33 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_11 {
             color=blue
-            33 [label="Enter block"];
+            34 [label="Enter block"];
             subgraph cluster_12 {
                 color=blue
-                34 [label="Enter when"];
+                35 [label="Enter when"];
                 subgraph cluster_13 {
                     color=blue
-                    35 [label="Enter when branch condition "];
+                    36 [label="Enter when branch condition "];
-                    36 [label="Access variable R|<local>/b|"];
+                    37 [label="Access variable R|<local>/b|"];
-                    37 [label="Access variable R|/A.x|"];
+                    38 [label="Access variable R|/A.x|"];
-                    38 [label="Type operator: (R|<local>/b|.R|/A.x| is R|kotlin/String|)"];
+                    39 [label="Type operator: (R|<local>/b|.R|/A.x| is R|kotlin/String|)"];
-                    39 [label="Exit when branch condition"];
+                    40 [label="Exit when branch condition"];
                 }
-                40 [label="Synthetic else branch"];
+                41 [label="Synthetic else branch"];
-                41 [label="Enter when branch result"];
+                42 [label="Enter when branch result"];
                 subgraph cluster_14 {
                     color=blue
-                    42 [label="Enter block"];
+                    43 [label="Enter block"];
-                    43 [label="Access variable R|<local>/b|"];
+                    44 [label="Access variable R|<local>/b|"];
-                    44 [label="Access variable R|/A.x|"];
+                    45 [label="Access variable R|/A.x|"];
-                    45 [label="Access variable R|kotlin/String.length|"];
+                    46 [label="Smart cast: R|<local>/b|.R|/A.x|"];
-                    46 [label="Exit block"];
+                    47 [label="Access variable R|kotlin/String.length|"];
+                    48 [label="Exit block"];
                 }
-                47 [label="Exit when branch result"];
+                49 [label="Exit when branch result"];
-                48 [label="Exit when"];
+                50 [label="Exit when"];
             }
-            49 [label="Exit block"];
+            51 [label="Exit block"];
         }
-        50 [label="Exit function test_2" style="filled" fillcolor=red];
+        52 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    32 -> {33};
     33 -> {34};
     34 -> {35};
     35 -> {36};
     36 -> {37};
     37 -> {38};
     38 -> {39};
-    39 -> {41 40};
+    39 -> {40};
-    40 -> {48};
+    40 -> {42 41};
-    41 -> {42};
+    41 -> {50};
     42 -> {43};
     43 -> {44};
     44 -> {45};
@@ -152,5 +154,7 @@ digraph overridenOpenVal_kt {
     47 -> {48};
     48 -> {49};
     49 -> {50};
+    50 -> {51};
+    51 -> {52};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.dot

@@ -70,17 +70,18 @@ digraph delayedAssignment_kt {
                     26 [label="Function call: R|/A.A|()"];
                     27 [label="Assignment: R|<local>/a|"];
                     28 [label="Access variable R|<local>/a|"];
-                    29 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+                    29 [label="Smart cast: R|<local>/a|"];
-                    30 [label="Exit block"];
+                    30 [label="Function call: R|<local>/a|.R|/A.foo|()"];
+                    31 [label="Exit block"];
                 }
-                31 [label="Exit when branch result"];
+                32 [label="Exit when branch result"];
-                32 [label="Exit when"];
+                33 [label="Exit when"];
             }
-            33 [label="Access variable R|<local>/a|"];
+            34 [label="Access variable R|<local>/a|"];
-            34 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
+            35 [label="Function call: R|<local>/a|.<Inapplicable(UNSAFE_CALL): /A.foo>#()"];
-            35 [label="Exit block"];
+            36 [label="Exit block"];
         }
-        36 [label="Exit function test" style="filled" fillcolor=red];
+        37 [label="Exit function test" style="filled" fillcolor=red];
     }
     9 -> {10};
     10 -> {11};
@@ -96,7 +97,7 @@ digraph delayedAssignment_kt {
     20 -> {21};
     21 -> {22};
     22 -> {23};
-    23 -> {32};
+    23 -> {33};
     24 -> {25};
     25 -> {26};
     26 -> {27};
@@ -109,5 +110,6 @@ digraph delayedAssignment_kt {
     33 -> {34};
     34 -> {35};
     35 -> {36};
+    36 -> {37};
 
 }

compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.dot

@@ -14,10 +14,11 @@ digraph smartcastAfterReassignment_kt {
             4 [label="Const: String()"];
             5 [label="Assignment: R|<local>/x|"];
             6 [label="Access variable R|<local>/x|"];
-            7 [label="Access variable R|kotlin/String.length|"];
+            7 [label="Smart cast: R|<local>/x|"];
-            8 [label="Exit block"];
+            8 [label="Access variable R|kotlin/String.length|"];
+            9 [label="Exit block"];
         }
-        9 [label="Exit function test_1" style="filled" fillcolor=red];
+        10 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     0 -> {1};
     1 -> {2};
@@ -28,45 +29,46 @@ digraph smartcastAfterReassignment_kt {
     6 -> {7};
     7 -> {8};
     8 -> {9};
+    9 -> {10};
 
     subgraph cluster_2 {
         color=red
-        10 [label="Enter function test_2" style="filled" fillcolor=red];
+        11 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_3 {
             color=blue
-            11 [label="Enter block"];
+            12 [label="Enter block"];
-            12 [label="Const: Null(null)"];
+            13 [label="Const: Null(null)"];
-            13 [label="Variable declaration: lvar x: R|kotlin/String?|"];
+            14 [label="Variable declaration: lvar x: R|kotlin/String?|"];
             subgraph cluster_4 {
                 color=blue
-                14 [label="Enter when"];
+                15 [label="Enter when"];
                 subgraph cluster_5 {
                     color=blue
-                    15 [label="Enter when branch condition "];
+                    16 [label="Enter when branch condition "];
-                    16 [label="Access variable R|<local>/x|"];
+                    17 [label="Access variable R|<local>/x|"];
-                    17 [label="Const: Null(null)"];
+                    18 [label="Const: Null(null)"];
-                    18 [label="Equality operator =="];
+                    19 [label="Equality operator =="];
-                    19 [label="Exit when branch condition"];
+                    20 [label="Exit when branch condition"];
                 }
-                20 [label="Synthetic else branch"];
+                21 [label="Synthetic else branch"];
-                21 [label="Enter when branch result"];
+                22 [label="Enter when branch result"];
                 subgraph cluster_6 {
                     color=blue
-                    22 [label="Enter block"];
+                    23 [label="Enter block"];
-                    23 [label="Const: String()"];
+                    24 [label="Const: String()"];
-                    24 [label="Assignment: R|<local>/x|"];
+                    25 [label="Assignment: R|<local>/x|"];
-                    25 [label="Exit block"];
+                    26 [label="Exit block"];
                 }
-                26 [label="Exit when branch result"];
+                27 [label="Exit when branch result"];
-                27 [label="Exit when"];
+                28 [label="Exit when"];
             }
-            28 [label="Access variable R|<local>/x|"];
+            29 [label="Access variable R|<local>/x|"];
-            29 [label="Access variable R|kotlin/String.length|"];
+            30 [label="Smart cast: R|<local>/x|"];
-            30 [label="Exit block"];
+            31 [label="Access variable R|kotlin/String.length|"];
+            32 [label="Exit block"];
         }
-        31 [label="Exit function test_2" style="filled" fillcolor=red];
+        33 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    10 -> {11};
     11 -> {12};
     12 -> {13};
     13 -> {14};
@@ -75,9 +77,9 @@ digraph smartcastAfterReassignment_kt {
     16 -> {17};
     17 -> {18};
     18 -> {19};
-    19 -> {21 20};
+    19 -> {20};
-    20 -> {27};
+    20 -> {22 21};
-    21 -> {22};
+    21 -> {28};
     22 -> {23};
     23 -> {24};
     24 -> {25};
@@ -87,29 +89,31 @@ digraph smartcastAfterReassignment_kt {
     28 -> {29};
     29 -> {30};
     30 -> {31};
+    31 -> {32};
+    32 -> {33};
 
     subgraph cluster_7 {
         color=red
-        32 [label="Enter function test_3" style="filled" fillcolor=red];
+        34 [label="Enter function test_3" style="filled" fillcolor=red];
         subgraph cluster_8 {
             color=blue
-            33 [label="Enter block"];
+            35 [label="Enter block"];
-            34 [label="Const: Null(null)"];
+            36 [label="Const: Null(null)"];
-            35 [label="Variable declaration: lvar x: R|kotlin/String?|"];
+            37 [label="Variable declaration: lvar x: R|kotlin/String?|"];
-            36 [label="Const: String()"];
+            38 [label="Const: String()"];
-            37 [label="Assignment: R|<local>/x|"];
+            39 [label="Assignment: R|<local>/x|"];
-            38 [label="Access variable R|<local>/x|"];
+            40 [label="Access variable R|<local>/x|"];
-            39 [label="Access variable R|kotlin/String.length|"];
+            41 [label="Smart cast: R|<local>/x|"];
-            40 [label="Const: Null(null)"];
+            42 [label="Access variable R|kotlin/String.length|"];
-            41 [label="Assignment: R|<local>/x|"];
+            43 [label="Const: Null(null)"];
-            42 [label="Access variable R|<local>/x|"];
+            44 [label="Assignment: R|<local>/x|"];
-            43 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
+            45 [label="Access variable R|<local>/x|"];
-            44 [label="Exit block"];
+            46 [label="Smart cast: R|<local>/x|"];
+            47 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
+            48 [label="Exit block"];
         }
-        45 [label="Exit function test_3" style="filled" fillcolor=red];
+        49 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    32 -> {33};
-    33 -> {34};
     34 -> {35};
     35 -> {36};
     36 -> {37};
@@ -121,5 +125,9 @@ digraph smartcastAfterReassignment_kt {
     42 -> {43};
     43 -> {44};
     44 -> {45};
+    45 -> {46};
+    46 -> {47};
+    47 -> {48};
+    48 -> {49};
 
 }

compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/conditionalEffects.dot

@@ -20,10 +20,11 @@ digraph conditionalEffects_kt {
                 8 [label="Exit contract"];
             }
             9 [label="Access variable R|<local>/x|"];
-            10 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+            10 [label="Smart cast: R|<local>/x|"];
-            11 [label="Exit block"];
+            11 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+            12 [label="Exit block"];
         }
-        12 [label="Exit function test_1" style="filled" fillcolor=red];
+        13 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     0 -> {1};
     1 -> {2};
@@ -37,30 +38,31 @@ digraph conditionalEffects_kt {
     9 -> {10};
     10 -> {11};
     11 -> {12};
+    12 -> {13};
 
     subgraph cluster_3 {
         color=red
-        13 [label="Enter function test_2" style="filled" fillcolor=red];
+        14 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_4 {
             color=blue
-            14 [label="Enter block"];
+            15 [label="Enter block"];
-            15 [label="Access variable R|<local>/x|"];
+            16 [label="Access variable R|<local>/x|"];
-            16 [label="Function call: R|kotlin/requireNotNull|<R|kotlin/String|>(...)"];
+            17 [label="Function call: R|kotlin/requireNotNull|<R|kotlin/String|>(...)"];
             subgraph cluster_5 {
                 color=blue
-                17 [label="Enter contract"];
+                18 [label="Enter contract"];
-                18 [label="Access variable R|<local>/x|"];
+                19 [label="Access variable R|<local>/x|"];
-                19 [label="Const: Null(null)"];
+                20 [label="Const: Null(null)"];
-                20 [label="Equality operator !="];
+                21 [label="Equality operator !="];
-                21 [label="Exit contract"];
+                22 [label="Exit contract"];
             }
-            22 [label="Access variable R|<local>/x|"];
+            23 [label="Access variable R|<local>/x|"];
-            23 [label="Access variable R|kotlin/String.length|"];
+            24 [label="Smart cast: R|<local>/x|"];
-            24 [label="Exit block"];
+            25 [label="Access variable R|kotlin/String.length|"];
+            26 [label="Exit block"];
         }
-        25 [label="Exit function test_2" style="filled" fillcolor=red];
+        27 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    13 -> {14};
     14 -> {15};
     15 -> {16};
     16 -> {17};
@@ -72,33 +74,34 @@ digraph conditionalEffects_kt {
     22 -> {23};
     23 -> {24};
     24 -> {25};
+    25 -> {26};
+    26 -> {27};
 
     subgraph cluster_6 {
         color=red
-        26 [label="Enter function test_3" style="filled" fillcolor=red];
+        28 [label="Enter function test_3" style="filled" fillcolor=red];
         subgraph cluster_7 {
             color=blue
-            27 [label="Enter block"];
+            29 [label="Enter block"];
-            28 [label="Access variable R|<local>/x|"];
+            30 [label="Access variable R|<local>/x|"];
-            29 [label="Const: Null(null)"];
+            31 [label="Const: Null(null)"];
-            30 [label="Equality operator !="];
+            32 [label="Equality operator !="];
-            31 [label="Function call: R|kotlin/require|(...)"];
+            33 [label="Function call: R|kotlin/require|(...)"];
             subgraph cluster_8 {
                 color=blue
-                32 [label="Enter contract"];
+                34 [label="Enter contract"];
-                33 [label="Access variable R|<local>/x|"];
+                35 [label="Access variable R|<local>/x|"];
-                34 [label="Const: Null(null)"];
+                36 [label="Const: Null(null)"];
-                35 [label="Equality operator !="];
+                37 [label="Equality operator !="];
-                36 [label="Exit contract"];
+                38 [label="Exit contract"];
             }
-            37 [label="Access variable R|<local>/x|"];
+            39 [label="Access variable R|<local>/x|"];
-            38 [label="Access variable R|kotlin/String.length|"];
+            40 [label="Smart cast: R|<local>/x|"];
-            39 [label="Exit block"];
+            41 [label="Access variable R|kotlin/String.length|"];
+            42 [label="Exit block"];
         }
-        40 [label="Exit function test_3" style="filled" fillcolor=red];
+        43 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    26 -> {27};
-    27 -> {28};
     28 -> {29};
     29 -> {30};
     30 -> {31};
@@ -111,60 +114,62 @@ digraph conditionalEffects_kt {
     37 -> {38};
     38 -> {39};
     39 -> {40};
+    40 -> {41};
+    41 -> {42};
+    42 -> {43};
 
     subgraph cluster_9 {
         color=red
-        41 [label="Enter function test_4" style="filled" fillcolor=red];
+        44 [label="Enter function test_4" style="filled" fillcolor=red];
         subgraph cluster_10 {
             color=blue
-            42 [label="Enter block"];
+            45 [label="Enter block"];
             subgraph cluster_11 {
                 color=blue
-                43 [label="Enter &&"];
+                46 [label="Enter &&"];
-                44 [label="Access variable R|<local>/x|"];
+                47 [label="Access variable R|<local>/x|"];
-                45 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+                48 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-                46 [label="Exit left part of &&"];
+                49 [label="Exit left part of &&"];
-                47 [label="Enter right part of &&"];
+                50 [label="Enter right part of &&"];
-                48 [label="Access variable R|<local>/y|"];
+                51 [label="Access variable R|<local>/y|"];
-                49 [label="Const: Null(null)"];
+                52 [label="Const: Null(null)"];
-                50 [label="Equality operator !="];
+                53 [label="Equality operator !="];
-                51 [label="Exit &&"];
+                54 [label="Exit &&"];
             }
-            52 [label="Function call: R|kotlin/require|(...)"];
+            55 [label="Function call: R|kotlin/require|(...)"];
             subgraph cluster_12 {
                 color=blue
-                53 [label="Enter contract"];
+                56 [label="Enter contract"];
                 subgraph cluster_13 {
                     color=blue
-                    54 [label="Enter &&"];
+                    57 [label="Enter &&"];
-                    55 [label="Access variable R|<local>/x|"];
+                    58 [label="Access variable R|<local>/x|"];
-                    56 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+                    59 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-                    57 [label="Exit left part of &&"];
+                    60 [label="Exit left part of &&"];
-                    58 [label="Enter right part of &&"];
+                    61 [label="Enter right part of &&"];
-                    59 [label="Access variable R|<local>/y|"];
+                    62 [label="Access variable R|<local>/y|"];
-                    60 [label="Const: Null(null)"];
+                    63 [label="Const: Null(null)"];
-                    61 [label="Equality operator !="];
+                    64 [label="Equality operator !="];
-                    62 [label="Exit &&"];
+                    65 [label="Exit &&"];
                 }
-                63 [label="Exit contract"];
+                66 [label="Exit contract"];
             }
-            64 [label="Access variable R|<local>/x|"];
+            67 [label="Access variable R|<local>/x|"];
-            65 [label="Access variable R|kotlin/String.length|"];
+            68 [label="Smart cast: R|<local>/x|"];
-            66 [label="Access variable R|<local>/y|"];
+            69 [label="Access variable R|kotlin/String.length|"];
-            67 [label="Access variable R|kotlin/String.length|"];
+            70 [label="Access variable R|<local>/y|"];
-            68 [label="Exit block"];
+            71 [label="Smart cast: R|<local>/y|"];
+            72 [label="Access variable R|kotlin/String.length|"];
+            73 [label="Exit block"];
         }
-        69 [label="Exit function test_4" style="filled" fillcolor=red];
+        74 [label="Exit function test_4" style="filled" fillcolor=red];
     }
-    41 -> {42};
-    42 -> {43};
-    43 -> {44};
     44 -> {45};
     45 -> {46};
-    46 -> {51 47};
+    46 -> {47};
     47 -> {48};
     48 -> {49};
-    49 -> {50};
+    49 -> {54 50};
     50 -> {51};
     51 -> {52};
     52 -> {53};
@@ -172,10 +177,10 @@ digraph conditionalEffects_kt {
     54 -> {55};
     55 -> {56};
     56 -> {57};
-    57 -> {62 58};
+    57 -> {58};
     58 -> {59};
     59 -> {60};
-    60 -> {61};
+    60 -> {65 61};
     61 -> {62};
     62 -> {63};
     63 -> {64};
@@ -184,82 +189,83 @@ digraph conditionalEffects_kt {
     66 -> {67};
     67 -> {68};
     68 -> {69};
-
+    69 -> {70};
-    subgraph cluster_14 {
-        color=red
-        70 [label="Enter function test_5" style="filled" fillcolor=red];
-        subgraph cluster_15 {
-            color=blue
-            71 [label="Enter block"];
-            subgraph cluster_16 {
-                color=blue
-                72 [label="Enter when"];
-                subgraph cluster_17 {
-                    color=blue
-                    73 [label="Enter when branch condition "];
-                    74 [label="Access variable R|<local>/b|"];
-                    75 [label="Exit when branch condition"];
-                }
-                subgraph cluster_18 {
-                    color=blue
-                    76 [label="Enter when branch condition else"];
-                    77 [label="Exit when branch condition"];
-                }
-                78 [label="Enter when branch result"];
-                subgraph cluster_19 {
-                    color=blue
-                    79 [label="Enter block"];
-                    80 [label="Access variable R|<local>/x|"];
-                    81 [label="Access variable <Unresolved name: length>#"];
-                    82 [label="Exit block"];
-                }
-                83 [label="Exit when branch result"];
-                84 [label="Enter when branch result"];
-                subgraph cluster_20 {
-                    color=blue
-                    85 [label="Enter block"];
-                    86 [label="Access variable R|<local>/x|"];
-                    87 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-                    88 [label="Function call: R|kotlin/require|(...)"];
-                    subgraph cluster_21 {
-                        color=blue
-                        89 [label="Enter contract"];
-                        90 [label="Access variable R|<local>/x|"];
-                        91 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-                        92 [label="Exit contract"];
-                    }
-                    93 [label="Access variable R|<local>/x|"];
-                    94 [label="Access variable R|kotlin/String.length|"];
-                    95 [label="Exit block"];
-                }
-                96 [label="Exit when branch result"];
-                97 [label="Exit when"];
-            }
-            98 [label="Access variable R|<local>/x|"];
-            99 [label="Access variable <Unresolved name: length>#"];
-            100 [label="Exit block"];
-        }
-        101 [label="Exit function test_5" style="filled" fillcolor=red];
-    }
     70 -> {71};
     71 -> {72};
     72 -> {73};
     73 -> {74};
-    74 -> {75};
+
-    75 -> {84 76};
+    subgraph cluster_14 {
+        color=red
+        75 [label="Enter function test_5" style="filled" fillcolor=red];
+        subgraph cluster_15 {
+            color=blue
+            76 [label="Enter block"];
+            subgraph cluster_16 {
+                color=blue
+                77 [label="Enter when"];
+                subgraph cluster_17 {
+                    color=blue
+                    78 [label="Enter when branch condition "];
+                    79 [label="Access variable R|<local>/b|"];
+                    80 [label="Exit when branch condition"];
+                }
+                subgraph cluster_18 {
+                    color=blue
+                    81 [label="Enter when branch condition else"];
+                    82 [label="Exit when branch condition"];
+                }
+                83 [label="Enter when branch result"];
+                subgraph cluster_19 {
+                    color=blue
+                    84 [label="Enter block"];
+                    85 [label="Access variable R|<local>/x|"];
+                    86 [label="Access variable <Unresolved name: length>#"];
+                    87 [label="Exit block"];
+                }
+                88 [label="Exit when branch result"];
+                89 [label="Enter when branch result"];
+                subgraph cluster_20 {
+                    color=blue
+                    90 [label="Enter block"];
+                    91 [label="Access variable R|<local>/x|"];
+                    92 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+                    93 [label="Function call: R|kotlin/require|(...)"];
+                    subgraph cluster_21 {
+                        color=blue
+                        94 [label="Enter contract"];
+                        95 [label="Access variable R|<local>/x|"];
+                        96 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+                        97 [label="Exit contract"];
+                    }
+                    98 [label="Access variable R|<local>/x|"];
+                    99 [label="Smart cast: R|<local>/x|"];
+                    100 [label="Access variable R|kotlin/String.length|"];
+                    101 [label="Exit block"];
+                }
+                102 [label="Exit when branch result"];
+                103 [label="Exit when"];
+            }
+            104 [label="Access variable R|<local>/x|"];
+            105 [label="Access variable <Unresolved name: length>#"];
+            106 [label="Exit block"];
+        }
+        107 [label="Exit function test_5" style="filled" fillcolor=red];
+    }
+    75 -> {76};
     76 -> {77};
     77 -> {78};
     78 -> {79};
     79 -> {80};
-    80 -> {81};
+    80 -> {89 81};
     81 -> {82};
     82 -> {83};
-    83 -> {97};
+    83 -> {84};
     84 -> {85};
     85 -> {86};
     86 -> {87};
     87 -> {88};
-    88 -> {89};
+    88 -> {103};
     89 -> {90};
     90 -> {91};
     91 -> {92};
@@ -272,85 +278,88 @@ digraph conditionalEffects_kt {
     98 -> {99};
     99 -> {100};
     100 -> {101};
-
+    101 -> {102};
-    subgraph cluster_22 {
-        color=red
-        102 [label="Enter function test_6" style="filled" fillcolor=red];
-        subgraph cluster_23 {
-            color=blue
-            103 [label="Enter block"];
-            subgraph cluster_24 {
-                color=blue
-                104 [label="Enter when"];
-                subgraph cluster_25 {
-                    color=blue
-                    105 [label="Enter when branch condition "];
-                    106 [label="Access variable R|<local>/b|"];
-                    107 [label="Exit when branch condition"];
-                }
-                subgraph cluster_26 {
-                    color=blue
-                    108 [label="Enter when branch condition else"];
-                    109 [label="Exit when branch condition"];
-                }
-                110 [label="Enter when branch result"];
-                subgraph cluster_27 {
-                    color=blue
-                    111 [label="Enter block"];
-                    112 [label="Access variable R|<local>/x|"];
-                    113 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-                    114 [label="Function call: R|kotlin/require|(...)"];
-                    subgraph cluster_28 {
-                        color=blue
-                        115 [label="Enter contract"];
-                        116 [label="Access variable R|<local>/x|"];
-                        117 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-                        118 [label="Exit contract"];
-                    }
-                    119 [label="Access variable R|<local>/x|"];
-                    120 [label="Access variable R|kotlin/String.length|"];
-                    121 [label="Exit block"];
-                }
-                122 [label="Exit when branch result"];
-                123 [label="Enter when branch result"];
-                subgraph cluster_29 {
-                    color=blue
-                    124 [label="Enter block"];
-                    125 [label="Access variable R|<local>/x|"];
-                    126 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-                    127 [label="Function call: R|kotlin/require|(...)"];
-                    subgraph cluster_30 {
-                        color=blue
-                        128 [label="Enter contract"];
-                        129 [label="Access variable R|<local>/x|"];
-                        130 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-                        131 [label="Exit contract"];
-                    }
-                    132 [label="Access variable R|<local>/x|"];
-                    133 [label="Access variable R|kotlin/String.length|"];
-                    134 [label="Exit block"];
-                }
-                135 [label="Exit when branch result"];
-                136 [label="Exit when"];
-            }
-            137 [label="Access variable R|<local>/x|"];
-            138 [label="Access variable R|kotlin/String.length|"];
-            139 [label="Exit block"];
-        }
-        140 [label="Exit function test_6" style="filled" fillcolor=red];
-    }
     102 -> {103};
     103 -> {104};
     104 -> {105};
     105 -> {106};
     106 -> {107};
-    107 -> {123 108};
+
+    subgraph cluster_22 {
+        color=red
+        108 [label="Enter function test_6" style="filled" fillcolor=red];
+        subgraph cluster_23 {
+            color=blue
+            109 [label="Enter block"];
+            subgraph cluster_24 {
+                color=blue
+                110 [label="Enter when"];
+                subgraph cluster_25 {
+                    color=blue
+                    111 [label="Enter when branch condition "];
+                    112 [label="Access variable R|<local>/b|"];
+                    113 [label="Exit when branch condition"];
+                }
+                subgraph cluster_26 {
+                    color=blue
+                    114 [label="Enter when branch condition else"];
+                    115 [label="Exit when branch condition"];
+                }
+                116 [label="Enter when branch result"];
+                subgraph cluster_27 {
+                    color=blue
+                    117 [label="Enter block"];
+                    118 [label="Access variable R|<local>/x|"];
+                    119 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+                    120 [label="Function call: R|kotlin/require|(...)"];
+                    subgraph cluster_28 {
+                        color=blue
+                        121 [label="Enter contract"];
+                        122 [label="Access variable R|<local>/x|"];
+                        123 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+                        124 [label="Exit contract"];
+                    }
+                    125 [label="Access variable R|<local>/x|"];
+                    126 [label="Smart cast: R|<local>/x|"];
+                    127 [label="Access variable R|kotlin/String.length|"];
+                    128 [label="Exit block"];
+                }
+                129 [label="Exit when branch result"];
+                130 [label="Enter when branch result"];
+                subgraph cluster_29 {
+                    color=blue
+                    131 [label="Enter block"];
+                    132 [label="Access variable R|<local>/x|"];
+                    133 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+                    134 [label="Function call: R|kotlin/require|(...)"];
+                    subgraph cluster_30 {
+                        color=blue
+                        135 [label="Enter contract"];
+                        136 [label="Access variable R|<local>/x|"];
+                        137 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+                        138 [label="Exit contract"];
+                    }
+                    139 [label="Access variable R|<local>/x|"];
+                    140 [label="Smart cast: R|<local>/x|"];
+                    141 [label="Access variable R|kotlin/String.length|"];
+                    142 [label="Exit block"];
+                }
+                143 [label="Exit when branch result"];
+                144 [label="Exit when"];
+            }
+            145 [label="Access variable R|<local>/x|"];
+            146 [label="Smart cast: R|<local>/x|"];
+            147 [label="Access variable R|kotlin/String.length|"];
+            148 [label="Exit block"];
+        }
+        149 [label="Exit function test_6" style="filled" fillcolor=red];
+    }
     108 -> {109};
     109 -> {110};
     110 -> {111};
     111 -> {112};
     112 -> {113};
-    113 -> {114};
+    113 -> {130 114};
     114 -> {115};
     115 -> {116};
     116 -> {117};
@@ -359,14 +368,14 @@ digraph conditionalEffects_kt {
     119 -> {120};
     120 -> {121};
     121 -> {122};
-    122 -> {136};
+    122 -> {123};
     123 -> {124};
     124 -> {125};
     125 -> {126};
     126 -> {127};
     127 -> {128};
     128 -> {129};
-    129 -> {130};
+    129 -> {144};
     130 -> {131};
     131 -> {132};
     132 -> {133};
@@ -377,5 +386,14 @@ digraph conditionalEffects_kt {
     137 -> {138};
     138 -> {139};
     139 -> {140};
+    140 -> {141};
+    141 -> {142};
+    142 -> {143};
+    143 -> {144};
+    144 -> {145};
+    145 -> {146};
+    146 -> {147};
+    147 -> {148};
+    148 -> {149};
 
 }

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java

@@ -4111,6 +4111,12 @@ public class FirDiagnosticTestGenerated extends AbstractFirDiagnosticTest {
                 public void testSafeCalls() throws Exception {
                     runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.kt");
                 }
+
+                @Test
+                @TestMetadata("unstableSmartCastOnSafeCallArgument.kt")
+                public void testUnstableSmartCastOnSafeCallArgument() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/unstableSmartCastOnSafeCallArgument.kt");
+                }
             }
 
             @Nested

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java

@@ -4111,6 +4111,12 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
                 public void testSafeCalls() throws Exception {
                     runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.kt");
                 }
+
+                @Test
+                @TestMetadata("unstableSmartCastOnSafeCallArgument.kt")
+                public void testUnstableSmartCastOnSafeCallArgument() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/unstableSmartCastOnSafeCallArgument.kt");
+                }
             }
 
             @Nested

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDestructuringDeclarationChecker.kt

@@ -178,7 +178,7 @@ object FirDestructuringDeclarationChecker : FirPropertyChecker() {
     private val FirExpression.unwrapped: FirExpression
         get() =
             when (this) {
-                is FirExpressionWithSmartcast -> this.originalExpression
+                is FirSmartCastExpression -> this.originalExpression
                 is FirWrappedExpression -> this.expression
                 else -> this
             }

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInlineDeclarationChecker.kt

@@ -114,7 +114,7 @@ abstract class FirInlineDeclarationChecker : FirFunctionChecker() {
         }
 
         // prevent delegation to visitQualifiedAccessExpression, which causes redundant diagnostics
-        override fun visitExpressionWithSmartcast(expressionWithSmartcast: FirExpressionWithSmartcast, data: CheckerContext) {}
+        override fun visitSmartCastExpression(smartCastExpression: FirSmartCastExpression, data: CheckerContext) {}
 
         override fun visitVariableAssignment(variableAssignment: FirVariableAssignment, data: CheckerContext) {
             val propertySymbol = variableAssignment.calleeReference.toResolvedCallableSymbol() as? FirPropertySymbol ?: return

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirCastOperatorsChecker.kt

@@ -13,9 +13,9 @@ import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
 import org.jetbrains.kotlin.fir.analysis.checkers.isCastErased
 import org.jetbrains.kotlin.fir.analysis.checkers.checkCasting
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
-import org.jetbrains.kotlin.fir.expressions.FirExpressionWithSmartcast
 import org.jetbrains.kotlin.fir.expressions.FirOperation
 import org.jetbrains.kotlin.fir.expressions.FirTypeOperatorCall
+import org.jetbrains.kotlin.fir.resolve.dfa.unwrapSmartcastExpression
 import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
 import org.jetbrains.kotlin.fir.types.coneType
 
@@ -23,11 +23,7 @@ object FirCastOperatorsChecker : FirTypeOperatorCallChecker() {
     override fun check(expression: FirTypeOperatorCall, context: CheckerContext, reporter: DiagnosticReporter) {
         val session = context.session
         val firstArgument = expression.argumentList.arguments[0]
-        val actualType = (if (firstArgument is FirExpressionWithSmartcast) {
+        val actualType = (firstArgument.unwrapSmartcastExpression().typeRef.coneType).fullyExpandedType(session)
-            firstArgument.originalType.coneType
-        } else {
-            firstArgument.typeRef.coneType
-        }).fullyExpandedType(session)
         val conversionTypeRef = expression.conversionTypeRef
         val targetType = conversionTypeRef.coneType.fullyExpandedType(session)
 

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirConventionFunctionCallChecker.kt

@@ -12,10 +12,10 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
 import org.jetbrains.kotlin.diagnostics.reportOn
 import org.jetbrains.kotlin.fir.expressions.FirExpression
-import org.jetbrains.kotlin.fir.expressions.FirExpressionWithSmartcast
 import org.jetbrains.kotlin.fir.expressions.FirFunctionCall
 import org.jetbrains.kotlin.fir.expressions.FirPropertyAccessExpression
 import org.jetbrains.kotlin.fir.references.FirErrorNamedReference
+import org.jetbrains.kotlin.fir.resolve.dfa.unwrapSmartcastExpression
 import org.jetbrains.kotlin.fir.resolve.diagnostics.ConePropertyAsOperator
 import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeUnresolvedNameError
 import org.jetbrains.kotlin.util.OperatorNameConventions
@@ -48,10 +48,7 @@ object FirConventionFunctionCallChecker : FirFunctionCallChecker() {
             sourceKind !is KtFakeSourceElementKind.GeneratedComparisonExpression &&
             sourceKind !is KtFakeSourceElementKind.DesugaredCompoundAssignment
         ) return
-        val unwrapped = when (receiver) {
+        val unwrapped = receiver.unwrapSmartcastExpression()
-            is FirExpressionWithSmartcast -> receiver.originalExpression
-            else -> receiver
-        }
         if (unwrapped !is FirPropertyAccessExpression) return
         val diagnostic = unwrapped.nonFatalDiagnostics.firstIsInstanceOrNull<ConePropertyAsOperator>() ?: return
         reporter.reportOn(callExpression.calleeReference.source, FirErrors.PROPERTY_AS_OPERATOR, diagnostic.symbol, context)

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirFunctionReturnTypeMismatchChecker.kt

@@ -16,10 +16,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SMARTCAST_IMPOSSI
 import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction
 import org.jetbrains.kotlin.fir.declarations.FirConstructor
 import org.jetbrains.kotlin.fir.declarations.FirErrorFunction
-import org.jetbrains.kotlin.fir.expressions.FirExpressionWithSmartcast
+import org.jetbrains.kotlin.fir.expressions.*
-import org.jetbrains.kotlin.fir.expressions.FirReturnExpression
-import org.jetbrains.kotlin.fir.expressions.FirWhenExpression
-import org.jetbrains.kotlin.fir.expressions.isExhaustive
 import org.jetbrains.kotlin.fir.types.*
 
 object FirFunctionReturnTypeMismatchChecker : FirReturnExpressionChecker() {
@@ -53,7 +50,7 @@ object FirFunctionReturnTypeMismatchChecker : FirReturnExpressionChecker() {
             } else {
                 val isDueToNullability =
                     context.session.typeContext.isTypeMismatchDueToNullability(returnExpressionType, functionReturnType)
-                if (resultExpression is FirExpressionWithSmartcast && !resultExpression.isStable &&
+                if (resultExpression is FirSmartCastExpression && !resultExpression.isStable &&
                     isSubtypeForTypeMismatch(typeContext, subtype = resultExpression.smartcastType.coneType, supertype = functionReturnType)
                 ) {
                     reporter.reportOn(

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReassignmentAndInvisibleSetterChecker.kt

@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
 import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor
 import org.jetbrains.kotlin.fir.declarations.utils.visibility
-import org.jetbrains.kotlin.fir.expressions.FirExpressionWithSmartcast
+import org.jetbrains.kotlin.fir.expressions.FirSmartCastExpression
 import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment
 import org.jetbrains.kotlin.fir.expressions.toResolvedCallableSymbol
 import org.jetbrains.kotlin.fir.originalForSubstitutionOverride
@@ -58,8 +58,8 @@ object FirReassignmentAndInvisibleSetterChecker : FirVariableAssignmentChecker()
         if (callableSymbol is FirPropertySymbol && shouldInvisibleSetterBeReported(callableSymbol)) {
             val explicitReceiver = expression.explicitReceiver
             // Try to get type from smartcast
-            if (explicitReceiver is FirExpressionWithSmartcast) {
+            if (explicitReceiver is FirSmartCastExpression) {
-                val symbol = explicitReceiver.originalType.toRegularClassSymbol(context.session)
+                val symbol = explicitReceiver.originalExpression.typeRef.toRegularClassSymbol(context.session)
                 if (symbol != null) {
                     for (declarationSymbol in symbol.declarationSymbols) {
                         if (declarationSymbol is FirPropertySymbol && declarationSymbol.name == callableSymbol.name) {

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirWhenConditionChecker.kt

@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
 import org.jetbrains.kotlin.diagnostics.reportOn
 import org.jetbrains.kotlin.fir.expressions.*
 import org.jetbrains.kotlin.fir.expressions.impl.FirElseIfTrueCondition
+import org.jetbrains.kotlin.fir.resolve.dfa.unwrapSmartcastExpression
 import org.jetbrains.kotlin.fir.symbols.impl.FirEnumEntrySymbol
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.coneType
@@ -38,7 +39,7 @@ object FirWhenConditionChecker : FirWhenExpressionChecker() {
             when (val condition = branch.condition) {
                 is FirEqualityOperatorCall -> {
                     val arguments = condition.arguments
-                    if (arguments.size == 2 && arguments[0] is FirWhenSubjectExpression) {
+                    if (arguments.size == 2 && arguments[0].unwrapSmartcastExpression() is FirWhenSubjectExpression) {
                         val value = when (val targetExpression = arguments[1]) {
                             is FirConstExpression<*> -> targetExpression.value
                             is FirQualifiedAccessExpression -> targetExpression.calleeReference.toResolvedCallableSymbol() as? FirEnumEntrySymbol

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt

@@ -215,10 +215,6 @@ private fun FirCallableSymbol<*>.toSymbolForCall(
     isDelegate: Boolean = false
 ): IrSymbol? {
     val dispatchReceiverLookupTag = when {
-        dispatchReceiver is FirExpressionWithSmartcastToNothing && dispatchReceiver.smartcastType.coneType is ConeDynamicType -> {
-            val coneType = dispatchReceiver.smartcastTypeWithoutNullableNothing.coneType
-            coneType.findClassRepresentation(coneType, declarationStorage.session)
-        }
         dispatchReceiver is FirNoReceiverExpression -> {
             val containingClass = containingClass()
             if (containingClass != null && containingClass.classId != StandardClassIds.Any) {

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrImplicitCastInserter.kt

@@ -263,41 +263,15 @@ class Fir2IrImplicitCastInserter(
         return this
     }
 
-    override fun visitExpressionWithSmartcast(expressionWithSmartcast: FirExpressionWithSmartcast, data: IrElement): IrExpression {
+    override fun visitSmartCastExpression(smartCastExpression: FirSmartCastExpression, data: IrElement): IrElement {
-        return if (expressionWithSmartcast.isStable) {
+        // We don't want an implicit cast to Nothing?. This expression just encompasses nullability after null check.
-            implicitCastOrExpression(data as IrExpression, expressionWithSmartcast.typeRef)
+        return if (smartCastExpression.isStable && smartCastExpression.smartcastTypeWithoutNullableNothing == null) {
+            implicitCastOrExpression(data as IrExpression, smartCastExpression.typeRef)
         } else {
             data as IrExpression
         }
     }
 
-    override fun visitExpressionWithSmartcastToNothing(
-        expressionWithSmartcastToNothing: FirExpressionWithSmartcastToNothing,
-        data: IrElement
-    ): IrElement {
-        // We don't want an implicit cast to Nothing?. This expression just encompasses nullability after null check.
-        return data
-    }
-
-    override fun visitWhenSubjectExpressionWithSmartcast(
-        whenSubjectExpressionWithSmartcast: FirWhenSubjectExpressionWithSmartcast,
-        data: IrElement
-    ): IrElement {
-        return if (whenSubjectExpressionWithSmartcast.isStable) {
-            implicitCastOrExpression(data as IrExpression, whenSubjectExpressionWithSmartcast.typeRef)
-        } else {
-            data as IrExpression
-        }
-    }
-
-    override fun visitWhenSubjectExpressionWithSmartcastToNothing(
-        whenSubjectExpressionWithSmartcastToNothing: FirWhenSubjectExpressionWithSmartcastToNothing,
-        data: IrElement
-    ): IrElement {
-        // We don't want an implicit cast to Nothing?. This expression just encompasses nullability after null check.
-        return data
-    }
-
     internal fun implicitCastFromDispatchReceiver(
         original: IrExpression,
         originalTypeRef: FirTypeRef,

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt

@@ -554,34 +554,10 @@ class Fir2IrVisitor(
         return visitQualifiedAccessExpression(thisReceiverExpression, data)
     }
 
-    override fun visitExpressionWithSmartcast(expressionWithSmartcast: FirExpressionWithSmartcast, data: Any?): IrElement {
+    override fun visitSmartCastExpression(smartCastExpression: FirSmartCastExpression, data: Any?): IrElement {
         // Generate the expression with the original type and then cast it to the smart cast type.
-        val value = convertToIrExpression(expressionWithSmartcast.originalExpression)
+        val value = convertToIrExpression(smartCastExpression.originalExpression)
-        return implicitCastInserter.visitExpressionWithSmartcast(expressionWithSmartcast, value)
+        return implicitCastInserter.visitSmartCastExpression(smartCastExpression, value)
-    }
-
-    override fun visitExpressionWithSmartcastToNothing(
-        expressionWithSmartcastToNothing: FirExpressionWithSmartcastToNothing,
-        data: Any?
-    ): IrElement {
-        // This should not be materialized. Generate the expression with the original expression.
-        return convertToIrExpression(expressionWithSmartcastToNothing.originalExpression)
-    }
-
-    override fun visitWhenSubjectExpressionWithSmartcast(
-        whenSubjectExpressionWithSmartcast: FirWhenSubjectExpressionWithSmartcast,
-        data: Any?
-    ): IrElement {
-        val value = visitWhenSubjectExpression(whenSubjectExpressionWithSmartcast.originalExpression, data)
-        return implicitCastInserter.visitWhenSubjectExpressionWithSmartcast(whenSubjectExpressionWithSmartcast, value)
-    }
-
-    override fun visitWhenSubjectExpressionWithSmartcastToNothing(
-        whenSubjectExpressionWithSmartcastToNothing: FirWhenSubjectExpressionWithSmartcastToNothing,
-        data: Any?
-    ): IrElement {
-        // This should not be materialized. Generate the expression with the original expression.
-        return visitWhenSubjectExpression(whenSubjectExpressionWithSmartcastToNothing.originalExpression, data)
     }
 
     override fun visitCallableReferenceAccess(callableReferenceAccess: FirCallableReferenceAccess, data: Any?): IrElement {
@@ -663,7 +639,7 @@ class Fir2IrVisitor(
         return when (expression) {
             null -> return null
             is FirResolvedQualifier -> callGenerator.convertToGetObject(expression, callableReferenceAccess)
-            is FirFunctionCall, is FirThisReceiverExpression, is FirCallableReferenceAccess, is FirExpressionWithSmartcast ->
+            is FirFunctionCall, is FirThisReceiverExpression, is FirCallableReferenceAccess, is FirSmartCastExpression ->
                 convertToIrExpression(expression)
             else -> if (expression is FirQualifiedAccessExpression && expression.explicitReceiver == null) {
                 val variableAsFunctionMode = calleeReference is FirResolvedNamedReference &&

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt

@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.fir.references.builder.buildResolvedNamedReference
 import org.jetbrains.kotlin.fir.references.impl.FirReferencePlaceholderForResolvedAnnotations
 import org.jetbrains.kotlin.fir.render
 import org.jetbrains.kotlin.fir.resolve.calls.FirSyntheticFunctionSymbol
+import org.jetbrains.kotlin.fir.resolve.dfa.unwrapSmartcastExpression
 import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutorByMap
@@ -260,8 +261,9 @@ class CallAndReferenceGenerator(
     // However, FE 1.0 does it, and currently we have no better way to provide these receivers.
     // See KT-49507 and KT-48954 as good examples for cases we try to handle here
     private fun FirExpression.superQualifierSymbolForField(fieldSymbol: IrFieldSymbol): IrClassSymbol? {
-        if (this !is FirQualifiedAccess) return null
+        val unwrapped = this.unwrapSmartcastExpression()
-        if (calleeReference is FirSuperReference) return superQualifierSymbol()
+        if (unwrapped !is FirQualifiedAccess) return null
+        if (unwrapped.calleeReference is FirSuperReference) return superQualifierSymbol()
         if (fieldSymbol.owner.correspondingPropertySymbol != null) return null
         val originalContainingClass = fieldSymbol.owner.parentClassOrNull ?: return null
         val ownContainingClass = typeRef.toIrType().classifierOrNull?.owner as? IrClass ?: return null

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/OperatorExpressionGenerator.kt

@@ -238,7 +238,7 @@ internal class OperatorExpressionGenerator(
         comparisonInfo: PrimitiveConeNumericComparisonInfo?,
         isLeftType: Boolean
     ): IrExpression {
-        val isOriginalNullable = (this as? FirExpressionWithSmartcast)?.originalExpression?.typeRef?.isMarkedNullable ?: false
+        val isOriginalNullable = (this as? FirSmartCastExpression)?.originalExpression?.typeRef?.isMarkedNullable ?: false
         val irExpression = visitor.convertToIrExpression(this)
         val operandType = if (isLeftType) comparisonInfo?.leftType else comparisonInfo?.rightType
         val targetType = comparisonInfo?.comparisonType

compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrTextTestGenerated.java

@@ -2596,12 +2596,6 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
             runTest("compiler/testData/ir/irText/firProblems/InnerClassInAnonymous.kt");
         }
 
-        @Test
-        @TestMetadata("JCTree.kt")
-        public void testJCTree() throws Exception {
-            runTest("compiler/testData/ir/irText/firProblems/JCTree.kt");
-        }
-
         @Test
         @TestMetadata("kt19251.kt")
         public void testKt19251() throws Exception {
@@ -2638,6 +2632,12 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
             runTest("compiler/testData/ir/irText/firProblems/MultiList.kt");
         }
 
+        @Test
+        @TestMetadata("OutBox.kt")
+        public void testOutBox() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/OutBox.kt");
+        }
+
         @Test
         @TestMetadata("putIfAbsent.kt")
         public void testPutIfAbsent() throws Exception {

compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/LightTreeFir2IrTextTestGenerated.java

@@ -2596,12 +2596,6 @@ public class LightTreeFir2IrTextTestGenerated extends AbstractLightTreeFir2IrTex
             runTest("compiler/testData/ir/irText/firProblems/InnerClassInAnonymous.kt");
         }
 
-        @Test
-        @TestMetadata("JCTree.kt")
-        public void testJCTree() throws Exception {
-            runTest("compiler/testData/ir/irText/firProblems/JCTree.kt");
-        }
-
         @Test
         @TestMetadata("kt19251.kt")
         public void testKt19251() throws Exception {
@@ -2638,6 +2632,12 @@ public class LightTreeFir2IrTextTestGenerated extends AbstractLightTreeFir2IrTex
             runTest("compiler/testData/ir/irText/firProblems/MultiList.kt");
         }
 
+        @Test
+        @TestMetadata("OutBox.kt")
+        public void testOutBox() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/OutBox.kt");
+        }
+
         @Test
         @TestMetadata("putIfAbsent.kt")
         public void testPutIfAbsent() throws Exception {

compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/ScopeUtils.kt

@@ -8,8 +8,7 @@ package org.jetbrains.kotlin.fir.resolve
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirClass
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
-import org.jetbrains.kotlin.fir.expressions.FirExpressionWithSmartcast
+import org.jetbrains.kotlin.fir.expressions.FirSmartCastExpression
-import org.jetbrains.kotlin.fir.expressions.FirExpressionWithSmartcastToNothing
 import org.jetbrains.kotlin.fir.resolve.substitution.substitutorByMap
 import org.jetbrains.kotlin.fir.scopes.FakeOverrideTypeCalculator
 import org.jetbrains.kotlin.fir.scopes.FirTypeScope
@@ -25,17 +24,16 @@ import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
 import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
 import org.jetbrains.kotlin.name.ClassId
 
-fun FirExpressionWithSmartcast.smartcastScope(
+fun FirSmartCastExpression.smartcastScope(
     useSiteSession: FirSession,
     scopeSession: ScopeSession
 ): FirTypeScope? {
-    val smartcastType =
+    val smartcastType = smartcastTypeWithoutNullableNothing?.coneType ?: smartcastType.coneType
-        if (this is FirExpressionWithSmartcastToNothing) smartcastTypeWithoutNullableNothing.coneType else smartcastType.coneType
     val smartcastScope = smartcastType.scope(useSiteSession, scopeSession, FakeOverrideTypeCalculator.DoNothing)
     if (isStable) {
         return smartcastScope
     }
-    val originalScope = originalType.coneType.scope(useSiteSession, scopeSession, FakeOverrideTypeCalculator.DoNothing)
+    val originalScope = originalExpression.typeRef.coneType.scope(useSiteSession, scopeSession, FakeOverrideTypeCalculator.DoNothing)
         ?: return smartcastScope
 
     if (smartcastScope == null) {

compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/calls/FirReceivers.kt

@@ -5,10 +5,13 @@
 
 package org.jetbrains.kotlin.fir.resolve.calls
 
+import org.jetbrains.kotlin.KtFakeSourceElementKind
+import org.jetbrains.kotlin.fakeElement
 import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.copyWithNewSourceKind
 import org.jetbrains.kotlin.fir.diagnostics.ConeIntermediateDiagnostic
 import org.jetbrains.kotlin.fir.expressions.*
-import org.jetbrains.kotlin.fir.expressions.builder.buildExpressionWithSmartcast
+import org.jetbrains.kotlin.fir.expressions.builder.buildSmartCastExpression
 import org.jetbrains.kotlin.fir.expressions.builder.buildThisReceiverExpression
 import org.jetbrains.kotlin.fir.references.builder.buildImplicitThisReference
 import org.jetbrains.kotlin.fir.renderWithType
@@ -66,7 +69,7 @@ open class ExpressionReceiverValue(
         if (receiverExpr is FirCheckNotNullCall) {
             receiverExpr = receiverExpr.arguments.firstOrNull()
         }
-        if (receiverExpr is FirExpressionWithSmartcast) {
+        if (receiverExpr is FirSmartCastExpression) {
             return receiverExpr.smartcastScope(useSiteSession, scopeSession)
         }
         return type.scope(useSiteSession, scopeSession, FakeOverrideTypeCalculator.DoNothing)
@@ -107,11 +110,16 @@ sealed class ImplicitReceiverValue<S : FirBasedSymbol<*>>(
         receiverExpression = if (type == originalReceiverExpression.typeRef.coneType) {
             originalReceiverExpression
         } else {
-            buildExpressionWithSmartcast {
+            buildSmartCastExpression {
                 originalExpression = originalReceiverExpression
-                smartcastType = originalReceiverExpression.typeRef.resolvedTypeFromPrototype(type)
+                this.source = originalExpression.source?.fakeElement(KtFakeSourceElementKind.SmartCastExpression)
+                smartcastType = buildResolvedTypeRef {
+                    source = originalReceiverExpression.typeRef.source?.fakeElement(KtFakeSourceElementKind.SmartCastedTypeRef)
+                    this.type = type
+                }
                 typesFromSmartCast = listOf(type)
                 smartcastStability = SmartcastStability.STABLE_VALUE
+                typeRef = smartcastType.copyWithNewSourceKind(KtFakeSourceElementKind.ImplicitTypeRef)
             }
         }
         implicitScope = type.scope(useSiteSession, scopeSession, FakeOverrideTypeCalculator.DoNothing)

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt

@@ -322,24 +322,24 @@ private fun BodyResolveComponents.typeFromSymbol(symbol: FirBasedSymbol<*>, make
 
 fun BodyResolveComponents.transformQualifiedAccessUsingSmartcastInfo(
     qualifiedAccessExpression: FirQualifiedAccessExpression
-): FirQualifiedAccessExpression {
+): FirExpression {
+    val (stability, typesFromSmartCast) =
+        dataFlowAnalyzer.getTypeUsingSmartcastInfo(qualifiedAccessExpression)
+            ?: return qualifiedAccessExpression
     val builder = transformExpressionUsingSmartcastInfo(
         qualifiedAccessExpression,
-        dataFlowAnalyzer::getTypeUsingSmartcastInfo,
+        stability, typesFromSmartCast
-        ::FirExpressionWithSmartcastBuilder,
-        ::FirExpressionWithSmartcastToNothingBuilder
     ) ?: return qualifiedAccessExpression
     return builder.build()
 }
 
 fun BodyResolveComponents.transformWhenSubjectExpressionUsingSmartcastInfo(
     whenSubjectExpression: FirWhenSubjectExpression
-): FirWhenSubjectExpression {
+): FirExpression {
+    val (stability, typesFromSmartCast) = dataFlowAnalyzer.getTypeUsingSmartcastInfo(whenSubjectExpression) ?: return whenSubjectExpression
     val builder = transformExpressionUsingSmartcastInfo(
         whenSubjectExpression,
-        dataFlowAnalyzer::getTypeUsingSmartcastInfo,
+        stability, typesFromSmartCast
-        ::FirWhenSubjectExpressionWithSmartcastBuilder,
-        ::FirWhenSubjectExpressionWithSmartcastToNothingBuilder
     ) ?: return whenSubjectExpression
     return builder.build()
 }
@@ -347,13 +347,18 @@ fun BodyResolveComponents.transformWhenSubjectExpressionUsingSmartcastInfo(
 private val ConeKotlinType.isKindOfNothing
     get() = lowerBoundIfFlexible().let { it.isNothing || it.isNullableNothing }
 
-private inline fun <T : FirExpression> BodyResolveComponents.transformExpressionUsingSmartcastInfo(
+private fun FirSmartCastExpressionBuilder.applyResultTypeRef() {
+    typeRef =
+        if (smartcastStability == SmartcastStability.STABLE_VALUE)
+            smartcastType.copyWithNewSourceKind(KtFakeSourceElementKind.ImplicitTypeRef)
+        else
+            originalExpression.typeRef.copyWithNewSourceKind(KtFakeSourceElementKind.ImplicitTypeRef)
+}
+private fun <T : FirExpression> BodyResolveComponents.transformExpressionUsingSmartcastInfo(
     expression: T,
-    smartcastExtractor: (T) -> Pair<PropertyStability, MutableList<ConeKotlinType>>?,
+    stability: PropertyStability,
-    smartcastBuilder: () -> FirWrappedExpressionWithSmartcastBuilder<T>,
+    typesFromSmartCast: MutableList<ConeKotlinType>
-    smartcastToNothingBuilder: () -> FirWrappedExpressionWithSmartcastToNothingBuilder<T>
+): FirSmartCastExpressionBuilder? {
-): FirWrappedExpressionWithSmartcastBuilder<T>? {
-    val (stability, typesFromSmartCast) = smartcastExtractor(expression) ?: return null
     val smartcastStability = stability.impliedSmartcastStability
         ?: if (dataFlowAnalyzer.isAccessToUnstableLocalVariable(expression)) {
             SmartcastStability.CAPTURED_VARIABLE
@@ -395,20 +400,24 @@ private inline fun <T : FirExpression> BodyResolveComponents.transformExpression
             annotations += expression.resultType.annotations
             delegatedTypeRef = expression.resultType
         }
-        return smartcastToNothingBuilder().apply {
+        return FirSmartCastExpressionBuilder().apply {
             originalExpression = expression
+            source = originalExpression.source?.fakeElement(KtFakeSourceElementKind.SmartCastExpression)
             smartcastType = intersectedTypeRef
             smartcastTypeWithoutNullableNothing = reducedIntersectedTypeRef
             this.typesFromSmartCast = typesFromSmartCast
             this.smartcastStability = smartcastStability
+            applyResultTypeRef()
         }
     }
 
-    return smartcastBuilder().apply {
+    return FirSmartCastExpressionBuilder().apply {
         originalExpression = expression
+        source = originalExpression.source?.fakeElement(KtFakeSourceElementKind.SmartCastExpression)
         smartcastType = intersectedTypeRef
         this.typesFromSmartCast = typesFromSmartCast
         this.smartcastStability = smartcastStability
+        applyResultTypeRef()
     }
 }
 
@@ -419,7 +428,7 @@ fun FirCheckedSafeCallSubject.propagateTypeFromOriginalReceiver(
 ) {
     // If the receiver expression is smartcast to `null`, it would have `Nothing?` as its type, which may not have members called by user
     // code. Hence, we fallback to the type before intersecting with `Nothing?`.
-    val receiverType = ((nullableReceiverExpression as? FirExpressionWithSmartcastToNothing)
+    val receiverType = ((nullableReceiverExpression as? FirSmartCastExpression)
         ?.takeIf { it.isStable }
         ?.smartcastTypeWithoutNullableNothing
         ?: nullableReceiverExpression.typeRef)

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Arguments.kt

@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fir.lookupTracker
 import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
 import org.jetbrains.kotlin.fir.resolve.ScopeSession
 import org.jetbrains.kotlin.fir.resolve.createFunctionalType
+import org.jetbrains.kotlin.fir.resolve.dfa.unwrapSmartcastExpression
 import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
 import org.jetbrains.kotlin.fir.resolve.inference.preprocessCallableReference
 import org.jetbrains.kotlin.fir.resolve.inference.preprocessLambdaArgument
@@ -66,7 +67,7 @@ fun Candidate.resolveArgumentExpression(
         // and then add constraint: typeOf(`$not-null-receiver$.bar()`).makeNullable() <: EXPECTED_TYPE
         // NB: argument.regularQualifiedAccess is either a call or a qualified access
         is FirSafeCallExpression -> {
-            val nestedQualifier = argument.selector
+            val nestedQualifier = (argument.selector as? FirExpression)?.unwrapSmartcastExpression()
             if (nestedQualifier is FirQualifiedAccessExpression) {
                 resolveSubCallArgument(
                     csBuilder,
@@ -403,7 +404,7 @@ private fun checkApplicabilityForArgumentType(
     }
 
     if (!csBuilder.addSubtypeConstraintIfCompatible(argumentType, expectedType, position)) {
-        val smartcastExpression = argument as? FirExpressionWithSmartcast
+        val smartcastExpression = argument as? FirSmartCastExpression
         if (smartcastExpression != null && !smartcastExpression.isStable) {
             val unstableType = smartcastExpression.smartcastType.coneType
             if (csBuilder.addSubtypeConstraintIfCompatible(unstableType, expectedType, position)) {

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStages.kt

@@ -166,7 +166,7 @@ object CheckDispatchReceiver : ResolutionStage() {
         val smartcastedReceiver = when (explicitReceiverExpression) {
             is FirCheckNotNullCall -> explicitReceiverExpression.argument
             else -> explicitReceiverExpression
-        } as? FirExpressionWithSmartcast
+        } as? FirSmartCastExpression
 
         if (smartcastedReceiver != null &&
             !smartcastedReceiver.isStable &&
@@ -184,7 +184,7 @@ object CheckDispatchReceiver : ResolutionStage() {
                 UnstableSmartCast(
                     smartcastedReceiver,
                     targetType,
-                    context.session.typeContext.isTypeMismatchDueToNullability(smartcastedReceiver.originalType.coneType, targetType)
+                    context.session.typeContext.isTypeMismatchDueToNullability(smartcastedReceiver.originalExpression.typeRef.coneType, targetType)
                 )
             )
         } else if (isReceiverNullable) {

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/VisibilityUtils.kt

@@ -5,7 +5,9 @@
 
 package org.jetbrains.kotlin.fir.resolve.calls
 
+import org.jetbrains.kotlin.KtFakeSourceElementKind
 import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.fakeElement
 import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.declarations.FirBackingField
 import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration
@@ -13,9 +15,10 @@ import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirProperty
 import org.jetbrains.kotlin.fir.declarations.utils.getExplicitBackingField
 import org.jetbrains.kotlin.fir.declarations.utils.visibility
-import org.jetbrains.kotlin.fir.expressions.FirExpressionWithSmartcast
+import org.jetbrains.kotlin.fir.expressions.FirSmartCastExpression
 import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment
-import org.jetbrains.kotlin.fir.expressions.builder.buildExpressionWithSmartcast
+import org.jetbrains.kotlin.fir.expressions.builder.buildSmartCastExpression
+import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef
 import org.jetbrains.kotlin.fir.types.coneType
 import org.jetbrains.kotlin.fir.types.isNullableNothing
 import org.jetbrains.kotlin.fir.types.makeConeTypeDefinitelyNotNullOrNotNull
@@ -78,12 +81,14 @@ fun FirVisibilityChecker.isVisible(
 
 private fun removeSmartCastTypeForAttemptToFitVisibility(dispatchReceiverValue: ReceiverValue?, session: FirSession): ReceiverValue? {
     val expressionWithSmartcastIfStable =
-        (dispatchReceiverValue?.receiverExpression as? FirExpressionWithSmartcast)?.takeIf { it.isStable } ?: return null
+        (dispatchReceiverValue?.receiverExpression as? FirSmartCastExpression)?.takeIf { it.isStable } ?: return null
 
     if (dispatchReceiverValue.type.isNullableNothing) return null
 
+    val originalExpression = expressionWithSmartcastIfStable.originalExpression
+    val originalType = originalExpression.typeRef.coneType
     val originalTypeNotNullable =
-        expressionWithSmartcastIfStable.originalType.coneType.makeConeTypeDefinitelyNotNullOrNotNull(session.typeContext)
+        originalType.makeConeTypeDefinitelyNotNullOrNotNull(session.typeContext)
 
     // Basically, this `if` is just for sake of optimizaton
     // We have only nullability enhancement, here, so return initial smart cast receiver value
@@ -91,15 +96,19 @@ private fun removeSmartCastTypeForAttemptToFitVisibility(dispatchReceiverValue:
 
     val expressionForReceiver = with(session.typeContext) {
         when {
-            expressionWithSmartcastIfStable.originalType.coneType.isNullableType() && !dispatchReceiverValue.type.isNullableType() ->
+            originalType.isNullableType() && !dispatchReceiverValue.type.isNullableType() ->
-                buildExpressionWithSmartcast {
+                buildSmartCastExpression {
-                    originalExpression = expressionWithSmartcastIfStable.originalExpression
+                    source = originalExpression.source?.fakeElement(KtFakeSourceElementKind.SmartCastExpression)
-                    smartcastType =
+                    this.originalExpression = originalExpression
-                        expressionWithSmartcastIfStable.originalExpression.typeRef.resolvedTypeFromPrototype(originalTypeNotNullable)
+                    smartcastType = buildResolvedTypeRef {
+                        source = originalExpression.typeRef.source?.fakeElement(KtFakeSourceElementKind.SmartCastedTypeRef)
+                        type = originalTypeNotNullable
+                    }
                     typesFromSmartCast = listOf(originalTypeNotNullable)
                     smartcastStability = expressionWithSmartcastIfStable.smartcastStability
+                    typeRef = smartcastType.copyWithNewSourceKind(KtFakeSourceElementKind.ImplicitTypeRef)
                 }
-            else -> expressionWithSmartcastIfStable.originalExpression
+            else -> originalExpression
         }
     }
 

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirInvokeResolveTowerExtension.kt

@@ -318,7 +318,9 @@ private fun BodyResolveComponents.createExplicitReceiverForInvokeByCallable(
         if (candidate.currentApplicability == CandidateApplicability.K2_PROPERTY_AS_OPERATOR) {
             nonFatalDiagnostics.add(ConePropertyAsOperator(candidate.symbol as FirPropertySymbol))
         }
-    }.build().let(::transformQualifiedAccessUsingSmartcastInfo)
+    }.build().let {
+        transformQualifiedAccessUsingSmartcastInfo(it)
+    }
 }
 
 private class InvokeReceiverResolveTask(

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt

@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.declarations.ContextReceiverGroup
 import org.jetbrains.kotlin.fir.declarations.FirConstructor
 import org.jetbrains.kotlin.fir.declarations.getAnnotationByClassId
 import org.jetbrains.kotlin.fir.declarations.utils.isInner
-import org.jetbrains.kotlin.fir.expressions.FirExpressionWithSmartcast
+import org.jetbrains.kotlin.fir.expressions.FirSmartCastExpression
 import org.jetbrains.kotlin.fir.expressions.builder.buildResolvedQualifier
 import org.jetbrains.kotlin.fir.resolve.*
 import org.jetbrains.kotlin.fir.resolve.calls.*
@@ -84,9 +84,9 @@ class MemberScopeTowerLevel(
         val scope = dispatchReceiverValue.scope(session, scopeSession) ?: return ProcessResult.SCOPE_EMPTY
         var (empty, candidates) = scope.collectCandidates(processScopeMembers)
 
-        val scopeWithoutSmartcast = (dispatchReceiverValue.receiverExpression as? FirExpressionWithSmartcast)
+        val scopeWithoutSmartcast = (dispatchReceiverValue.receiverExpression as? FirSmartCastExpression)
             ?.takeIf { it.isStable }
-            ?.originalType
+            ?.originalExpression?.typeRef
             ?.coneType
             ?.scope(session, scopeSession, bodyResolveComponents.returnTypeCalculator.fakeOverrideTypeCalculator)
         if (scopeWithoutSmartcast == null) {

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

@@ -168,6 +168,7 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
 
     fun isAccessToUnstableLocalVariable(expression: FirExpression): Boolean {
         val qualifiedAccessExpression = when (expression) {
+            is FirSmartCastExpression -> expression.originalExpression as FirQualifiedAccessExpression
             is FirQualifiedAccessExpression -> expression
             is FirWhenSubjectExpression -> {
                 val whenExpression = expression.whenRef.value
@@ -1002,6 +1003,10 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
         processConditionalContract(qualifiedAccessExpression)
     }
 
+    fun exitSmartCastExpression(smartCastExpression: FirSmartCastExpression) {
+        graphBuilder.exitSmartCastExpression(smartCastExpression).mergeIncomingFlow()
+    }
+
     fun enterSafeCallAfterNullCheck(safeCall: FirSafeCallExpression) {
         val node = graphBuilder.enterSafeCall(safeCall).mergeIncomingFlow()
         val previousNode = node.firstPreviousNode
@@ -1239,7 +1244,7 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
             logicSystem.recordNewAssignment(flow, propertyVariable, context.newAssignmentIndex())
         }
 
-        variableStorage.getOrCreateRealVariable(flow, initializer.symbol, initializer)
+        variableStorage.getOrCreateRealVariable(flow, initializer.symbol, initializer.unwrapSmartcastExpression())
             ?.let { initializerVariable ->
                 val isInitializerStable =
                     initializerVariable.isStable || (initializerVariable.hasLocalStability && initializer.isAccessToStableVariable())
@@ -1274,7 +1279,7 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
     }
 
     private fun FirExpression.isAccessToStableVariable(): Boolean =
-        this is FirQualifiedAccessExpression && !isAccessToUnstableLocalVariable(this)
+        !isAccessToUnstableLocalVariable(this)
 
     private val RealVariable.isStable get() = stability == PropertyStability.STABLE_VALUE
     private val RealVariable.hasLocalStability get() = stability == PropertyStability.LOCAL_VAR