[FIR] Rewind DFA after call arguments for correct receiver smartcasting

^KT-63709 Fixed

analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/resolver/resolverUtils.kt

@@ -58,7 +58,10 @@ internal open class StubBodyResolveTransformerComponents(
             override fun receiverUpdated(symbol: FirBasedSymbol<*>, info: TypeStatement?) =
                 error("Should not be called")
 
-            override fun getTypeUsingSmartcastInfo(expression: FirExpression): Pair<PropertyStability, MutableList<ConeKotlinType>>? =
+            override fun getTypeUsingSmartcastInfo(
+                expression: FirExpression,
+                ignoreCallArguments: Boolean,
+            ): Pair<PropertyStability, MutableList<ConeKotlinType>>? =
                 null
         }
 }

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

@@ -45238,6 +45238,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
                 runTest("compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachUnsafe.kt");
             }
 
+            @Test
+            @TestMetadata("invokeRecieverUnsafe.kt")
+            public void testInvokeRecieverUnsafe() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/smartcasts/invokeRecieverUnsafe.kt");
+            }
+
             @Test
             @TestMetadata("kt10463.kt")
             public void testKt10463() throws Exception {

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

@@ -51824,6 +51824,18 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
             runTest("compiler/testData/codegen/box/smartCasts/implicitToGrandSon.kt");
         }
 
+        @Test
+        @TestMetadata("invokeRecieverSmartcastK1.kt")
+        public void testInvokeRecieverSmartcastK1() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/invokeRecieverSmartcastK1.kt");
+        }
+
+        @Test
+        @TestMetadata("invokeRecieverSmartcastK2.kt")
+        public void testInvokeRecieverSmartcastK2() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/invokeRecieverSmartcastK2.kt");
+        }
+
         @Test
         @TestMetadata("kt17725.kt")
         public void testKt17725() throws Exception {

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

@@ -45238,6 +45238,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
                 runTest("compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachUnsafe.kt");
             }
 
+            @Test
+            @TestMetadata("invokeRecieverUnsafe.kt")
+            public void testInvokeRecieverUnsafe() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/smartcasts/invokeRecieverUnsafe.kt");
+            }
+
             @Test
             @TestMetadata("kt10463.kt")
             public void testKt10463() throws Exception {

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

@@ -51824,6 +51824,18 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
             runTest("compiler/testData/codegen/box/smartCasts/implicitToGrandSon.kt");
         }
 
+        @Test
+        @TestMetadata("invokeRecieverSmartcastK1.kt")
+        public void testInvokeRecieverSmartcastK1() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/invokeRecieverSmartcastK1.kt");
+        }
+
+        @Test
+        @TestMetadata("invokeRecieverSmartcastK2.kt")
+        public void testInvokeRecieverSmartcastK2() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/invokeRecieverSmartcastK2.kt");
+        }
+
         @Test
         @TestMetadata("kt17725.kt")
         public void testKt17725() throws Exception {

compiler/fir/analysis-tests/testData/resolve/cfa/initializationInTry.dot

@@ -61,39 +61,54 @@ digraph initializationInTry_kt {
                     subgraph cluster_9 {
                         color=blue
                         18 [label="Enter block"];
-                        19 [label="Function call: R|/getNullableString|()" style="filled" fillcolor=yellow];
-                        20 [label="Check not null: R|/getNullableString|()!!" style="filled" fillcolor=yellow];
-                        21 [label="Variable declaration: lval y: R|kotlin/String|"];
-                        22 [label="Function call: R|/getNullableString|()" style="filled" fillcolor=yellow];
-                        23 [label="Assignment: R|<local>/x|"];
-                        24 [label="Exit block"];
+                        subgraph cluster_10 {
+                            color=blue
+                            19 [label="Function call arguments enter"];
+                            20 [label="Function call arguments exit"];
+                        }
+                        21 [label="Function call: R|/getNullableString|()" style="filled" fillcolor=yellow];
+                        22 [label="Check not null: R|/getNullableString|()!!" style="filled" fillcolor=yellow];
+                        23 [label="Variable declaration: lval y: R|kotlin/String|"];
+                        subgraph cluster_11 {
+                            color=blue
+                            24 [label="Function call arguments enter"];
+                            25 [label="Function call arguments exit"];
+                        }
+                        26 [label="Function call: R|/getNullableString|()" style="filled" fillcolor=yellow];
+                        27 [label="Assignment: R|<local>/x|"];
+                        28 [label="Exit block"];
                     }
-                    25 [label="Try main block exit"];
+                    29 [label="Try main block exit"];
                 }
-                subgraph cluster_10 {
+                subgraph cluster_12 {
                     color=blue
-                    26 [label="Enter finally"];
-                    subgraph cluster_11 {
+                    30 [label="Enter finally"];
+                    subgraph cluster_13 {
                         color=blue
-                        27 [label="Enter block"];
-                        28 [label="Access qualifier kotlin/Unit"];
-                        29 [label="Exit block"];
+                        31 [label="Enter block"];
+                        32 [label="Access qualifier kotlin/Unit"];
+                        33 [label="Exit block"];
                     }
-                    30 [label="Exit finally"];
+                    34 [label="Exit finally"];
                 }
-                31 [label="Try expression exit"];
+                35 [label="Try expression exit"];
             }
-            32 [label="Access variable R|<local>/x|"];
-            33 [label="Function call: R|/takeNullableString|(...)" style="filled" fillcolor=yellow];
-            34 [label="Exit block"];
+            subgraph cluster_14 {
+                color=blue
+                36 [label="Function call arguments enter"];
+                37 [label="Access variable R|<local>/x|"];
+                38 [label="Function call arguments exit"];
+            }
+            39 [label="Function call: R|/takeNullableString|(...)" style="filled" fillcolor=yellow];
+            40 [label="Exit block"];
         }
-        35 [label="Exit function test_1" style="filled" fillcolor=red];
+        41 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     13 -> {14};
     14 -> {15};
     15 -> {16};
     16 -> {17};
-    16 -> {26} [label="onUncaughtException"];
+    16 -> {30} [label="onUncaughtException"];
     17 -> {18};
     18 -> {19};
     19 -> {20};
@@ -101,11 +116,11 @@ digraph initializationInTry_kt {
     21 -> {22};
     22 -> {23};
     23 -> {24};
-    23 -> {26} [label="onUncaughtException"];
     24 -> {25};
     25 -> {26};
     26 -> {27};
     27 -> {28};
+    27 -> {30} [label="onUncaughtException"];
     28 -> {29};
     29 -> {30};
     30 -> {31};
@@ -113,62 +128,76 @@ digraph initializationInTry_kt {
     32 -> {33};
     33 -> {34};
     34 -> {35};
-
-    subgraph cluster_12 {
-        color=red
-        36 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_13 {
-            color=blue
-            37 [label="Enter block"];
-            38 [label="Variable declaration: lval x: R|kotlin/String?|"];
-            subgraph cluster_14 {
-                color=blue
-                39 [label="Try expression enter"];
-                subgraph cluster_15 {
-                    color=blue
-                    40 [label="Try main block enter"];
-                    subgraph cluster_16 {
-                        color=blue
-                        41 [label="Enter block"];
-                        42 [label="Function call: R|/getNullableString|()" style="filled" fillcolor=yellow];
-                        43 [label="Variable declaration: lval y: R|kotlin/String?|"];
-                        44 [label="Function call: R|/getNullableString|()" style="filled" fillcolor=yellow];
-                        45 [label="Assignment: R|<local>/x|"];
-                        46 [label="Exit block"];
-                    }
-                    47 [label="Try main block exit"];
-                }
-                subgraph cluster_17 {
-                    color=blue
-                    48 [label="Enter finally"];
-                    subgraph cluster_18 {
-                        color=blue
-                        49 [label="Enter block"];
-                        50 [label="Access qualifier kotlin/Unit"];
-                        51 [label="Exit block"];
-                    }
-                    52 [label="Exit finally"];
-                }
-                53 [label="Try expression exit"];
-            }
-            54 [label="Access variable R|<local>/x|"];
-            55 [label="Function call: R|/takeNullableString|(...)" style="filled" fillcolor=yellow];
-            56 [label="Exit block"];
-        }
-        57 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
+    35 -> {36};
     36 -> {37};
     37 -> {38};
     38 -> {39};
     39 -> {40};
-    39 -> {48} [label="onUncaughtException"];
     40 -> {41};
-    41 -> {42};
+
+    subgraph cluster_15 {
+        color=red
+        42 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_16 {
+            color=blue
+            43 [label="Enter block"];
+            44 [label="Variable declaration: lval x: R|kotlin/String?|"];
+            subgraph cluster_17 {
+                color=blue
+                45 [label="Try expression enter"];
+                subgraph cluster_18 {
+                    color=blue
+                    46 [label="Try main block enter"];
+                    subgraph cluster_19 {
+                        color=blue
+                        47 [label="Enter block"];
+                        subgraph cluster_20 {
+                            color=blue
+                            48 [label="Function call arguments enter"];
+                            49 [label="Function call arguments exit"];
+                        }
+                        50 [label="Function call: R|/getNullableString|()" style="filled" fillcolor=yellow];
+                        51 [label="Variable declaration: lval y: R|kotlin/String?|"];
+                        subgraph cluster_21 {
+                            color=blue
+                            52 [label="Function call arguments enter"];
+                            53 [label="Function call arguments exit"];
+                        }
+                        54 [label="Function call: R|/getNullableString|()" style="filled" fillcolor=yellow];
+                        55 [label="Assignment: R|<local>/x|"];
+                        56 [label="Exit block"];
+                    }
+                    57 [label="Try main block exit"];
+                }
+                subgraph cluster_22 {
+                    color=blue
+                    58 [label="Enter finally"];
+                    subgraph cluster_23 {
+                        color=blue
+                        59 [label="Enter block"];
+                        60 [label="Access qualifier kotlin/Unit"];
+                        61 [label="Exit block"];
+                    }
+                    62 [label="Exit finally"];
+                }
+                63 [label="Try expression exit"];
+            }
+            subgraph cluster_24 {
+                color=blue
+                64 [label="Function call arguments enter"];
+                65 [label="Access variable R|<local>/x|"];
+                66 [label="Function call arguments exit"];
+            }
+            67 [label="Function call: R|/takeNullableString|(...)" style="filled" fillcolor=yellow];
+            68 [label="Exit block"];
+        }
+        69 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
     42 -> {43};
     43 -> {44};
     44 -> {45};
     45 -> {46};
-    45 -> {48} [label="onUncaughtException"];
+    45 -> {58} [label="onUncaughtException"];
     46 -> {47};
     47 -> {48};
     48 -> {49};
@@ -179,6 +208,19 @@ digraph initializationInTry_kt {
     53 -> {54};
     54 -> {55};
     55 -> {56};
+    55 -> {58} [label="onUncaughtException"];
     56 -> {57};
+    57 -> {58};
+    58 -> {59};
+    59 -> {60};
+    60 -> {61};
+    61 -> {62};
+    62 -> {63};
+    63 -> {64};
+    64 -> {65};
+    65 -> {66};
+    66 -> {67};
+    67 -> {68};
+    68 -> {69};
 
 }

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

@@ -56,21 +56,26 @@ digraph annotatedLocalClass_kt {
                 20 [label="Exit when"];
             }
             21 [label="Local class declaration"];
-            22 [label="Function call: R|/bar|()" style="filled" fillcolor=yellow];
-            23 [label="Exit block"];
+            subgraph cluster_8 {
+                color=blue
+                22 [label="Function call arguments enter"];
+                23 [label="Function call arguments exit"];
+            }
+            24 [label="Function call: R|/bar|()" style="filled" fillcolor=yellow];
+            25 [label="Exit block"];
         }
-        24 [label="Exit function foo" style="filled" fillcolor=red];
+        26 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    subgraph cluster_8 {
+    subgraph cluster_9 {
         color=blue
-        25 [label="Enter class Local" style="filled" fillcolor=red];
-        subgraph cluster_9 {
+        27 [label="Enter class Local" style="filled" fillcolor=red];
+        subgraph cluster_10 {
             color=blue
-            26 [label="Enter function <init>" style="filled" fillcolor=red];
-            27 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
-            28 [label="Exit function <init>" style="filled" fillcolor=red];
+            28 [label="Enter function <init>" style="filled" fillcolor=red];
+            29 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
+            30 [label="Exit function <init>" style="filled" fillcolor=red];
         }
-        29 [label="Exit class Local" style="filled" fillcolor=red];
+        31 [label="Exit class Local" style="filled" fillcolor=red];
     }
     7 -> {8};
     8 -> {9};
@@ -81,35 +86,37 @@ digraph annotatedLocalClass_kt {
     13 -> {20};
     14 -> {15};
     15 -> {16};
-    16 -> {24};
+    16 -> {26};
     16 -> {17} [style=dotted];
     17 -> {18} [style=dotted];
     18 -> {19} [style=dotted];
     19 -> {20} [style=dotted];
     20 -> {21};
-    21 -> {22 25};
-    21 -> {25} [style=dashed];
+    21 -> {22 27};
+    21 -> {27} [style=dashed];
     22 -> {23};
     23 -> {24};
+    24 -> {25};
     25 -> {26};
-    25 -> {29} [style=dotted];
-    25 -> {26} [style=dashed];
-    26 -> {27};
     27 -> {28};
-    28 -> {29} [color=green];
+    27 -> {31} [style=dotted];
+    27 -> {28} [style=dashed];
+    28 -> {29};
+    29 -> {30};
+    30 -> {31} [color=green];
 
-    subgraph cluster_10 {
+    subgraph cluster_11 {
         color=red
-        30 [label="Enter function bar" style="filled" fillcolor=red];
-        subgraph cluster_11 {
+        32 [label="Enter function bar" style="filled" fillcolor=red];
+        subgraph cluster_12 {
             color=blue
-            31 [label="Enter block"];
-            32 [label="Exit block"];
+            33 [label="Enter block"];
+            34 [label="Exit block"];
         }
-        33 [label="Exit function bar" style="filled" fillcolor=red];
+        35 [label="Exit function bar" style="filled" fillcolor=red];
     }
-    30 -> {31};
-    31 -> {32};
     32 -> {33};
+    33 -> {34};
+    34 -> {35};
 
 }

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

@@ -67,49 +67,64 @@ digraph complex_kt {
                             subgraph cluster_12 {
                                 color=blue
                                 25 [label="Enter block"];
-                                26 [label="Function call: this@R|/closeFinally|.R|/AutoCloseable.close|()" style="filled" fillcolor=yellow];
-                                27 [label="Exit block"];
+                                subgraph cluster_13 {
+                                    color=blue
+                                    26 [label="Function call arguments enter"];
+                                    27 [label="Function call arguments exit"];
+                                }
+                                28 [label="Function call: this@R|/closeFinally|.R|/AutoCloseable.close|()" style="filled" fillcolor=yellow];
+                                29 [label="Exit block"];
                             }
-                            28 [label="Try main block exit"];
+                            30 [label="Try main block exit"];
                         }
-                        subgraph cluster_13 {
+                        subgraph cluster_14 {
                             color=blue
-                            29 [label="Catch enter"];
-                            30 [label="Variable declaration: closeException: R|kotlin/Throwable|"];
-                            subgraph cluster_14 {
+                            31 [label="Catch enter"];
+                            32 [label="Variable declaration: closeException: R|kotlin/Throwable|"];
+                            subgraph cluster_15 {
                                 color=blue
-                                31 [label="Enter block"];
-                                32 [label="Access variable R|<local>/cause|"];
-                                33 [label="Smart cast: R|<local>/cause|"];
-                                34 [label="Access variable R|<local>/closeException|"];
-                                35 [label="Function call: R|<local>/cause|.R|kotlin/Throwable.addSuppressed|(...)" style="filled" fillcolor=yellow];
-                                36 [label="Exit block"];
+                                33 [label="Enter block"];
+                                subgraph cluster_16 {
+                                    color=blue
+                                    34 [label="Function call arguments enter"];
+                                    35 [label="Access variable R|<local>/cause|"];
+                                    36 [label="Smart cast: R|<local>/cause|"];
+                                    37 [label="Access variable R|<local>/closeException|"];
+                                    38 [label="Function call arguments exit"];
+                                }
+                                39 [label="Function call: R|<local>/cause|.R|kotlin/Throwable.addSuppressed|(...)" style="filled" fillcolor=yellow];
+                                40 [label="Exit block"];
                             }
-                            37 [label="Catch exit"];
+                            41 [label="Catch exit"];
                         }
-                        38 [label="Try expression exit"];
+                        42 [label="Try expression exit"];
                     }
-                    39 [label="Exit block"];
+                    43 [label="Exit block"];
                 }
-                40 [label="Exit when branch result"];
-                41 [label="Enter when branch result"];
-                subgraph cluster_15 {
+                44 [label="Exit when branch result"];
+                45 [label="Enter when branch result"];
+                subgraph cluster_17 {
                     color=blue
-                    42 [label="Enter block"];
-                    43 [label="Function call: this@R|/closeFinally|.R|/AutoCloseable.close|()" style="filled" fillcolor=yellow];
-                    44 [label="Exit block"];
+                    46 [label="Enter block"];
+                    subgraph cluster_18 {
+                        color=blue
+                        47 [label="Function call arguments enter"];
+                        48 [label="Function call arguments exit"];
+                    }
+                    49 [label="Function call: this@R|/closeFinally|.R|/AutoCloseable.close|()" style="filled" fillcolor=yellow];
+                    50 [label="Exit block"];
                 }
-                45 [label="Exit when branch result"];
-                46 [label="Enter when branch result"];
-                subgraph cluster_16 {
+                51 [label="Exit when branch result"];
+                52 [label="Enter when branch result"];
+                subgraph cluster_19 {
                     color=blue
-                    47 [label="Enter block"];
-                    48 [label="Exit block"];
+                    53 [label="Enter block"];
+                    54 [label="Exit block"];
                 }
-                49 [label="Exit when branch result"];
-                50 [label="Exit when"];
+                55 [label="Exit when branch result"];
+                56 [label="Exit when"];
             }
-            51 [label="Jump: ^closeFinally when () {
+            57 [label="Jump: ^closeFinally when () {
     ==(this@R|/closeFinally|, Null(null)) ->  {
     }
     ==(R|<local>/cause|, Null(null)) ->  {
@@ -126,10 +141,10 @@ digraph complex_kt {
     }
 }
 "];
-            52 [label="Stub" style="filled" fillcolor=gray];
-            53 [label="Exit block" style="filled" fillcolor=gray];
+            58 [label="Stub" style="filled" fillcolor=gray];
+            59 [label="Exit block" style="filled" fillcolor=gray];
         }
-        54 [label="Exit function closeFinally" style="filled" fillcolor=red];
+        60 [label="Exit function closeFinally" style="filled" fillcolor=red];
     }
     6 -> {7};
     7 -> {8};
@@ -138,24 +153,24 @@ digraph complex_kt {
     10 -> {11};
     11 -> {12};
     12 -> {13};
-    13 -> {14 46};
+    13 -> {14 52};
     14 -> {15};
     15 -> {16};
     16 -> {17};
     17 -> {18};
-    18 -> {19 41};
+    18 -> {19 45};
     19 -> {20};
     20 -> {21};
     21 -> {22};
     22 -> {23};
-    23 -> {24 29};
+    23 -> {24 31};
     24 -> {25};
     25 -> {26};
     26 -> {27};
     27 -> {28};
-    28 -> {29 38};
+    28 -> {29};
     29 -> {30};
-    30 -> {31};
+    30 -> {31 42};
     31 -> {32};
     32 -> {33};
     33 -> {34};
@@ -165,108 +180,123 @@ digraph complex_kt {
     37 -> {38};
     38 -> {39};
     39 -> {40};
-    40 -> {50};
+    40 -> {41};
     41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {45};
-    45 -> {50};
+    44 -> {56};
+    45 -> {46};
     46 -> {47};
     47 -> {48};
     48 -> {49};
     49 -> {50};
     50 -> {51};
-    51 -> {54};
-    51 -> {52} [style=dotted];
-    52 -> {53} [style=dotted];
-    53 -> {54} [style=dotted];
-
-    subgraph cluster_17 {
-        color=red
-        55 [label="Enter function firstIsInstanceOrNull" style="filled" fillcolor=red];
-        subgraph cluster_18 {
-            color=blue
-            56 [label="Enter block"];
-            subgraph cluster_19 {
-                color=blue
-                57 [label="Enter block"];
-                58 [label="Access variable this@R|/firstIsInstanceOrNull|"];
-                59 [label="Function call: this@R|/firstIsInstanceOrNull|.R|SubstitutionOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<kotlin/Any?>|>|()" style="filled" fillcolor=yellow];
-                60 [label="Variable declaration: lval <iterator>: R|kotlin/collections/Iterator<kotlin/Any?>|"];
-                subgraph cluster_20 {
-                    color=blue
-                    61 [label="Enter while loop"];
-                    subgraph cluster_21 {
-                        color=blue
-                        62 [label="Enter loop condition"];
-                        63 [label="Access variable R|<local>/<iterator>|"];
-                        64 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.hasNext: R|kotlin/Boolean|>|()" style="filled" fillcolor=yellow];
-                        65 [label="Exit loop condition"];
-                    }
-                    subgraph cluster_22 {
-                        color=blue
-                        66 [label="Enter loop block"];
-                        subgraph cluster_23 {
-                            color=blue
-                            67 [label="Enter block"];
-                            68 [label="Access variable R|<local>/<iterator>|"];
-                            69 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|kotlin/Any?|>|()" style="filled" fillcolor=yellow];
-                            70 [label="Variable declaration: lval element: R|kotlin/Any?|"];
-                            subgraph cluster_24 {
-                                color=blue
-                                71 [label="Enter block"];
-                                subgraph cluster_25 {
-                                    color=blue
-                                    72 [label="Enter when"];
-                                    subgraph cluster_26 {
-                                        color=blue
-                                        73 [label="Enter when branch condition "];
-                                        74 [label="Access variable R|<local>/element|"];
-                                        75 [label="Type operator: (R|<local>/element| is R|T|)"];
-                                        76 [label="Exit when branch condition"];
-                                    }
-                                    77 [label="Synthetic else branch"];
-                                    78 [label="Enter when branch result"];
-                                    subgraph cluster_27 {
-                                        color=blue
-                                        79 [label="Enter block"];
-                                        80 [label="Access variable R|<local>/element|"];
-                                        81 [label="Smart cast: R|<local>/element|"];
-                                        82 [label="Jump: ^firstIsInstanceOrNull R|<local>/element|"];
-                                        83 [label="Stub" style="filled" fillcolor=gray];
-                                        84 [label="Exit block" style="filled" fillcolor=gray];
-                                    }
-                                    85 [label="Exit when branch result" style="filled" fillcolor=gray];
-                                    86 [label="Exit when"];
-                                }
-                                87 [label="Exit block"];
-                            }
-                            88 [label="Exit block"];
-                        }
-                        89 [label="Exit loop block"];
-                    }
-                    90 [label="Exit while loop"];
-                }
-                91 [label="Exit block"];
-            }
-            92 [label="Const: Null(null)"];
-            93 [label="Jump: ^firstIsInstanceOrNull Null(null)"];
-            94 [label="Stub" style="filled" fillcolor=gray];
-            95 [label="Exit block" style="filled" fillcolor=gray];
-        }
-        96 [label="Exit function firstIsInstanceOrNull" style="filled" fillcolor=red];
-    }
+    51 -> {56};
+    52 -> {53};
+    53 -> {54};
+    54 -> {55};
     55 -> {56};
     56 -> {57};
-    57 -> {58};
-    58 -> {59};
-    59 -> {60};
-    60 -> {61};
+    57 -> {60};
+    57 -> {58} [style=dotted];
+    58 -> {59} [style=dotted];
+    59 -> {60} [style=dotted];
+
+    subgraph cluster_20 {
+        color=red
+        61 [label="Enter function firstIsInstanceOrNull" style="filled" fillcolor=red];
+        subgraph cluster_21 {
+            color=blue
+            62 [label="Enter block"];
+            subgraph cluster_22 {
+                color=blue
+                63 [label="Enter block"];
+                subgraph cluster_23 {
+                    color=blue
+                    64 [label="Function call arguments enter"];
+                    65 [label="Access variable this@R|/firstIsInstanceOrNull|"];
+                    66 [label="Function call arguments exit"];
+                }
+                67 [label="Function call: this@R|/firstIsInstanceOrNull|.R|SubstitutionOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<kotlin/Any?>|>|()" style="filled" fillcolor=yellow];
+                68 [label="Variable declaration: lval <iterator>: R|kotlin/collections/Iterator<kotlin/Any?>|"];
+                subgraph cluster_24 {
+                    color=blue
+                    69 [label="Enter while loop"];
+                    subgraph cluster_25 {
+                        color=blue
+                        70 [label="Enter loop condition"];
+                        subgraph cluster_26 {
+                            color=blue
+                            71 [label="Function call arguments enter"];
+                            72 [label="Access variable R|<local>/<iterator>|"];
+                            73 [label="Function call arguments exit"];
+                        }
+                        74 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.hasNext: R|kotlin/Boolean|>|()" style="filled" fillcolor=yellow];
+                        75 [label="Exit loop condition"];
+                    }
+                    subgraph cluster_27 {
+                        color=blue
+                        76 [label="Enter loop block"];
+                        subgraph cluster_28 {
+                            color=blue
+                            77 [label="Enter block"];
+                            subgraph cluster_29 {
+                                color=blue
+                                78 [label="Function call arguments enter"];
+                                79 [label="Access variable R|<local>/<iterator>|"];
+                                80 [label="Function call arguments exit"];
+                            }
+                            81 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|kotlin/Any?|>|()" style="filled" fillcolor=yellow];
+                            82 [label="Variable declaration: lval element: R|kotlin/Any?|"];
+                            subgraph cluster_30 {
+                                color=blue
+                                83 [label="Enter block"];
+                                subgraph cluster_31 {
+                                    color=blue
+                                    84 [label="Enter when"];
+                                    subgraph cluster_32 {
+                                        color=blue
+                                        85 [label="Enter when branch condition "];
+                                        86 [label="Access variable R|<local>/element|"];
+                                        87 [label="Type operator: (R|<local>/element| is R|T|)"];
+                                        88 [label="Exit when branch condition"];
+                                    }
+                                    89 [label="Synthetic else branch"];
+                                    90 [label="Enter when branch result"];
+                                    subgraph cluster_33 {
+                                        color=blue
+                                        91 [label="Enter block"];
+                                        92 [label="Access variable R|<local>/element|"];
+                                        93 [label="Smart cast: R|<local>/element|"];
+                                        94 [label="Jump: ^firstIsInstanceOrNull R|<local>/element|"];
+                                        95 [label="Stub" style="filled" fillcolor=gray];
+                                        96 [label="Exit block" style="filled" fillcolor=gray];
+                                    }
+                                    97 [label="Exit when branch result" style="filled" fillcolor=gray];
+                                    98 [label="Exit when"];
+                                }
+                                99 [label="Exit block"];
+                            }
+                            100 [label="Exit block"];
+                        }
+                        101 [label="Exit loop block"];
+                    }
+                    102 [label="Exit while loop"];
+                }
+                103 [label="Exit block"];
+            }
+            104 [label="Const: Null(null)"];
+            105 [label="Jump: ^firstIsInstanceOrNull Null(null)"];
+            106 [label="Stub" style="filled" fillcolor=gray];
+            107 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        108 [label="Exit function firstIsInstanceOrNull" style="filled" fillcolor=red];
+    }
     61 -> {62};
     62 -> {63};
     63 -> {64};
     64 -> {65};
-    65 -> {66 90};
+    65 -> {66};
     66 -> {67};
     67 -> {68};
     68 -> {69};
@@ -276,28 +306,40 @@ digraph complex_kt {
     72 -> {73};
     73 -> {74};
     74 -> {75};
-    75 -> {76};
-    76 -> {77 78};
-    77 -> {86};
+    75 -> {76 102};
+    76 -> {77};
+    77 -> {78};
     78 -> {79};
     79 -> {80};
     80 -> {81};
     81 -> {82};
-    82 -> {96};
-    82 -> {83} [style=dotted];
-    83 -> {84} [style=dotted];
-    84 -> {85} [style=dotted];
-    85 -> {86} [style=dotted];
+    82 -> {83};
+    83 -> {84};
+    84 -> {85};
+    85 -> {86};
     86 -> {87};
     87 -> {88};
-    88 -> {89};
-    89 -> {62} [color=green style=dashed];
+    88 -> {89 90};
+    89 -> {98};
     90 -> {91};
     91 -> {92};
     92 -> {93};
-    93 -> {96};
-    93 -> {94} [style=dotted];
+    93 -> {94};
+    94 -> {108};
     94 -> {95} [style=dotted];
     95 -> {96} [style=dotted];
+    96 -> {97} [style=dotted];
+    97 -> {98} [style=dotted];
+    98 -> {99};
+    99 -> {100};
+    100 -> {101};
+    101 -> {70} [color=green style=dashed];
+    102 -> {103};
+    103 -> {104};
+    104 -> {105};
+    105 -> {108};
+    105 -> {106} [style=dotted];
+    106 -> {107} [style=dotted];
+    107 -> {108} [style=dotted];
 
 }

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

@@ -47,30 +47,45 @@ digraph defaultArguments_kt {
         subgraph cluster_5 {
             color=blue
             17 [label="Enter default value of z" style="filled" fillcolor=red];
-            18 [label="Postponed enter to lambda"];
             subgraph cluster_6 {
                 color=blue
-                19 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                18 [label="Function call arguments enter"];
+                19 [label="Postponed enter to lambda"];
                 subgraph cluster_7 {
                     color=blue
-                    20 [label="Enter block"];
-                    21 [label="Function call: R|/foo|()" style="filled" fillcolor=yellow];
-                    22 [label="Exit block"];
+                    20 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_8 {
+                        color=blue
+                        21 [label="Enter block"];
+                        subgraph cluster_9 {
+                            color=blue
+                            22 [label="Function call arguments enter"];
+                            23 [label="Function call arguments exit"];
+                        }
+                        24 [label="Function call: R|/foo|()" style="filled" fillcolor=yellow];
+                        25 [label="Exit block"];
+                    }
+                    26 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                 }
-                23 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                27 [label="Function call arguments exit"];
             }
-            24 [label="Postponed exit from lambda"];
-            25 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
-            26 [label="Exit default value of z" style="filled" fillcolor=red];
+            28 [label="Postponed exit from lambda"];
+            29 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
+            30 [label="Exit default value of z" style="filled" fillcolor=red];
         }
-        27 [label="Exit default value of z"];
-        subgraph cluster_8 {
+        31 [label="Exit default value of z"];
+        subgraph cluster_10 {
             color=blue
-            28 [label="Enter block"];
-            29 [label="Function call: R|/foo|()" style="filled" fillcolor=yellow];
-            30 [label="Exit block"];
+            32 [label="Enter block"];
+            subgraph cluster_11 {
+                color=blue
+                33 [label="Function call arguments enter"];
+                34 [label="Function call arguments exit"];
+            }
+            35 [label="Function call: R|/foo|()" style="filled" fillcolor=yellow];
+            36 [label="Exit block"];
         }
-        31 [label="Exit function test" style="filled" fillcolor=red];
+        37 [label="Exit function test" style="filled" fillcolor=red];
     }
     9 -> {10};
     10 -> {11 15};
@@ -80,23 +95,29 @@ digraph defaultArguments_kt {
     13 -> {14};
     14 -> {15};
     15 -> {16};
-    16 -> {17 27};
+    16 -> {17 31};
     16 -> {17} [style=dashed];
     17 -> {18};
-    18 -> {19 25};
-    18 -> {24} [style=dotted];
-    18 -> {19} [style=dashed];
-    19 -> {20};
+    18 -> {19};
+    19 -> {20 27};
+    19 -> {28} [style=dotted];
+    19 -> {20} [style=dashed];
     20 -> {21};
     21 -> {22};
     22 -> {23};
     23 -> {24};
     24 -> {25};
     25 -> {26};
-    26 -> {27};
-    27 -> {28};
+    26 -> {28};
+    27 -> {29};
     28 -> {29};
     29 -> {30};
     30 -> {31};
+    31 -> {32};
+    32 -> {33};
+    33 -> {34};
+    34 -> {35};
+    35 -> {36};
+    36 -> {37};
 
 }

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

@@ -21,10 +21,15 @@ digraph flowFromInplaceLambda3_kt {
                 4 [label="Enter block"];
                 5 [label="Exit block"];
             }
-            6 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            7 [label="Exit block"];
+            subgraph cluster_4 {
+                color=blue
+                6 [label="Function call arguments enter"];
+                7 [label="Function call arguments exit"];
+            }
+            8 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            9 [label="Exit block"];
         }
-        8 [label="Exit function unknown" style="filled" fillcolor=red];
+        10 [label="Exit function unknown" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
@@ -32,68 +37,63 @@ digraph flowFromInplaceLambda3_kt {
     5 -> {6};
     6 -> {7};
     7 -> {8};
-
-    subgraph cluster_4 {
-        color=red
-        9 [label="Enter function atLeastOnce" style="filled" fillcolor=red];
-        subgraph cluster_5 {
-            color=blue
-            10 [label="Enter block"];
-            subgraph cluster_6 {
-                color=blue
-                11 [label="Enter block"];
-                12 [label="Exit block"];
-            }
-            13 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            14 [label="Exit block"];
-        }
-        15 [label="Exit function atLeastOnce" style="filled" fillcolor=red];
-    }
+    8 -> {9};
     9 -> {10};
-    10 -> {11};
+
+    subgraph cluster_5 {
+        color=red
+        11 [label="Enter function atLeastOnce" style="filled" fillcolor=red];
+        subgraph cluster_6 {
+            color=blue
+            12 [label="Enter block"];
+            subgraph cluster_7 {
+                color=blue
+                13 [label="Enter block"];
+                14 [label="Exit block"];
+            }
+            subgraph cluster_8 {
+                color=blue
+                15 [label="Function call arguments enter"];
+                16 [label="Function call arguments exit"];
+            }
+            17 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            18 [label="Exit block"];
+        }
+        19 [label="Exit function atLeastOnce" style="filled" fillcolor=red];
+    }
     11 -> {12};
     12 -> {13};
     13 -> {14};
     14 -> {15};
-
-    subgraph cluster_7 {
-        color=red
-        16 [label="Enter function exactlyOnce" style="filled" fillcolor=red];
-        subgraph cluster_8 {
-            color=blue
-            17 [label="Enter block"];
-            subgraph cluster_9 {
-                color=blue
-                18 [label="Enter block"];
-                19 [label="Exit block"];
-            }
-            20 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            21 [label="Exit block"];
-        }
-        22 [label="Exit function exactlyOnce" style="filled" fillcolor=red];
-    }
+    15 -> {16};
     16 -> {17};
     17 -> {18};
     18 -> {19};
-    19 -> {20};
-    20 -> {21};
-    21 -> {22};
 
-    subgraph cluster_10 {
+    subgraph cluster_9 {
         color=red
-        23 [label="Enter function atMostOnce" style="filled" fillcolor=red];
-        subgraph cluster_11 {
+        20 [label="Enter function exactlyOnce" style="filled" fillcolor=red];
+        subgraph cluster_10 {
             color=blue
-            24 [label="Enter block"];
+            21 [label="Enter block"];
+            subgraph cluster_11 {
+                color=blue
+                22 [label="Enter block"];
+                23 [label="Exit block"];
+            }
             subgraph cluster_12 {
                 color=blue
-                25 [label="Enter block"];
-                26 [label="Exit block"];
+                24 [label="Function call arguments enter"];
+                25 [label="Function call arguments exit"];
             }
+            26 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
             27 [label="Exit block"];
         }
-        28 [label="Exit function atMostOnce" style="filled" fillcolor=red];
+        28 [label="Exit function exactlyOnce" style="filled" fillcolor=red];
     }
+    20 -> {21};
+    21 -> {22};
+    22 -> {23};
     23 -> {24};
     24 -> {25};
     25 -> {26};
@@ -102,102 +102,93 @@ digraph flowFromInplaceLambda3_kt {
 
     subgraph cluster_13 {
         color=red
-        29 [label="Enter function test1" style="filled" fillcolor=red];
+        29 [label="Enter function atMostOnce" style="filled" fillcolor=red];
         subgraph cluster_14 {
             color=blue
             30 [label="Enter block"];
-            31 [label="Variable declaration: lvar x: R|kotlin/Any?|"];
-            32 [label="Const: String()"];
-            33 [label="Assignment: R|<local>/x|"];
-            34 [label="Access variable R|<local>/x|"];
-            35 [label="Smart cast: R|<local>/x|"];
-            36 [label="Access variable R|kotlin/String.length|"];
-            37 [label="Postponed enter to lambda"];
             subgraph cluster_15 {
                 color=blue
-                38 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_16 {
-                    color=blue
-                    39 [label="Enter block"];
-                    40 [label="Const: Int(1)"];
-                    41 [label="Assignment: R|<local>/x|"];
-                    42 [label="Exit block"];
-                }
-                43 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                31 [label="Enter block"];
+                32 [label="Exit block"];
             }
-            44 [label="Postponed exit from lambda"];
-            45 [label="Function call: R|/unknown|(...)" style="filled" fillcolor=yellow];
-            46 [label="Access variable R|<local>/x|"];
-            47 [label="Smart cast: R|<local>/x|"];
-            48 [label="Access variable <Unresolved name: length>#"];
-            49 [label="Access variable R|<local>/x|"];
-            50 [label="Smart cast: R|<local>/x|"];
-            51 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()" style="filled" fillcolor=yellow];
-            52 [label="Exit block"];
+            33 [label="Exit block"];
         }
-        53 [label="Exit function test1" style="filled" fillcolor=red];
+        34 [label="Exit function atMostOnce" style="filled" fillcolor=red];
     }
     29 -> {30};
     30 -> {31};
     31 -> {32};
     32 -> {33};
     33 -> {34};
-    34 -> {35};
+
+    subgraph cluster_16 {
+        color=red
+        35 [label="Enter function test1" style="filled" fillcolor=red];
+        subgraph cluster_17 {
+            color=blue
+            36 [label="Enter block"];
+            37 [label="Variable declaration: lvar x: R|kotlin/Any?|"];
+            38 [label="Const: String()"];
+            39 [label="Assignment: R|<local>/x|"];
+            40 [label="Access variable R|<local>/x|"];
+            41 [label="Smart cast: R|<local>/x|"];
+            42 [label="Access variable R|kotlin/String.length|"];
+            subgraph cluster_18 {
+                color=blue
+                43 [label="Function call arguments enter"];
+                44 [label="Postponed enter to lambda"];
+                subgraph cluster_19 {
+                    color=blue
+                    45 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_20 {
+                        color=blue
+                        46 [label="Enter block"];
+                        47 [label="Const: Int(1)"];
+                        48 [label="Assignment: R|<local>/x|"];
+                        49 [label="Exit block"];
+                    }
+                    50 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                51 [label="Function call arguments exit"];
+            }
+            52 [label="Postponed exit from lambda"];
+            53 [label="Function call: R|/unknown|(...)" style="filled" fillcolor=yellow];
+            54 [label="Access variable R|<local>/x|"];
+            55 [label="Smart cast: R|<local>/x|"];
+            56 [label="Access variable <Unresolved name: length>#"];
+            subgraph cluster_21 {
+                color=blue
+                57 [label="Function call arguments enter"];
+                58 [label="Access variable R|<local>/x|"];
+                59 [label="Smart cast: R|<local>/x|"];
+                60 [label="Function call arguments exit"];
+            }
+            61 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()" style="filled" fillcolor=yellow];
+            62 [label="Exit block"];
+        }
+        63 [label="Exit function test1" style="filled" fillcolor=red];
+    }
     35 -> {36};
     36 -> {37};
-    37 -> {38 44 45};
-    37 -> {38} [style=dashed];
+    37 -> {38};
     38 -> {39};
     39 -> {40};
     40 -> {41};
     41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {45};
-    44 -> {37} [color=green style=dashed];
+    44 -> {45 51 52};
+    44 -> {45} [style=dashed];
     45 -> {46};
     46 -> {47};
     47 -> {48};
     48 -> {49};
     49 -> {50};
-    50 -> {51};
-    51 -> {52};
+    50 -> {52};
+    51 -> {53};
     52 -> {53};
-
-    subgraph cluster_17 {
-        color=red
-        54 [label="Enter function test1m" style="filled" fillcolor=red];
-        subgraph cluster_18 {
-            color=blue
-            55 [label="Enter block"];
-            56 [label="Variable declaration: lvar x: R|kotlin/Any?|"];
-            57 [label="Const: String()"];
-            58 [label="Assignment: R|<local>/x|"];
-            59 [label="Access variable R|<local>/x|"];
-            60 [label="Smart cast: R|<local>/x|"];
-            61 [label="Access variable R|kotlin/String.length|"];
-            62 [label="Postponed enter to lambda"];
-            subgraph cluster_19 {
-                color=blue
-                63 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_20 {
-                    color=blue
-                    64 [label="Enter block"];
-                    65 [label="Const: String()"];
-                    66 [label="Assignment: R|<local>/x|"];
-                    67 [label="Exit block"];
-                }
-                68 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            69 [label="Postponed exit from lambda"];
-            70 [label="Function call: R|/unknown|(...)" style="filled" fillcolor=yellow];
-            71 [label="Access variable R|<local>/x|"];
-            72 [label="Smart cast: R|<local>/x|"];
-            73 [label="Access variable R|kotlin/String.length|"];
-            74 [label="Exit block"];
-        }
-        75 [label="Exit function test1m" style="filled" fillcolor=red];
-    }
+    52 -> {44} [color=green style=dashed];
+    53 -> {54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
@@ -206,142 +197,199 @@ digraph flowFromInplaceLambda3_kt {
     59 -> {60};
     60 -> {61};
     61 -> {62};
-    62 -> {63 69 70};
-    62 -> {63} [style=dashed];
-    63 -> {64};
+    62 -> {63};
+
+    subgraph cluster_22 {
+        color=red
+        64 [label="Enter function test1m" style="filled" fillcolor=red];
+        subgraph cluster_23 {
+            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="Smart cast: R|<local>/x|"];
+            71 [label="Access variable R|kotlin/String.length|"];
+            subgraph cluster_24 {
+                color=blue
+                72 [label="Function call arguments enter"];
+                73 [label="Postponed enter to lambda"];
+                subgraph cluster_25 {
+                    color=blue
+                    74 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_26 {
+                        color=blue
+                        75 [label="Enter block"];
+                        76 [label="Const: String()"];
+                        77 [label="Assignment: R|<local>/x|"];
+                        78 [label="Exit block"];
+                    }
+                    79 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                80 [label="Function call arguments exit"];
+            }
+            81 [label="Postponed exit from lambda"];
+            82 [label="Function call: R|/unknown|(...)" style="filled" fillcolor=yellow];
+            83 [label="Access variable R|<local>/x|"];
+            84 [label="Smart cast: R|<local>/x|"];
+            85 [label="Access variable R|kotlin/String.length|"];
+            86 [label="Exit block"];
+        }
+        87 [label="Exit function test1m" style="filled" fillcolor=red];
+    }
     64 -> {65};
     65 -> {66};
     66 -> {67};
     67 -> {68};
     68 -> {69};
     69 -> {70};
-    69 -> {62} [color=green style=dashed];
     70 -> {71};
     71 -> {72};
     72 -> {73};
-    73 -> {74};
+    73 -> {74 80 81};
+    73 -> {74} [style=dashed];
     74 -> {75};
-
-    subgraph cluster_21 {
-        color=red
-        76 [label="Enter function test2" style="filled" fillcolor=red];
-        subgraph cluster_22 {
-            color=blue
-            77 [label="Enter block"];
-            78 [label="Variable declaration: lvar x: R|kotlin/Any?|"];
-            79 [label="Const: String()"];
-            80 [label="Assignment: R|<local>/x|"];
-            81 [label="Access variable R|<local>/x|"];
-            82 [label="Smart cast: R|<local>/x|"];
-            83 [label="Access variable R|kotlin/String.length|"];
-            84 [label="Postponed enter to lambda"];
-            subgraph cluster_23 {
-                color=blue
-                85 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_24 {
-                    color=blue
-                    86 [label="Enter block"];
-                    87 [label="Const: Int(1)"];
-                    88 [label="Assignment: R|<local>/x|"];
-                    89 [label="Exit block"];
-                }
-                90 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            91 [label="Postponed exit from lambda"];
-            92 [label="Function call: R|/atLeastOnce|(...)" style="filled" fillcolor=yellow];
-            93 [label="Access variable R|<local>/x|"];
-            94 [label="Smart cast: R|<local>/x|"];
-            95 [label="Access variable <Unresolved name: length>#"];
-            96 [label="Access variable R|<local>/x|"];
-            97 [label="Smart cast: R|<local>/x|"];
-            98 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
-            99 [label="Exit block"];
-        }
-        100 [label="Exit function test2" style="filled" fillcolor=red];
-    }
+    75 -> {76};
     76 -> {77};
     77 -> {78};
     78 -> {79};
-    79 -> {80};
-    80 -> {81};
+    79 -> {81};
+    80 -> {82};
     81 -> {82};
+    81 -> {73} [color=green style=dashed];
     82 -> {83};
     83 -> {84};
-    84 -> {85 92};
-    84 -> {91} [style=dotted];
-    84 -> {85} [style=dashed];
+    84 -> {85};
     85 -> {86};
     86 -> {87};
-    87 -> {88};
+
+    subgraph cluster_27 {
+        color=red
+        88 [label="Enter function test2" style="filled" fillcolor=red];
+        subgraph cluster_28 {
+            color=blue
+            89 [label="Enter block"];
+            90 [label="Variable declaration: lvar x: R|kotlin/Any?|"];
+            91 [label="Const: String()"];
+            92 [label="Assignment: R|<local>/x|"];
+            93 [label="Access variable R|<local>/x|"];
+            94 [label="Smart cast: R|<local>/x|"];
+            95 [label="Access variable R|kotlin/String.length|"];
+            subgraph cluster_29 {
+                color=blue
+                96 [label="Function call arguments enter"];
+                97 [label="Postponed enter to lambda"];
+                subgraph cluster_30 {
+                    color=blue
+                    98 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_31 {
+                        color=blue
+                        99 [label="Enter block"];
+                        100 [label="Const: Int(1)"];
+                        101 [label="Assignment: R|<local>/x|"];
+                        102 [label="Exit block"];
+                    }
+                    103 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                104 [label="Function call arguments exit"];
+            }
+            105 [label="Postponed exit from lambda"];
+            106 [label="Function call: R|/atLeastOnce|(...)" style="filled" fillcolor=yellow];
+            107 [label="Access variable R|<local>/x|"];
+            108 [label="Smart cast: R|<local>/x|"];
+            109 [label="Access variable <Unresolved name: length>#"];
+            subgraph cluster_32 {
+                color=blue
+                110 [label="Function call arguments enter"];
+                111 [label="Access variable R|<local>/x|"];
+                112 [label="Smart cast: R|<local>/x|"];
+                113 [label="Function call arguments exit"];
+            }
+            114 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
+            115 [label="Exit block"];
+        }
+        116 [label="Exit function test2" style="filled" fillcolor=red];
+    }
     88 -> {89};
     89 -> {90};
     90 -> {91};
     91 -> {92};
-    91 -> {84} [color=green style=dashed];
     92 -> {93};
     93 -> {94};
     94 -> {95};
     95 -> {96};
     96 -> {97};
-    97 -> {98};
+    97 -> {98 104};
+    97 -> {105} [style=dotted];
+    97 -> {98} [style=dashed];
     98 -> {99};
     99 -> {100};
-
-    subgraph cluster_25 {
-        color=red
-        101 [label="Enter function test3" style="filled" fillcolor=red];
-        subgraph cluster_26 {
-            color=blue
-            102 [label="Enter block"];
-            103 [label="Variable declaration: lvar x: R|kotlin/Any?|"];
-            104 [label="Const: String()"];
-            105 [label="Assignment: R|<local>/x|"];
-            106 [label="Access variable R|<local>/x|"];
-            107 [label="Smart cast: R|<local>/x|"];
-            108 [label="Access variable R|kotlin/String.length|"];
-            109 [label="Postponed enter to lambda"];
-            subgraph cluster_27 {
-                color=blue
-                110 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_28 {
-                    color=blue
-                    111 [label="Enter block"];
-                    112 [label="Const: Int(1)"];
-                    113 [label="Assignment: R|<local>/x|"];
-                    114 [label="Exit block"];
-                }
-                115 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            116 [label="Postponed exit from lambda"];
-            117 [label="Function call: R|/exactlyOnce|(...)" style="filled" fillcolor=yellow];
-            118 [label="Access variable R|<local>/x|"];
-            119 [label="Smart cast: R|<local>/x|"];
-            120 [label="Access variable <Unresolved name: length>#"];
-            121 [label="Access variable R|<local>/x|"];
-            122 [label="Smart cast: R|<local>/x|"];
-            123 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
-            124 [label="Exit block"];
-        }
-        125 [label="Exit function test3" style="filled" fillcolor=red];
-    }
+    100 -> {101};
     101 -> {102};
     102 -> {103};
-    103 -> {104};
-    104 -> {105};
+    103 -> {105};
+    104 -> {106};
     105 -> {106};
+    105 -> {97} [color=green style=dashed];
     106 -> {107};
     107 -> {108};
     108 -> {109};
-    109 -> {110 117};
-    109 -> {116} [style=dotted];
-    109 -> {110} [style=dashed];
+    109 -> {110};
     110 -> {111};
     111 -> {112};
     112 -> {113};
     113 -> {114};
     114 -> {115};
     115 -> {116};
-    116 -> {117};
+
+    subgraph cluster_33 {
+        color=red
+        117 [label="Enter function test3" style="filled" fillcolor=red];
+        subgraph cluster_34 {
+            color=blue
+            118 [label="Enter block"];
+            119 [label="Variable declaration: lvar x: R|kotlin/Any?|"];
+            120 [label="Const: String()"];
+            121 [label="Assignment: R|<local>/x|"];
+            122 [label="Access variable R|<local>/x|"];
+            123 [label="Smart cast: R|<local>/x|"];
+            124 [label="Access variable R|kotlin/String.length|"];
+            subgraph cluster_35 {
+                color=blue
+                125 [label="Function call arguments enter"];
+                126 [label="Postponed enter to lambda"];
+                subgraph cluster_36 {
+                    color=blue
+                    127 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_37 {
+                        color=blue
+                        128 [label="Enter block"];
+                        129 [label="Const: Int(1)"];
+                        130 [label="Assignment: R|<local>/x|"];
+                        131 [label="Exit block"];
+                    }
+                    132 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                133 [label="Function call arguments exit"];
+            }
+            134 [label="Postponed exit from lambda"];
+            135 [label="Function call: R|/exactlyOnce|(...)" style="filled" fillcolor=yellow];
+            136 [label="Access variable R|<local>/x|"];
+            137 [label="Smart cast: R|<local>/x|"];
+            138 [label="Access variable <Unresolved name: length>#"];
+            subgraph cluster_38 {
+                color=blue
+                139 [label="Function call arguments enter"];
+                140 [label="Access variable R|<local>/x|"];
+                141 [label="Smart cast: R|<local>/x|"];
+                142 [label="Function call arguments exit"];
+            }
+            143 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
+            144 [label="Exit block"];
+        }
+        145 [label="Exit function test3" style="filled" fillcolor=red];
+    }
     117 -> {118};
     118 -> {119};
     119 -> {120};
@@ -350,54 +398,18 @@ digraph flowFromInplaceLambda3_kt {
     122 -> {123};
     123 -> {124};
     124 -> {125};
-
-    subgraph cluster_29 {
-        color=red
-        126 [label="Enter function test4" style="filled" fillcolor=red];
-        subgraph cluster_30 {
-            color=blue
-            127 [label="Enter block"];
-            128 [label="Variable declaration: lvar x: R|kotlin/Any?|"];
-            129 [label="Const: String()"];
-            130 [label="Assignment: R|<local>/x|"];
-            131 [label="Access variable R|<local>/x|"];
-            132 [label="Smart cast: R|<local>/x|"];
-            133 [label="Access variable R|kotlin/String.length|"];
-            134 [label="Postponed enter to lambda"];
-            subgraph cluster_31 {
-                color=blue
-                135 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_32 {
-                    color=blue
-                    136 [label="Enter block"];
-                    137 [label="Const: Int(1)"];
-                    138 [label="Assignment: R|<local>/x|"];
-                    139 [label="Exit block"];
-                }
-                140 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            141 [label="Postponed exit from lambda"];
-            142 [label="Function call: R|/atMostOnce|(...)" style="filled" fillcolor=yellow];
-            143 [label="Access variable R|<local>/x|"];
-            144 [label="Smart cast: R|<local>/x|"];
-            145 [label="Access variable <Unresolved name: length>#"];
-            146 [label="Access variable R|<local>/x|"];
-            147 [label="Smart cast: R|<local>/x|"];
-            148 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()" style="filled" fillcolor=yellow];
-            149 [label="Exit block"];
-        }
-        150 [label="Exit function test4" style="filled" fillcolor=red];
-    }
-    126 -> {127};
+    125 -> {126};
+    126 -> {127 133};
+    126 -> {134} [style=dotted];
+    126 -> {127} [style=dashed];
     127 -> {128};
     128 -> {129};
     129 -> {130};
     130 -> {131};
     131 -> {132};
-    132 -> {133};
-    133 -> {134};
-    134 -> {135 141 142};
-    134 -> {135} [style=dashed];
+    132 -> {134};
+    133 -> {135};
+    134 -> {135};
     135 -> {136};
     136 -> {137};
     137 -> {138};
@@ -408,10 +420,82 @@ digraph flowFromInplaceLambda3_kt {
     142 -> {143};
     143 -> {144};
     144 -> {145};
-    145 -> {146};
+
+    subgraph cluster_39 {
+        color=red
+        146 [label="Enter function test4" style="filled" fillcolor=red];
+        subgraph cluster_40 {
+            color=blue
+            147 [label="Enter block"];
+            148 [label="Variable declaration: lvar x: R|kotlin/Any?|"];
+            149 [label="Const: String()"];
+            150 [label="Assignment: R|<local>/x|"];
+            151 [label="Access variable R|<local>/x|"];
+            152 [label="Smart cast: R|<local>/x|"];
+            153 [label="Access variable R|kotlin/String.length|"];
+            subgraph cluster_41 {
+                color=blue
+                154 [label="Function call arguments enter"];
+                155 [label="Postponed enter to lambda"];
+                subgraph cluster_42 {
+                    color=blue
+                    156 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_43 {
+                        color=blue
+                        157 [label="Enter block"];
+                        158 [label="Const: Int(1)"];
+                        159 [label="Assignment: R|<local>/x|"];
+                        160 [label="Exit block"];
+                    }
+                    161 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                162 [label="Function call arguments exit"];
+            }
+            163 [label="Postponed exit from lambda"];
+            164 [label="Function call: R|/atMostOnce|(...)" style="filled" fillcolor=yellow];
+            165 [label="Access variable R|<local>/x|"];
+            166 [label="Smart cast: R|<local>/x|"];
+            167 [label="Access variable <Unresolved name: length>#"];
+            subgraph cluster_44 {
+                color=blue
+                168 [label="Function call arguments enter"];
+                169 [label="Access variable R|<local>/x|"];
+                170 [label="Smart cast: R|<local>/x|"];
+                171 [label="Function call arguments exit"];
+            }
+            172 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()" style="filled" fillcolor=yellow];
+            173 [label="Exit block"];
+        }
+        174 [label="Exit function test4" style="filled" fillcolor=red];
+    }
     146 -> {147};
     147 -> {148};
     148 -> {149};
     149 -> {150};
+    150 -> {151};
+    151 -> {152};
+    152 -> {153};
+    153 -> {154};
+    154 -> {155};
+    155 -> {156 162 163};
+    155 -> {156} [style=dashed];
+    156 -> {157};
+    157 -> {158};
+    158 -> {159};
+    159 -> {160};
+    160 -> {161};
+    161 -> {163};
+    162 -> {164};
+    163 -> {164};
+    164 -> {165};
+    165 -> {166};
+    166 -> {167};
+    167 -> {168};
+    168 -> {169};
+    169 -> {170};
+    170 -> {171};
+    171 -> {172};
+    172 -> {173};
+    173 -> {174};
 
 }

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

@@ -57,33 +57,38 @@ digraph initBlock_kt {
                 15 [label="Enter block"];
                 16 [label="Const: Int(1)"];
                 17 [label="Variable declaration: lval x: R|kotlin/Int|"];
-                18 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
-                19 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                20 [label="Stub" style="filled" fillcolor=gray];
-                21 [label="Const: Int(2)" style="filled" fillcolor=gray];
-                22 [label="Variable declaration: lval y: R|kotlin/Int|" style="filled" fillcolor=gray];
-                23 [label="Exit block" style="filled" fillcolor=gray];
+                subgraph cluster_8 {
+                    color=blue
+                    18 [label="Function call arguments enter"];
+                    19 [label="Function call arguments exit"];
+                }
+                20 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
+                21 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                22 [label="Stub" style="filled" fillcolor=gray];
+                23 [label="Const: Int(2)" style="filled" fillcolor=gray];
+                24 [label="Variable declaration: lval y: R|kotlin/Int|" style="filled" fillcolor=gray];
+                25 [label="Exit block" style="filled" fillcolor=gray];
             }
-            24 [label="Exit init block" style="filled" fillcolor=gray];
+            26 [label="Exit init block" style="filled" fillcolor=gray];
         }
-        subgraph cluster_8 {
+        subgraph cluster_9 {
             color=blue
-            25 [label="Enter function <init>" style="filled" fillcolor=gray];
-            26 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=gray];
-            27 [label="Exit function <init>" style="filled" fillcolor=gray];
+            27 [label="Enter function <init>" style="filled" fillcolor=gray];
+            28 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=gray];
+            29 [label="Exit function <init>" style="filled" fillcolor=gray];
         }
-        28 [label="Exit class Bar" style="filled" fillcolor=gray];
+        30 [label="Exit class Bar" style="filled" fillcolor=gray];
     }
     13 -> {14} [color=green];
-    13 -> {28} [style=dotted];
-    13 -> {14 25} [style=dashed];
+    13 -> {30} [style=dotted];
+    13 -> {14 27} [style=dashed];
     14 -> {15};
     15 -> {16};
     16 -> {17};
     17 -> {18};
     18 -> {19};
-    19 -> {20} [style=dotted];
-    20 -> {21} [style=dotted];
+    19 -> {20};
+    20 -> {21};
     21 -> {22} [style=dotted];
     22 -> {23} [style=dotted];
     23 -> {24} [style=dotted];
@@ -91,5 +96,7 @@ digraph initBlock_kt {
     25 -> {26} [style=dotted];
     26 -> {27} [style=dotted];
     27 -> {28} [style=dotted];
+    28 -> {29} [style=dotted];
+    29 -> {30} [style=dotted];
 
 }

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

@@ -36,48 +36,58 @@ digraph initBlockAndInPlaceLambda_kt {
                 9 [label="Access variable R|<local>/a|"];
                 10 [label="Access variable R|/A.b|"];
                 11 [label="Enter safe call"];
-                12 [label="Postponed enter to lambda"];
                 subgraph cluster_6 {
                     color=blue
-                    13 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    12 [label="Function call arguments enter"];
+                    13 [label="Postponed enter to lambda"];
                     subgraph cluster_7 {
                         color=blue
-                        14 [label="Enter block"];
-                        15 [label="Access variable R|<local>/a|"];
-                        16 [label="Access variable R|<local>/it|"];
-                        17 [label="Function call: R|/C.C|(...)" style="filled" fillcolor=yellow];
-                        18 [label="Exit block"];
+                        14 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                        subgraph cluster_8 {
+                            color=blue
+                            15 [label="Enter block"];
+                            subgraph cluster_9 {
+                                color=blue
+                                16 [label="Function call arguments enter"];
+                                17 [label="Access variable R|<local>/a|"];
+                                18 [label="Access variable R|<local>/it|"];
+                                19 [label="Function call arguments exit"];
+                            }
+                            20 [label="Function call: R|/C.C|(...)" style="filled" fillcolor=yellow];
+                            21 [label="Exit block"];
+                        }
+                        22 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                     }
-                    19 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                    23 [label="Function call arguments exit"];
                 }
-                20 [label="Postponed exit from lambda"];
-                21 [label="Function call: $subj$.R|kotlin/let|<R|B|, R|C|>(...)" style="filled" fillcolor=yellow];
-                22 [label="Exit safe call"];
-                23 [label="Variable declaration: lval c: R|C?|"];
-                24 [label="Exit block"];
+                24 [label="Postponed exit from lambda"];
+                25 [label="Function call: $subj$.R|kotlin/let|<R|B|, R|C|>(...)" style="filled" fillcolor=yellow];
+                26 [label="Exit safe call"];
+                27 [label="Variable declaration: lval c: R|C?|"];
+                28 [label="Exit block"];
             }
-            25 [label="Exit init block" style="filled" fillcolor=red];
+            29 [label="Exit init block" style="filled" fillcolor=red];
         }
-        subgraph cluster_8 {
+        subgraph cluster_10 {
             color=blue
-            26 [label="Enter function <init>" style="filled" fillcolor=red];
-            27 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
-            28 [label="Exit function <init>" style="filled" fillcolor=red];
+            30 [label="Enter function <init>" style="filled" fillcolor=red];
+            31 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
+            32 [label="Exit function <init>" style="filled" fillcolor=red];
         }
-        29 [label="Exit class C" style="filled" fillcolor=red];
+        33 [label="Exit class C" style="filled" fillcolor=red];
     }
     6 -> {7} [color=green];
-    6 -> {29} [style=dotted];
-    6 -> {7 26} [style=dashed];
+    6 -> {33} [style=dotted];
+    6 -> {7 30} [style=dashed];
     7 -> {8};
     8 -> {9};
     9 -> {10};
-    10 -> {11 22};
+    10 -> {11 26};
     11 -> {12};
-    12 -> {13 21};
-    12 -> {20} [style=dotted];
-    12 -> {13} [style=dashed];
-    13 -> {14};
+    12 -> {13};
+    13 -> {14 23};
+    13 -> {24} [style=dotted];
+    13 -> {14} [style=dashed];
     14 -> {15};
     15 -> {16};
     16 -> {17};
@@ -86,12 +96,16 @@ digraph initBlockAndInPlaceLambda_kt {
     19 -> {20};
     20 -> {21};
     21 -> {22};
-    22 -> {23};
-    23 -> {24};
+    22 -> {24};
+    23 -> {25};
     24 -> {25};
-    25 -> {26} [color=green];
+    25 -> {26};
     26 -> {27};
     27 -> {28};
-    28 -> {29} [color=green];
+    28 -> {29};
+    29 -> {30} [color=green];
+    30 -> {31};
+    31 -> {32};
+    32 -> {33} [color=green];
 
 }

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

@@ -66,29 +66,39 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
                 subgraph cluster_9 {
                     color=blue
                     25 [label="Enter block"];
-                    26 [label="Postponed enter to lambda"];
                     subgraph cluster_10 {
                         color=blue
-                        27 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                        26 [label="Function call arguments enter"];
+                        27 [label="Postponed enter to lambda"];
                         subgraph cluster_11 {
                             color=blue
-                            28 [label="Enter block"];
-                            29 [label="Function call: R|/materialize|<R|kotlin/String|>()" style="filled" fillcolor=yellow];
-                            30 [label="Exit block"];
+                            28 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                            subgraph cluster_12 {
+                                color=blue
+                                29 [label="Enter block"];
+                                subgraph cluster_13 {
+                                    color=blue
+                                    30 [label="Function call arguments enter"];
+                                    31 [label="Function call arguments exit"];
+                                }
+                                32 [label="Function call: R|/materialize|<R|kotlin/String|>()" style="filled" fillcolor=yellow];
+                                33 [label="Exit block"];
+                            }
+                            34 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                         }
-                        31 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                        35 [label="Function call arguments exit"];
                     }
-                    32 [label="Postponed exit from lambda"];
-                    33 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
-                    34 [label="Exit block"];
+                    36 [label="Postponed exit from lambda"];
+                    37 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
+                    38 [label="Exit block"];
                 }
-                35 [label="Exit when branch result"];
-                36 [label="Exit when"];
+                39 [label="Exit when branch result"];
+                40 [label="Exit when"];
             }
-            37 [label="Variable declaration: lval x: R|kotlin/String|"];
-            38 [label="Exit block"];
+            41 [label="Variable declaration: lval x: R|kotlin/String|"];
+            42 [label="Exit block"];
         }
-        39 [label="Exit function test_1" style="filled" fillcolor=red];
+        43 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     11 -> {12};
     12 -> {13};
@@ -102,147 +112,179 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
     20 -> {21};
     21 -> {22};
     22 -> {23};
-    23 -> {36};
+    23 -> {40};
     24 -> {25};
     25 -> {26};
-    26 -> {27 33};
-    26 -> {32} [style=dotted];
-    26 -> {27} [style=dashed];
-    27 -> {28};
+    26 -> {27};
+    27 -> {28 35};
+    27 -> {36} [style=dotted];
+    27 -> {28} [style=dashed];
     28 -> {29};
     29 -> {30};
     30 -> {31};
     31 -> {32};
-    32 -> {33} [color=green];
-    32 -> {36} [color=red];
+    32 -> {33};
     33 -> {34};
-    34 -> {35};
-    35 -> {36};
-    36 -> {37};
+    34 -> {36};
+    35 -> {37};
+    36 -> {37} [color=green];
+    36 -> {40} [color=red];
     37 -> {38};
     38 -> {39};
-
-    subgraph cluster_12 {
-        color=red
-        40 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_13 {
-            color=blue
-            41 [label="Enter block"];
-            subgraph cluster_14 {
-                color=blue
-                42 [label="Try expression enter"];
-                subgraph cluster_15 {
-                    color=blue
-                    43 [label="Try main block enter"];
-                    subgraph cluster_16 {
-                        color=blue
-                        44 [label="Enter block"];
-                        45 [label="Postponed enter to lambda"];
-                        subgraph cluster_17 {
-                            color=blue
-                            46 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                            subgraph cluster_18 {
-                                color=blue
-                                47 [label="Enter block"];
-                                48 [label="Function call: R|/materialize|<R|kotlin/String|>()" style="filled" fillcolor=yellow];
-                                49 [label="Exit block"];
-                            }
-                            50 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-                        }
-                        51 [label="Postponed exit from lambda"];
-                        52 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
-                        53 [label="Exit block"];
-                    }
-                    54 [label="Try main block exit"];
-                }
-                subgraph cluster_19 {
-                    color=blue
-                    55 [label="Catch enter"];
-                    56 [label="Variable declaration: e: R|kotlin/Exception|"];
-                    subgraph cluster_20 {
-                        color=blue
-                        57 [label="Enter block"];
-                        58 [label="Const: String()"];
-                        59 [label="Exit block"];
-                    }
-                    60 [label="Catch exit"];
-                }
-                61 [label="Try expression exit"];
-            }
-            62 [label="Variable declaration: lval x: R|kotlin/String|"];
-            63 [label="Exit block"];
-        }
-        64 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
+    39 -> {40};
     40 -> {41};
     41 -> {42};
-    42 -> {43 55};
-    43 -> {44};
+    42 -> {43};
+
+    subgraph cluster_14 {
+        color=red
+        44 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_15 {
+            color=blue
+            45 [label="Enter block"];
+            subgraph cluster_16 {
+                color=blue
+                46 [label="Try expression enter"];
+                subgraph cluster_17 {
+                    color=blue
+                    47 [label="Try main block enter"];
+                    subgraph cluster_18 {
+                        color=blue
+                        48 [label="Enter block"];
+                        subgraph cluster_19 {
+                            color=blue
+                            49 [label="Function call arguments enter"];
+                            50 [label="Postponed enter to lambda"];
+                            subgraph cluster_20 {
+                                color=blue
+                                51 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                                subgraph cluster_21 {
+                                    color=blue
+                                    52 [label="Enter block"];
+                                    subgraph cluster_22 {
+                                        color=blue
+                                        53 [label="Function call arguments enter"];
+                                        54 [label="Function call arguments exit"];
+                                    }
+                                    55 [label="Function call: R|/materialize|<R|kotlin/String|>()" style="filled" fillcolor=yellow];
+                                    56 [label="Exit block"];
+                                }
+                                57 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                            }
+                            58 [label="Function call arguments exit"];
+                        }
+                        59 [label="Postponed exit from lambda"];
+                        60 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
+                        61 [label="Exit block"];
+                    }
+                    62 [label="Try main block exit"];
+                }
+                subgraph cluster_23 {
+                    color=blue
+                    63 [label="Catch enter"];
+                    64 [label="Variable declaration: e: R|kotlin/Exception|"];
+                    subgraph cluster_24 {
+                        color=blue
+                        65 [label="Enter block"];
+                        66 [label="Const: String()"];
+                        67 [label="Exit block"];
+                    }
+                    68 [label="Catch exit"];
+                }
+                69 [label="Try expression exit"];
+            }
+            70 [label="Variable declaration: lval x: R|kotlin/String|"];
+            71 [label="Exit block"];
+        }
+        72 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
     44 -> {45};
-    45 -> {46 52};
-    45 -> {51} [style=dotted];
-    45 -> {46} [style=dashed];
-    46 -> {47};
+    45 -> {46};
+    46 -> {47 63};
     47 -> {48};
     48 -> {49};
     49 -> {50};
-    50 -> {51};
-    51 -> {52} [color=green];
-    51 -> {61} [color=red];
+    50 -> {51 58};
+    50 -> {59} [style=dotted];
+    50 -> {51} [style=dashed];
+    51 -> {52};
     52 -> {53};
     53 -> {54};
-    54 -> {55 61};
+    54 -> {55};
     55 -> {56};
     56 -> {57};
-    57 -> {58};
-    58 -> {59};
-    59 -> {60};
+    57 -> {59};
+    58 -> {60};
+    59 -> {60} [color=green];
+    59 -> {69} [color=red];
     60 -> {61};
     61 -> {62};
-    62 -> {63};
+    62 -> {63 69};
     63 -> {64};
-
-    subgraph cluster_21 {
-        color=red
-        65 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_22 {
-            color=blue
-            66 [label="Enter block"];
-            67 [label="Postponed enter to lambda"];
-            subgraph cluster_23 {
-                color=blue
-                68 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_24 {
-                    color=blue
-                    69 [label="Enter block"];
-                    70 [label="Function call: R|/materialize|<R|kotlin/String?|>()" style="filled" fillcolor=yellow];
-                    71 [label="Exit block"];
-                }
-                72 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            73 [label="Postponed exit from lambda"];
-            74 [label="Function call: R|kotlin/run|<R|kotlin/String?|>(...)" style="filled" fillcolor=yellow];
-            75 [label="Check not null: R|kotlin/run|<R|kotlin/String?|>(...)!!" style="filled" fillcolor=yellow];
-            76 [label="Variable declaration: lval x: R|kotlin/String|"];
-            77 [label="Exit block"];
-        }
-        78 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
+    64 -> {65};
     65 -> {66};
     66 -> {67};
-    67 -> {68 74};
-    67 -> {73} [style=dotted];
-    67 -> {68} [style=dashed];
+    67 -> {68};
     68 -> {69};
     69 -> {70};
     70 -> {71};
     71 -> {72};
-    72 -> {73};
-    73 -> {74} [color=green];
-    73 -> {75} [color=red];
+
+    subgraph cluster_25 {
+        color=red
+        73 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_26 {
+            color=blue
+            74 [label="Enter block"];
+            subgraph cluster_27 {
+                color=blue
+                75 [label="Function call arguments enter"];
+                76 [label="Postponed enter to lambda"];
+                subgraph cluster_28 {
+                    color=blue
+                    77 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_29 {
+                        color=blue
+                        78 [label="Enter block"];
+                        subgraph cluster_30 {
+                            color=blue
+                            79 [label="Function call arguments enter"];
+                            80 [label="Function call arguments exit"];
+                        }
+                        81 [label="Function call: R|/materialize|<R|kotlin/String?|>()" style="filled" fillcolor=yellow];
+                        82 [label="Exit block"];
+                    }
+                    83 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                84 [label="Function call arguments exit"];
+            }
+            85 [label="Postponed exit from lambda"];
+            86 [label="Function call: R|kotlin/run|<R|kotlin/String?|>(...)" style="filled" fillcolor=yellow];
+            87 [label="Check not null: R|kotlin/run|<R|kotlin/String?|>(...)!!" style="filled" fillcolor=yellow];
+            88 [label="Variable declaration: lval x: R|kotlin/String|"];
+            89 [label="Exit block"];
+        }
+        90 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
+    73 -> {74};
     74 -> {75};
     75 -> {76};
-    76 -> {77};
+    76 -> {77 84};
+    76 -> {85} [style=dotted];
+    76 -> {77} [style=dashed];
     77 -> {78};
+    78 -> {79};
+    79 -> {80};
+    80 -> {81};
+    81 -> {82};
+    82 -> {83};
+    83 -> {85};
+    84 -> {86};
+    85 -> {86} [color=green];
+    85 -> {87} [color=red];
+    86 -> {87};
+    87 -> {88};
+    88 -> {89};
+    89 -> {90};
 
 }

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

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

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

@@ -9,97 +9,118 @@ digraph lambdaAsReturnOfLambda_kt {
         subgraph cluster_1 {
             color=blue
             1 [label="Enter property" style="filled" fillcolor=red];
-            2 [label="Postponed enter to lambda"];
             subgraph cluster_2 {
                 color=blue
-                3 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                2 [label="Function call arguments enter"];
+                3 [label="Postponed enter to lambda"];
                 subgraph cluster_3 {
                     color=blue
-                    4 [label="Enter block"];
-                    5 [label="Exit anonymous function expression"];
+                    4 [label="Enter function <anonymous>" style="filled" fillcolor=red];
                     subgraph cluster_4 {
                         color=blue
-                        6 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                        5 [label="Enter block"];
+                        6 [label="Exit anonymous function expression"];
                         subgraph cluster_5 {
                             color=blue
-                            7 [label="Enter block"];
-                            8 [label="Access variable R|<local>/foo|"];
-                            9 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow];
-                            10 [label="Exit block"];
+                            7 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                            subgraph cluster_6 {
+                                color=blue
+                                8 [label="Enter block"];
+                                subgraph cluster_7 {
+                                    color=blue
+                                    9 [label="Function call arguments enter"];
+                                    10 [label="Access variable R|<local>/foo|"];
+                                    11 [label="Function call arguments exit"];
+                                }
+                                12 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow];
+                                13 [label="Exit block"];
+                            }
+                            14 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                         }
-                        11 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-                    }
-                    12 [label="Jump: ^@run lambda@fun <anonymous>(foo: R|kotlin/String|): R|kotlin/Unit| <inline=Unknown>  {
+                        15 [label="Jump: ^@run lambda@fun <anonymous>(foo: R|kotlin/String|): R|kotlin/Unit| <inline=Unknown>  {
     R|/bar|(R|<local>/foo|)
 }
 "];
-                    13 [label="Stub" style="filled" fillcolor=gray];
-                    14 [label="Exit block" style="filled" fillcolor=gray];
+                        16 [label="Stub" style="filled" fillcolor=gray];
+                        17 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    18 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                 }
-                15 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                19 [label="Function call arguments exit"];
             }
-            16 [label="Postponed exit from lambda"];
-            17 [label="Function call: R|/run|<R|(kotlin/String) -> kotlin/Unit|>(...)" style="filled" fillcolor=yellow];
-            18 [label="Exit property" style="filled" fillcolor=red];
+            20 [label="Postponed exit from lambda"];
+            21 [label="Function call: R|/run|<R|(kotlin/String) -> kotlin/Unit|>(...)" style="filled" fillcolor=yellow];
+            22 [label="Exit property" style="filled" fillcolor=red];
         }
-        19 [label="Exit file lambdaAsReturnOfLambda.kt" style="filled" fillcolor=red];
+        23 [label="Exit file lambdaAsReturnOfLambda.kt" style="filled" fillcolor=red];
     }
     0 -> {1} [color=green];
-    0 -> {19} [style=dotted];
+    0 -> {23} [style=dotted];
     0 -> {1} [style=dashed];
     1 -> {2};
-    2 -> {3 16 17};
-    2 -> {3} [style=dashed];
-    3 -> {4};
+    2 -> {3};
+    3 -> {4 19 20};
+    3 -> {4} [style=dashed];
     4 -> {5};
-    5 -> {6 12};
-    5 -> {6} [style=dashed];
-    6 -> {7};
+    5 -> {6};
+    6 -> {7 15};
+    6 -> {7} [style=dashed];
     7 -> {8};
     8 -> {9};
     9 -> {10};
     10 -> {11};
-    12 -> {15};
-    12 -> {13} [style=dotted];
-    13 -> {14} [style=dotted];
-    14 -> {15} [style=dotted];
-    16 -> {17};
-    17 -> {18};
-    18 -> {19} [color=green];
-
-    subgraph cluster_6 {
-        color=red
-        20 [label="Enter function bar" style="filled" fillcolor=red];
-        subgraph cluster_7 {
-            color=blue
-            21 [label="Enter block"];
-            22 [label="Exit block"];
-        }
-        23 [label="Exit function bar" style="filled" fillcolor=red];
-    }
+    11 -> {12};
+    12 -> {13};
+    13 -> {14};
+    15 -> {18};
+    15 -> {16} [style=dotted];
+    16 -> {17} [style=dotted];
+    17 -> {18} [style=dotted];
+    19 -> {21};
     20 -> {21};
     21 -> {22};
-    22 -> {23};
+    22 -> {23} [color=green];
 
     subgraph cluster_8 {
         color=red
-        24 [label="Enter function run" style="filled" fillcolor=red];
+        24 [label="Enter function bar" style="filled" fillcolor=red];
         subgraph cluster_9 {
             color=blue
             25 [label="Enter block"];
-            26 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|R|>|()" style="filled" fillcolor=yellow];
-            27 [label="Jump: ^run R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|R|>|()"];
-            28 [label="Stub" style="filled" fillcolor=gray];
-            29 [label="Exit block" style="filled" fillcolor=gray];
+            26 [label="Exit block"];
         }
-        30 [label="Exit function run" style="filled" fillcolor=red];
+        27 [label="Exit function bar" style="filled" fillcolor=red];
     }
     24 -> {25};
     25 -> {26};
     26 -> {27};
-    27 -> {30};
-    27 -> {28} [style=dotted];
-    28 -> {29} [style=dotted];
-    29 -> {30} [style=dotted];
+
+    subgraph cluster_10 {
+        color=red
+        28 [label="Enter function run" style="filled" fillcolor=red];
+        subgraph cluster_11 {
+            color=blue
+            29 [label="Enter block"];
+            subgraph cluster_12 {
+                color=blue
+                30 [label="Function call arguments enter"];
+                31 [label="Function call arguments exit"];
+            }
+            32 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|R|>|()" style="filled" fillcolor=yellow];
+            33 [label="Jump: ^run R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|R|>|()"];
+            34 [label="Stub" style="filled" fillcolor=gray];
+            35 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        36 [label="Exit function run" style="filled" fillcolor=red];
+    }
+    28 -> {29};
+    29 -> {30};
+    30 -> {31};
+    31 -> {32};
+    32 -> {33};
+    33 -> {36};
+    33 -> {34} [style=dotted];
+    34 -> {35} [style=dotted];
+    35 -> {36} [style=dotted];
 
 }

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

@@ -62,59 +62,80 @@ digraph lambdaReturningObject_kt {
         subgraph cluster_8 {
             color=blue
             16 [label="Enter block"];
-            17 [label="Function call: R|kotlin/TODO|()" style="filled" fillcolor=yellow];
-            18 [label="Stub" style="filled" fillcolor=gray];
-            19 [label="Jump: ^MyOut R|kotlin/TODO|()" style="filled" fillcolor=gray];
+            subgraph cluster_9 {
+                color=blue
+                17 [label="Function call arguments enter"];
+                18 [label="Function call arguments exit"];
+            }
+            19 [label="Function call: R|kotlin/TODO|()" style="filled" fillcolor=yellow];
             20 [label="Stub" style="filled" fillcolor=gray];
-            21 [label="Exit block" style="filled" fillcolor=gray];
+            21 [label="Jump: ^MyOut R|kotlin/TODO|()" style="filled" fillcolor=gray];
+            22 [label="Stub" style="filled" fillcolor=gray];
+            23 [label="Exit block" style="filled" fillcolor=gray];
         }
-        22 [label="Exit function MyOut" style="filled" fillcolor=gray];
+        24 [label="Exit function MyOut" style="filled" fillcolor=gray];
     }
     15 -> {16};
     16 -> {17};
-    17 -> {18} [style=dotted];
-    18 -> {19} [style=dotted];
-    19 -> {20 22} [style=dotted];
+    17 -> {18};
+    18 -> {19};
+    19 -> {20} [style=dotted];
     20 -> {21} [style=dotted];
-    21 -> {22} [style=dotted];
+    21 -> {22 24} [style=dotted];
+    22 -> {23} [style=dotted];
+    23 -> {24} [style=dotted];
 
-    subgraph cluster_9 {
+    subgraph cluster_10 {
         color=red
-        23 [label="Enter function foo" style="filled" fillcolor=red];
-        subgraph cluster_10 {
+        25 [label="Enter function foo" style="filled" fillcolor=red];
+        subgraph cluster_11 {
             color=blue
-            24 [label="Enter block"];
-            25 [label="Postponed enter to lambda"];
-            subgraph cluster_11 {
+            26 [label="Enter block"];
+            subgraph cluster_12 {
                 color=blue
-                26 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_12 {
+                27 [label="Function call arguments enter"];
+                subgraph cluster_13 {
                     color=blue
-                    27 [label="Enter block"];
-                    28 [label="Access qualifier /IrStarProjectionImpl"];
-                    29 [label="Exit block"];
+                    28 [label="Function call arguments enter"];
+                    29 [label="Postponed enter to lambda"];
+                    subgraph cluster_14 {
+                        color=blue
+                        30 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                        subgraph cluster_15 {
+                            color=blue
+                            31 [label="Enter block"];
+                            32 [label="Access qualifier /IrStarProjectionImpl"];
+                            33 [label="Exit block"];
+                        }
+                        34 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                    }
+                    35 [label="Function call arguments exit"];
                 }
-                30 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                36 [label="Postponed exit from lambda"];
+                37 [label="Function call: R|/MyOut|<R|IrStarProjectionImpl|>(...)" style="filled" fillcolor=yellow];
+                38 [label="Function call arguments exit"];
             }
-            31 [label="Postponed exit from lambda"];
-            32 [label="Function call: R|/MyOut|<R|IrStarProjectionImpl|>(...)" style="filled" fillcolor=yellow];
-            33 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow];
-            34 [label="Exit block"];
+            39 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow];
+            40 [label="Exit block"];
         }
-        35 [label="Exit function foo" style="filled" fillcolor=red];
+        41 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    23 -> {24};
-    24 -> {25};
-    25 -> {26 31 32};
-    25 -> {26} [style=dashed];
+    25 -> {26};
     26 -> {27};
     27 -> {28};
     28 -> {29};
-    29 -> {30};
-    31 -> {32} [color=green];
-    31 -> {33} [color=red];
+    29 -> {30 35 36};
+    29 -> {30} [style=dashed];
+    30 -> {31};
+    31 -> {32};
     32 -> {33};
     33 -> {34};
-    34 -> {35};
+    35 -> {37};
+    36 -> {37} [color=green];
+    36 -> {39} [color=red];
+    37 -> {38};
+    38 -> {39};
+    39 -> {40};
+    40 -> {41};
 
 }

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

@@ -16,281 +16,330 @@ digraph lambdas_kt {
         subgraph cluster_2 {
             color=blue
             3 [label="Enter block"];
-            4 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            5 [label="Exit block"];
+            subgraph cluster_3 {
+                color=blue
+                4 [label="Function call arguments enter"];
+                5 [label="Function call arguments exit"];
+            }
+            6 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            7 [label="Exit block"];
         }
-        6 [label="Exit function run" style="filled" fillcolor=red];
+        8 [label="Exit function run" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
     4 -> {5};
     5 -> {6};
+    6 -> {7};
+    7 -> {8};
 
-    subgraph cluster_3 {
+    subgraph cluster_4 {
         color=red
-        7 [label="Enter function test_1" style="filled" fillcolor=red];
-        subgraph cluster_4 {
+        9 [label="Enter function test_1" style="filled" fillcolor=red];
+        subgraph cluster_5 {
             color=blue
-            8 [label="Enter block"];
-            subgraph cluster_5 {
+            10 [label="Enter block"];
+            subgraph cluster_6 {
                 color=blue
-                9 [label="Enter when"];
-                subgraph cluster_6 {
-                    color=blue
-                    10 [label="Enter when branch condition "];
-                    11 [label="Access variable R|<local>/x|"];
-                    12 [label="Type operator: (R|<local>/x| is R|kotlin/Int|)"];
-                    13 [label="Exit when branch condition"];
-                }
-                14 [label="Synthetic else branch"];
-                15 [label="Enter when branch result"];
+                11 [label="Enter when"];
                 subgraph cluster_7 {
                     color=blue
-                    16 [label="Enter block"];
-                    17 [label="Postponed enter to lambda"];
-                    subgraph cluster_8 {
-                        color=blue
-                        18 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                        subgraph cluster_9 {
-                            color=blue
-                            19 [label="Enter block"];
-                            20 [label="Access variable R|<local>/x|"];
-                            21 [label="Smart cast: R|<local>/x|"];
-                            22 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
-                            23 [label="Exit block"];
-                        }
-                        24 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-                    }
-                    25 [label="Postponed exit from lambda"];
-                    26 [label="Function call: R|/run|(...)" style="filled" fillcolor=yellow];
-                    27 [label="Exit block"];
+                    12 [label="Enter when branch condition "];
+                    13 [label="Access variable R|<local>/x|"];
+                    14 [label="Type operator: (R|<local>/x| is R|kotlin/Int|)"];
+                    15 [label="Exit when branch condition"];
                 }
-                28 [label="Exit when branch result"];
-                29 [label="Exit when"];
+                16 [label="Synthetic else branch"];
+                17 [label="Enter when branch result"];
+                subgraph cluster_8 {
+                    color=blue
+                    18 [label="Enter block"];
+                    subgraph cluster_9 {
+                        color=blue
+                        19 [label="Function call arguments enter"];
+                        20 [label="Postponed enter to lambda"];
+                        subgraph cluster_10 {
+                            color=blue
+                            21 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                            subgraph cluster_11 {
+                                color=blue
+                                22 [label="Enter block"];
+                                subgraph cluster_12 {
+                                    color=blue
+                                    23 [label="Function call arguments enter"];
+                                    24 [label="Access variable R|<local>/x|"];
+                                    25 [label="Smart cast: R|<local>/x|"];
+                                    26 [label="Function call arguments exit"];
+                                }
+                                27 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
+                                28 [label="Exit block"];
+                            }
+                            29 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                        }
+                        30 [label="Function call arguments exit"];
+                    }
+                    31 [label="Postponed exit from lambda"];
+                    32 [label="Function call: R|/run|(...)" style="filled" fillcolor=yellow];
+                    33 [label="Exit block"];
+                }
+                34 [label="Exit when branch result"];
+                35 [label="Exit when"];
             }
-            30 [label="Exit block"];
+            36 [label="Exit block"];
         }
-        31 [label="Exit function test_1" style="filled" fillcolor=red];
+        37 [label="Exit function test_1" style="filled" fillcolor=red];
     }
-    7 -> {8};
-    8 -> {9};
     9 -> {10};
     10 -> {11};
     11 -> {12};
     12 -> {13};
-    13 -> {14 15};
-    14 -> {29};
-    15 -> {16};
-    16 -> {17};
-    17 -> {18 25 26};
-    17 -> {18} [style=dashed];
+    13 -> {14};
+    14 -> {15};
+    15 -> {16 17};
+    16 -> {35};
+    17 -> {18};
     18 -> {19};
     19 -> {20};
-    20 -> {21};
+    20 -> {21 30 31};
+    20 -> {21} [style=dashed];
     21 -> {22};
     22 -> {23};
     23 -> {24};
     24 -> {25};
     25 -> {26};
-    25 -> {17} [color=green style=dashed];
     26 -> {27};
     27 -> {28};
     28 -> {29};
-    29 -> {30};
-    30 -> {31};
-
-    subgraph cluster_10 {
-        color=red
-        32 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_11 {
-            color=blue
-            33 [label="Enter block"];
-            subgraph cluster_12 {
-                color=blue
-                34 [label="Enter when"];
-                subgraph cluster_13 {
-                    color=blue
-                    35 [label="Enter when branch condition "];
-                    36 [label="Access variable R|<local>/x|"];
-                    37 [label="Type operator: (R|<local>/x| is R|kotlin/Int|)"];
-                    38 [label="Exit when branch condition"];
-                }
-                39 [label="Synthetic else branch"];
-                40 [label="Enter when branch result"];
-                subgraph cluster_14 {
-                    color=blue
-                    41 [label="Enter block"];
-                    42 [label="Exit anonymous function expression"];
-                    43 [label="Variable declaration: lval lambda: R|() -> kotlin/Int|"];
-                    44 [label="Exit block"];
-                }
-                45 [label="Exit when branch result"];
-                46 [label="Exit when"];
-            }
-            47 [label="Exit block"];
-        }
-        48 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
-    subgraph cluster_15 {
-        color=blue
-        49 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-        subgraph cluster_16 {
-            color=blue
-            50 [label="Enter block"];
-            51 [label="Access variable R|<local>/x|"];
-            52 [label="Smart cast: R|<local>/x|"];
-            53 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
-            54 [label="Exit block"];
-        }
-        55 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-    }
+    29 -> {31};
+    30 -> {32};
+    31 -> {32};
+    31 -> {20} [color=green style=dashed];
     32 -> {33};
     33 -> {34};
     34 -> {35};
     35 -> {36};
     36 -> {37};
-    37 -> {38};
-    38 -> {39 40};
-    39 -> {46};
+
+    subgraph cluster_13 {
+        color=red
+        38 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_14 {
+            color=blue
+            39 [label="Enter block"];
+            subgraph cluster_15 {
+                color=blue
+                40 [label="Enter when"];
+                subgraph cluster_16 {
+                    color=blue
+                    41 [label="Enter when branch condition "];
+                    42 [label="Access variable R|<local>/x|"];
+                    43 [label="Type operator: (R|<local>/x| is R|kotlin/Int|)"];
+                    44 [label="Exit when branch condition"];
+                }
+                45 [label="Synthetic else branch"];
+                46 [label="Enter when branch result"];
+                subgraph cluster_17 {
+                    color=blue
+                    47 [label="Enter block"];
+                    48 [label="Exit anonymous function expression"];
+                    49 [label="Variable declaration: lval lambda: R|() -> kotlin/Int|"];
+                    50 [label="Exit block"];
+                }
+                51 [label="Exit when branch result"];
+                52 [label="Exit when"];
+            }
+            53 [label="Exit block"];
+        }
+        54 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
+    subgraph cluster_18 {
+        color=blue
+        55 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+        subgraph cluster_19 {
+            color=blue
+            56 [label="Enter block"];
+            subgraph cluster_20 {
+                color=blue
+                57 [label="Function call arguments enter"];
+                58 [label="Access variable R|<local>/x|"];
+                59 [label="Smart cast: R|<local>/x|"];
+                60 [label="Function call arguments exit"];
+            }
+            61 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
+            62 [label="Exit block"];
+        }
+        63 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+    }
+    38 -> {39};
+    39 -> {40};
     40 -> {41};
     41 -> {42};
-    42 -> {43 49};
-    42 -> {49} [style=dashed];
+    42 -> {43};
     43 -> {44};
-    44 -> {45};
-    45 -> {46};
+    44 -> {45 46};
+    45 -> {52};
     46 -> {47};
     47 -> {48};
+    48 -> {49 55};
+    48 -> {55} [style=dashed];
     49 -> {50};
     50 -> {51};
     51 -> {52};
     52 -> {53};
     53 -> {54};
-    54 -> {55};
-
-    subgraph cluster_17 {
-        color=red
-        56 [label="Enter function getInt" style="filled" fillcolor=red];
-        subgraph cluster_18 {
-            color=blue
-            57 [label="Enter block"];
-            58 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            59 [label="Const: Int(1)"];
-            60 [label="Jump: ^getInt Int(1)"];
-            61 [label="Stub" style="filled" fillcolor=gray];
-            62 [label="Exit block" style="filled" fillcolor=gray];
-        }
-        63 [label="Exit function getInt" style="filled" fillcolor=red];
-    }
+    55 -> {56};
     56 -> {57};
     57 -> {58};
     58 -> {59};
     59 -> {60};
-    60 -> {63};
-    60 -> {61} [style=dotted];
-    61 -> {62} [style=dotted];
-    62 -> {63} [style=dotted];
+    60 -> {61};
+    61 -> {62};
+    62 -> {63};
 
-    subgraph cluster_19 {
+    subgraph cluster_21 {
         color=red
-        64 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_20 {
+        64 [label="Enter function getInt" style="filled" fillcolor=red];
+        subgraph cluster_22 {
             color=blue
             65 [label="Enter block"];
-            66 [label="Postponed enter to lambda"];
-            subgraph cluster_21 {
+            subgraph cluster_23 {
                 color=blue
-                67 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_22 {
-                    color=blue
-                    68 [label="Enter block"];
-                    69 [label="Const: Int(1)"];
-                    70 [label="Jump: ^test_3 Int(1)"];
-                    71 [label="Stub" style="filled" fillcolor=gray];
-                    72 [label="Exit block" style="filled" fillcolor=gray];
-                }
-                73 [label="Exit function <anonymous>" style="filled" fillcolor=gray];
+                66 [label="Function call arguments enter"];
+                67 [label="Function call arguments exit"];
             }
-            74 [label="Postponed exit from lambda"];
-            75 [label="Function call: R|/getInt|(...)" style="filled" fillcolor=yellow];
-            76 [label="Jump: ^test_3 R|/getInt|(<L> = getInt@fun <anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-    ^test_3 Int(1)
-}
-)"];
-            77 [label="Stub" style="filled" fillcolor=gray];
-            78 [label="Exit block" style="filled" fillcolor=gray];
+            68 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            69 [label="Const: Int(1)"];
+            70 [label="Jump: ^getInt Int(1)"];
+            71 [label="Stub" style="filled" fillcolor=gray];
+            72 [label="Exit block" style="filled" fillcolor=gray];
         }
-        79 [label="Exit function test_3" style="filled" fillcolor=red];
+        73 [label="Exit function getInt" style="filled" fillcolor=red];
     }
     64 -> {65};
     65 -> {66};
-    66 -> {67 74 75};
-    66 -> {67} [style=dashed];
+    66 -> {67};
     67 -> {68};
     68 -> {69};
     69 -> {70};
-    70 -> {79};
+    70 -> {73};
     70 -> {71} [style=dotted];
     71 -> {72} [style=dotted];
     72 -> {73} [style=dotted];
-    73 -> {74} [style=dotted];
-    74 -> {75};
-    74 -> {66} [color=green style=dashed];
-    75 -> {76};
-    76 -> {79};
-    76 -> {77} [style=dotted];
-    77 -> {78} [style=dotted];
-    78 -> {79} [style=dotted];
 
-    subgraph cluster_23 {
+    subgraph cluster_24 {
         color=red
-        80 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_24 {
+        74 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_25 {
             color=blue
-            81 [label="Enter block"];
-            82 [label="Postponed enter to lambda"];
-            subgraph cluster_25 {
+            75 [label="Enter block"];
+            subgraph cluster_26 {
                 color=blue
-                83 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_26 {
+                76 [label="Function call arguments enter"];
+                77 [label="Postponed enter to lambda"];
+                subgraph cluster_27 {
                     color=blue
-                    84 [label="Enter block"];
-                    85 [label="Const: Int(1)"];
-                    86 [label="Jump: ^test_4 Int(1)"];
-                    87 [label="Stub" style="filled" fillcolor=gray];
-                    88 [label="Exit block" style="filled" fillcolor=gray];
+                    78 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_28 {
+                        color=blue
+                        79 [label="Enter block"];
+                        80 [label="Const: Int(1)"];
+                        81 [label="Jump: ^test_3 Int(1)"];
+                        82 [label="Stub" style="filled" fillcolor=gray];
+                        83 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    84 [label="Exit function <anonymous>" style="filled" fillcolor=gray];
                 }
-                89 [label="Exit function <anonymous>" style="filled" fillcolor=gray];
+                85 [label="Function call arguments exit"];
             }
-            90 [label="Postponed exit from lambda"];
-            91 [label="Function call: R|/getInt|(...)" style="filled" fillcolor=yellow];
-            92 [label="Jump: ^test_4 R|/getInt|(block = getInt@fun <anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
+            86 [label="Postponed exit from lambda"];
+            87 [label="Function call: R|/getInt|(...)" style="filled" fillcolor=yellow];
+            88 [label="Jump: ^test_3 R|/getInt|(<L> = getInt@fun <anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
+    ^test_3 Int(1)
+}
+)"];
+            89 [label="Stub" style="filled" fillcolor=gray];
+            90 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        91 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
+    74 -> {75};
+    75 -> {76};
+    76 -> {77};
+    77 -> {78 85 86};
+    77 -> {78} [style=dashed];
+    78 -> {79};
+    79 -> {80};
+    80 -> {81};
+    81 -> {91};
+    81 -> {82} [style=dotted];
+    82 -> {83} [style=dotted];
+    83 -> {84} [style=dotted];
+    84 -> {86} [style=dotted];
+    85 -> {87};
+    86 -> {87};
+    86 -> {77} [color=green style=dashed];
+    87 -> {88};
+    88 -> {91};
+    88 -> {89} [style=dotted];
+    89 -> {90} [style=dotted];
+    90 -> {91} [style=dotted];
+
+    subgraph cluster_29 {
+        color=red
+        92 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_30 {
+            color=blue
+            93 [label="Enter block"];
+            subgraph cluster_31 {
+                color=blue
+                94 [label="Function call arguments enter"];
+                95 [label="Postponed enter to lambda"];
+                subgraph cluster_32 {
+                    color=blue
+                    96 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_33 {
+                        color=blue
+                        97 [label="Enter block"];
+                        98 [label="Const: Int(1)"];
+                        99 [label="Jump: ^test_4 Int(1)"];
+                        100 [label="Stub" style="filled" fillcolor=gray];
+                        101 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    102 [label="Exit function <anonymous>" style="filled" fillcolor=gray];
+                }
+                103 [label="Function call arguments exit"];
+            }
+            104 [label="Postponed exit from lambda"];
+            105 [label="Function call: R|/getInt|(...)" style="filled" fillcolor=yellow];
+            106 [label="Jump: ^test_4 R|/getInt|(block = getInt@fun <anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
     ^test_4 Int(1)
 }
 )"];
-            93 [label="Stub" style="filled" fillcolor=gray];
-            94 [label="Exit block" style="filled" fillcolor=gray];
+            107 [label="Stub" style="filled" fillcolor=gray];
+            108 [label="Exit block" style="filled" fillcolor=gray];
         }
-        95 [label="Exit function test_4" style="filled" fillcolor=red];
+        109 [label="Exit function test_4" style="filled" fillcolor=red];
     }
-    80 -> {81};
-    81 -> {82};
-    82 -> {83 90 91};
-    82 -> {83} [style=dashed];
-    83 -> {84};
-    84 -> {85};
-    85 -> {86};
-    86 -> {95};
-    86 -> {87} [style=dotted];
-    87 -> {88} [style=dotted];
-    88 -> {89} [style=dotted];
-    89 -> {90} [style=dotted];
-    90 -> {91};
-    90 -> {82} [color=green style=dashed];
-    91 -> {92};
-    92 -> {95};
-    92 -> {93} [style=dotted];
-    93 -> {94} [style=dotted];
-    94 -> {95} [style=dotted];
+    92 -> {93};
+    93 -> {94};
+    94 -> {95};
+    95 -> {96 103 104};
+    95 -> {96} [style=dashed];
+    96 -> {97};
+    97 -> {98};
+    98 -> {99};
+    99 -> {109};
+    99 -> {100} [style=dotted];
+    100 -> {101} [style=dotted];
+    101 -> {102} [style=dotted];
+    102 -> {104} [style=dotted];
+    103 -> {105};
+    104 -> {105};
+    104 -> {95} [color=green style=dashed];
+    105 -> {106};
+    106 -> {109};
+    106 -> {107} [style=dotted];
+    107 -> {108} [style=dotted];
+    108 -> {109} [style=dotted];
 
 }

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

@@ -16,176 +16,203 @@ digraph localClassesWithImplicit_kt {
         subgraph cluster_2 {
             color=blue
             3 [label="Enter block"];
-            4 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()" style="filled" fillcolor=yellow];
-            5 [label="Jump: ^myRun R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
-            6 [label="Stub" style="filled" fillcolor=gray];
-            7 [label="Exit block" style="filled" fillcolor=gray];
+            subgraph cluster_3 {
+                color=blue
+                4 [label="Function call arguments enter"];
+                5 [label="Function call arguments exit"];
+            }
+            6 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()" style="filled" fillcolor=yellow];
+            7 [label="Jump: ^myRun R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
+            8 [label="Stub" style="filled" fillcolor=gray];
+            9 [label="Exit block" style="filled" fillcolor=gray];
         }
-        8 [label="Exit function myRun" style="filled" fillcolor=red];
+        10 [label="Exit function myRun" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
     4 -> {5};
-    5 -> {8};
-    5 -> {6} [style=dotted];
-    6 -> {7} [style=dotted];
+    5 -> {6};
+    6 -> {7};
+    7 -> {10};
     7 -> {8} [style=dotted];
+    8 -> {9} [style=dotted];
+    9 -> {10} [style=dotted];
 
-    subgraph cluster_3 {
+    subgraph cluster_4 {
         color=red
-        9 [label="Enter function test" style="filled" fillcolor=red];
-        subgraph cluster_4 {
+        11 [label="Enter function test" style="filled" fillcolor=red];
+        subgraph cluster_5 {
             color=blue
-            10 [label="Enter block"];
-            subgraph cluster_5 {
+            12 [label="Enter block"];
+            subgraph cluster_6 {
                 color=blue
-                11 [label="Enter when"];
-                subgraph cluster_6 {
-                    color=blue
-                    12 [label="Enter when branch condition "];
-                    13 [label="Access variable R|<local>/a|"];
-                    14 [label="Type operator: (R|<local>/a| !is R|kotlin/String|)"];
-                    15 [label="Exit when branch condition"];
-                }
-                16 [label="Synthetic else branch"];
-                17 [label="Enter when branch result"];
+                13 [label="Enter when"];
                 subgraph cluster_7 {
                     color=blue
-                    18 [label="Enter block"];
-                    19 [label="Jump: ^test Unit"];
-                    20 [label="Stub" style="filled" fillcolor=gray];
-                    21 [label="Exit block" style="filled" fillcolor=gray];
+                    14 [label="Enter when branch condition "];
+                    15 [label="Access variable R|<local>/a|"];
+                    16 [label="Type operator: (R|<local>/a| !is R|kotlin/String|)"];
+                    17 [label="Exit when branch condition"];
                 }
-                22 [label="Exit when branch result" style="filled" fillcolor=gray];
-                23 [label="Exit when"];
-            }
-            24 [label="Local class declaration"];
-            25 [label="Enter anonymous object"];
-            subgraph cluster_8 {
-                color=blue
-                26 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
-                subgraph cluster_9 {
+                18 [label="Synthetic else branch"];
+                19 [label="Enter when branch result"];
+                subgraph cluster_8 {
                     color=blue
-                    27 [label="Enter function <init>" style="filled" fillcolor=red];
-                    28 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
-                    29 [label="Exit function <init>" style="filled" fillcolor=red];
+                    20 [label="Enter block"];
+                    21 [label="Jump: ^test Unit"];
+                    22 [label="Stub" style="filled" fillcolor=gray];
+                    23 [label="Exit block" style="filled" fillcolor=gray];
                 }
-                30 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
+                24 [label="Exit when branch result" style="filled" fillcolor=gray];
+                25 [label="Exit when"];
             }
-            31 [label="Exit anonymous object expression"];
-            32 [label="Variable declaration: lval x: R|<anonymous>|"];
-            33 [label="Exit block"];
-        }
-        34 [label="Exit function test" style="filled" fillcolor=red];
-    }
-    subgraph cluster_10 {
-        color=blue
-        35 [label="Enter function baz" style="filled" fillcolor=red];
-        subgraph cluster_11 {
-            color=blue
-            36 [label="Enter block"];
-            37 [label="Const: Int(1)"];
-            38 [label="Jump: ^baz Int(1)"];
-            39 [label="Stub" style="filled" fillcolor=gray];
-            40 [label="Exit block" style="filled" fillcolor=gray];
-        }
-        41 [label="Exit function baz" style="filled" fillcolor=red];
-    }
-    subgraph cluster_12 {
-        color=blue
-        42 [label="Enter function bar" style="filled" fillcolor=red];
-        subgraph cluster_13 {
-            color=blue
-            43 [label="Enter block"];
-            44 [label="Postponed enter to lambda"];
-            subgraph cluster_14 {
+            26 [label="Local class declaration"];
+            27 [label="Enter anonymous object"];
+            subgraph cluster_9 {
                 color=blue
-                45 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_15 {
+                28 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
+                subgraph cluster_10 {
                     color=blue
-                    46 [label="Enter block"];
-                    47 [label="Access variable R|<local>/a|"];
-                    48 [label="Smart cast: R|<local>/a|"];
-                    49 [label="Access variable R|kotlin/String.length|"];
-                    50 [label="Access variable R|<local>/b|"];
-                    51 [label="Access variable <Unresolved name: length>#"];
-                    52 [label="Function call: this@R|/<anonymous>|.R|/<anonymous>.baz|()" style="filled" fillcolor=yellow];
-                    53 [label="Exit block"];
+                    29 [label="Enter function <init>" style="filled" fillcolor=red];
+                    30 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
+                    31 [label="Exit function <init>" style="filled" fillcolor=red];
                 }
-                54 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                32 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
             }
-            55 [label="Postponed exit from lambda"];
-            56 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
-            57 [label="Jump: ^bar R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <inline=Inline, kind=UNKNOWN>  {
+            33 [label="Exit anonymous object expression"];
+            34 [label="Variable declaration: lval x: R|<anonymous>|"];
+            35 [label="Exit block"];
+        }
+        36 [label="Exit function test" style="filled" fillcolor=red];
+    }
+    subgraph cluster_11 {
+        color=blue
+        37 [label="Enter function baz" style="filled" fillcolor=red];
+        subgraph cluster_12 {
+            color=blue
+            38 [label="Enter block"];
+            39 [label="Const: Int(1)"];
+            40 [label="Jump: ^baz Int(1)"];
+            41 [label="Stub" style="filled" fillcolor=gray];
+            42 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        43 [label="Exit function baz" style="filled" fillcolor=red];
+    }
+    subgraph cluster_13 {
+        color=blue
+        44 [label="Enter function bar" style="filled" fillcolor=red];
+        subgraph cluster_14 {
+            color=blue
+            45 [label="Enter block"];
+            subgraph cluster_15 {
+                color=blue
+                46 [label="Function call arguments enter"];
+                47 [label="Postponed enter to lambda"];
+                subgraph cluster_16 {
+                    color=blue
+                    48 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_17 {
+                        color=blue
+                        49 [label="Enter block"];
+                        50 [label="Access variable R|<local>/a|"];
+                        51 [label="Smart cast: R|<local>/a|"];
+                        52 [label="Access variable R|kotlin/String.length|"];
+                        53 [label="Access variable R|<local>/b|"];
+                        54 [label="Access variable <Unresolved name: length>#"];
+                        subgraph cluster_18 {
+                            color=blue
+                            55 [label="Function call arguments enter"];
+                            56 [label="Function call arguments exit"];
+                        }
+                        57 [label="Function call: this@R|/<anonymous>|.R|/<anonymous>.baz|()" style="filled" fillcolor=yellow];
+                        58 [label="Exit block"];
+                    }
+                    59 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                60 [label="Function call arguments exit"];
+            }
+            61 [label="Postponed exit from lambda"];
+            62 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
+            63 [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|()
 }
 )"];
-            58 [label="Stub" style="filled" fillcolor=gray];
-            59 [label="Exit block" style="filled" fillcolor=gray];
+            64 [label="Stub" style="filled" fillcolor=gray];
+            65 [label="Exit block" style="filled" fillcolor=gray];
         }
-        60 [label="Exit function bar" style="filled" fillcolor=red];
+        66 [label="Exit function bar" style="filled" fillcolor=red];
     }
-    subgraph cluster_16 {
+    subgraph cluster_19 {
         color=blue
-        61 [label="Enter function foo" style="filled" fillcolor=red];
-        subgraph cluster_17 {
+        67 [label="Enter function foo" style="filled" fillcolor=red];
+        subgraph cluster_20 {
             color=blue
-            62 [label="Enter block"];
-            63 [label="Postponed enter to lambda"];
-            subgraph cluster_18 {
+            68 [label="Enter block"];
+            subgraph cluster_21 {
                 color=blue
-                64 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_19 {
+                69 [label="Function call arguments enter"];
+                70 [label="Postponed enter to lambda"];
+                subgraph cluster_22 {
                     color=blue
-                    65 [label="Enter block"];
-                    66 [label="Access variable R|<local>/a|"];
-                    67 [label="Smart cast: R|<local>/a|"];
-                    68 [label="Access variable R|kotlin/String.length|"];
-                    subgraph cluster_20 {
+                    71 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_23 {
                         color=blue
-                        69 [label="Enter when"];
-                        subgraph cluster_21 {
-                            color=blue
-                            70 [label="Enter when branch condition "];
-                            71 [label="Access variable R|<local>/b|"];
-                            72 [label="Type operator: (R|<local>/b| is R|kotlin/String|)"];
-                            73 [label="Exit when branch condition"];
-                        }
-                        subgraph cluster_22 {
-                            color=blue
-                            74 [label="Enter when branch condition else"];
-                            75 [label="Exit when branch condition"];
-                        }
-                        76 [label="Enter when branch result"];
-                        subgraph cluster_23 {
-                            color=blue
-                            77 [label="Enter block"];
-                            78 [label="Const: Int(1)"];
-                            79 [label="Exit block"];
-                        }
-                        80 [label="Exit when branch result"];
-                        81 [label="Enter when branch result"];
+                        72 [label="Enter block"];
+                        73 [label="Access variable R|<local>/a|"];
+                        74 [label="Smart cast: R|<local>/a|"];
+                        75 [label="Access variable R|kotlin/String.length|"];
                         subgraph cluster_24 {
                             color=blue
-                            82 [label="Enter block"];
-                            83 [label="Access variable R|<local>/b|"];
-                            84 [label="Smart cast: R|<local>/b|"];
-                            85 [label="Access variable R|kotlin/String.length|"];
-                            86 [label="Function call: this@R|/<anonymous>|.R|/<anonymous>.bar|()" style="filled" fillcolor=yellow];
-                            87 [label="Exit block"];
+                            76 [label="Enter when"];
+                            subgraph cluster_25 {
+                                color=blue
+                                77 [label="Enter when branch condition "];
+                                78 [label="Access variable R|<local>/b|"];
+                                79 [label="Type operator: (R|<local>/b| is R|kotlin/String|)"];
+                                80 [label="Exit when branch condition"];
+                            }
+                            subgraph cluster_26 {
+                                color=blue
+                                81 [label="Enter when branch condition else"];
+                                82 [label="Exit when branch condition"];
+                            }
+                            83 [label="Enter when branch result"];
+                            subgraph cluster_27 {
+                                color=blue
+                                84 [label="Enter block"];
+                                85 [label="Const: Int(1)"];
+                                86 [label="Exit block"];
+                            }
+                            87 [label="Exit when branch result"];
+                            88 [label="Enter when branch result"];
+                            subgraph cluster_28 {
+                                color=blue
+                                89 [label="Enter block"];
+                                90 [label="Access variable R|<local>/b|"];
+                                91 [label="Smart cast: R|<local>/b|"];
+                                92 [label="Access variable R|kotlin/String.length|"];
+                                subgraph cluster_29 {
+                                    color=blue
+                                    93 [label="Function call arguments enter"];
+                                    94 [label="Function call arguments exit"];
+                                }
+                                95 [label="Function call: this@R|/<anonymous>|.R|/<anonymous>.bar|()" style="filled" fillcolor=yellow];
+                                96 [label="Exit block"];
+                            }
+                            97 [label="Exit when branch result"];
+                            98 [label="Exit when"];
                         }
-                        88 [label="Exit when branch result"];
-                        89 [label="Exit when"];
+                        99 [label="Exit block"];
                     }
-                    90 [label="Exit block"];
+                    100 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                 }
-                91 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                101 [label="Function call arguments exit"];
             }
-            92 [label="Postponed exit from lambda"];
-            93 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
-            94 [label="Jump: ^foo R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <inline=Inline, kind=UNKNOWN>  {
+            102 [label="Postponed exit from lambda"];
+            103 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
+            104 [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|) ->  {
@@ -199,130 +226,150 @@ digraph localClassesWithImplicit_kt {
 
 }
 )"];
-            95 [label="Stub" style="filled" fillcolor=gray];
-            96 [label="Exit block" style="filled" fillcolor=gray];
+            105 [label="Stub" style="filled" fillcolor=gray];
+            106 [label="Exit block" style="filled" fillcolor=gray];
         }
-        97 [label="Exit function foo" style="filled" fillcolor=red];
+        107 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    subgraph cluster_25 {
+    subgraph cluster_30 {
         color=blue
-        98 [label="Enter class A" style="filled" fillcolor=red];
-        subgraph cluster_26 {
+        108 [label="Enter class A" style="filled" fillcolor=red];
+        subgraph cluster_31 {
             color=blue
-            99 [label="Enter function <init>" style="filled" fillcolor=red];
-            100 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
-            101 [label="Exit function <init>" style="filled" fillcolor=red];
+            109 [label="Enter function <init>" style="filled" fillcolor=red];
+            110 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
+            111 [label="Exit function <init>" style="filled" fillcolor=red];
         }
-        102 [label="Exit class A" style="filled" fillcolor=red];
+        112 [label="Exit class A" style="filled" fillcolor=red];
     }
-    subgraph cluster_27 {
+    subgraph cluster_32 {
         color=blue
-        103 [label="Enter function baz" style="filled" fillcolor=red];
-        subgraph cluster_28 {
+        113 [label="Enter function baz" style="filled" fillcolor=red];
+        subgraph cluster_33 {
             color=blue
-            104 [label="Enter block"];
-            105 [label="Const: Int(1)"];
-            106 [label="Jump: ^baz Int(1)"];
-            107 [label="Stub" style="filled" fillcolor=gray];
-            108 [label="Exit block" style="filled" fillcolor=gray];
+            114 [label="Enter block"];
+            115 [label="Const: Int(1)"];
+            116 [label="Jump: ^baz Int(1)"];
+            117 [label="Stub" style="filled" fillcolor=gray];
+            118 [label="Exit block" style="filled" fillcolor=gray];
         }
-        109 [label="Exit function baz" style="filled" fillcolor=red];
+        119 [label="Exit function baz" style="filled" fillcolor=red];
     }
-    subgraph cluster_29 {
+    subgraph cluster_34 {
         color=blue
-        110 [label="Enter function bar" style="filled" fillcolor=red];
-        subgraph cluster_30 {
+        120 [label="Enter function bar" style="filled" fillcolor=red];
+        subgraph cluster_35 {
             color=blue
-            111 [label="Enter block"];
-            112 [label="Postponed enter to lambda"];
-            subgraph cluster_31 {
+            121 [label="Enter block"];
+            subgraph cluster_36 {
                 color=blue
-                113 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_32 {
+                122 [label="Function call arguments enter"];
+                123 [label="Postponed enter to lambda"];
+                subgraph cluster_37 {
                     color=blue
-                    114 [label="Enter block"];
-                    115 [label="Access variable R|<local>/b|"];
-                    116 [label="Access variable <Unresolved name: length>#"];
-                    117 [label="Access variable R|<local>/a|"];
-                    118 [label="Smart cast: R|<local>/a|"];
-                    119 [label="Access variable R|kotlin/String.length|"];
-                    120 [label="Function call: this@R|<local>/A|.R|<local>/baz|()" style="filled" fillcolor=yellow];
-                    121 [label="Exit block"];
+                    124 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_38 {
+                        color=blue
+                        125 [label="Enter block"];
+                        126 [label="Access variable R|<local>/b|"];
+                        127 [label="Access variable <Unresolved name: length>#"];
+                        128 [label="Access variable R|<local>/a|"];
+                        129 [label="Smart cast: R|<local>/a|"];
+                        130 [label="Access variable R|kotlin/String.length|"];
+                        subgraph cluster_39 {
+                            color=blue
+                            131 [label="Function call arguments enter"];
+                            132 [label="Function call arguments exit"];
+                        }
+                        133 [label="Function call: this@R|<local>/A|.R|<local>/baz|()" style="filled" fillcolor=yellow];
+                        134 [label="Exit block"];
+                    }
+                    135 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                 }
-                122 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                136 [label="Function call arguments exit"];
             }
-            123 [label="Postponed exit from lambda"];
-            124 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
-            125 [label="Jump: ^bar R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <inline=Inline, kind=UNKNOWN>  {
+            137 [label="Postponed exit from lambda"];
+            138 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
+            139 [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|<local>/A|.R|<local>/baz|()
 }
 )"];
-            126 [label="Stub" style="filled" fillcolor=gray];
-            127 [label="Exit block" style="filled" fillcolor=gray];
+            140 [label="Stub" style="filled" fillcolor=gray];
+            141 [label="Exit block" style="filled" fillcolor=gray];
         }
-        128 [label="Exit function bar" style="filled" fillcolor=red];
+        142 [label="Exit function bar" style="filled" fillcolor=red];
     }
-    subgraph cluster_33 {
+    subgraph cluster_40 {
         color=blue
-        129 [label="Enter function foo" style="filled" fillcolor=red];
-        subgraph cluster_34 {
+        143 [label="Enter function foo" style="filled" fillcolor=red];
+        subgraph cluster_41 {
             color=blue
-            130 [label="Enter block"];
-            131 [label="Postponed enter to lambda"];
-            subgraph cluster_35 {
+            144 [label="Enter block"];
+            subgraph cluster_42 {
                 color=blue
-                132 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_36 {
+                145 [label="Function call arguments enter"];
+                146 [label="Postponed enter to lambda"];
+                subgraph cluster_43 {
                     color=blue
-                    133 [label="Enter block"];
-                    134 [label="Access variable R|<local>/a|"];
-                    135 [label="Smart cast: R|<local>/a|"];
-                    136 [label="Access variable R|kotlin/String.length|"];
-                    subgraph cluster_37 {
+                    147 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_44 {
                         color=blue
-                        137 [label="Enter when"];
-                        subgraph cluster_38 {
+                        148 [label="Enter block"];
+                        149 [label="Access variable R|<local>/a|"];
+                        150 [label="Smart cast: R|<local>/a|"];
+                        151 [label="Access variable R|kotlin/String.length|"];
+                        subgraph cluster_45 {
                             color=blue
-                            138 [label="Enter when branch condition "];
-                            139 [label="Access variable R|<local>/b|"];
-                            140 [label="Type operator: (R|<local>/b| is R|kotlin/String|)"];
-                            141 [label="Exit when branch condition"];
+                            152 [label="Enter when"];
+                            subgraph cluster_46 {
+                                color=blue
+                                153 [label="Enter when branch condition "];
+                                154 [label="Access variable R|<local>/b|"];
+                                155 [label="Type operator: (R|<local>/b| is R|kotlin/String|)"];
+                                156 [label="Exit when branch condition"];
+                            }
+                            subgraph cluster_47 {
+                                color=blue
+                                157 [label="Enter when branch condition else"];
+                                158 [label="Exit when branch condition"];
+                            }
+                            159 [label="Enter when branch result"];
+                            subgraph cluster_48 {
+                                color=blue
+                                160 [label="Enter block"];
+                                161 [label="Const: Int(1)"];
+                                162 [label="Exit block"];
+                            }
+                            163 [label="Exit when branch result"];
+                            164 [label="Enter when branch result"];
+                            subgraph cluster_49 {
+                                color=blue
+                                165 [label="Enter block"];
+                                166 [label="Access variable R|<local>/b|"];
+                                167 [label="Smart cast: R|<local>/b|"];
+                                168 [label="Access variable R|kotlin/String.length|"];
+                                subgraph cluster_50 {
+                                    color=blue
+                                    169 [label="Function call arguments enter"];
+                                    170 [label="Function call arguments exit"];
+                                }
+                                171 [label="Function call: this@R|<local>/A|.R|<local>/bar|()" style="filled" fillcolor=yellow];
+                                172 [label="Exit block"];
+                            }
+                            173 [label="Exit when branch result"];
+                            174 [label="Exit when"];
                         }
-                        subgraph cluster_39 {
-                            color=blue
-                            142 [label="Enter when branch condition else"];
-                            143 [label="Exit when branch condition"];
-                        }
-                        144 [label="Enter when branch result"];
-                        subgraph cluster_40 {
-                            color=blue
-                            145 [label="Enter block"];
-                            146 [label="Const: Int(1)"];
-                            147 [label="Exit block"];
-                        }
-                        148 [label="Exit when branch result"];
-                        149 [label="Enter when branch result"];
-                        subgraph cluster_41 {
-                            color=blue
-                            150 [label="Enter block"];
-                            151 [label="Access variable R|<local>/b|"];
-                            152 [label="Smart cast: R|<local>/b|"];
-                            153 [label="Access variable R|kotlin/String.length|"];
-                            154 [label="Function call: this@R|<local>/A|.R|<local>/bar|()" style="filled" fillcolor=yellow];
-                            155 [label="Exit block"];
-                        }
-                        156 [label="Exit when branch result"];
-                        157 [label="Exit when"];
+                        175 [label="Exit block"];
                     }
-                    158 [label="Exit block"];
+                    176 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                 }
-                159 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                177 [label="Function call arguments exit"];
             }
-            160 [label="Postponed exit from lambda"];
-            161 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
-            162 [label="Jump: ^foo R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <inline=Inline, kind=UNKNOWN>  {
+            178 [label="Postponed exit from lambda"];
+            179 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
+            180 [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|) ->  {
@@ -336,59 +383,57 @@ digraph localClassesWithImplicit_kt {
 
 }
 )"];
-            163 [label="Stub" style="filled" fillcolor=gray];
-            164 [label="Exit block" style="filled" fillcolor=gray];
+            181 [label="Stub" style="filled" fillcolor=gray];
+            182 [label="Exit block" style="filled" fillcolor=gray];
         }
-        165 [label="Exit function foo" style="filled" fillcolor=red];
+        183 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    9 -> {10};
-    10 -> {11};
     11 -> {12};
     12 -> {13};
     13 -> {14};
     14 -> {15};
-    15 -> {16 17};
-    16 -> {23};
-    17 -> {18};
-    18 -> {19};
-    19 -> {34};
-    19 -> {20} [style=dotted];
-    20 -> {21} [style=dotted];
+    15 -> {16};
+    16 -> {17};
+    17 -> {18 19};
+    18 -> {25};
+    19 -> {20};
+    20 -> {21};
+    21 -> {36};
     21 -> {22} [style=dotted];
     22 -> {23} [style=dotted];
-    23 -> {24};
-    24 -> {25 98};
-    24 -> {98} [style=dashed];
+    23 -> {24} [style=dotted];
+    24 -> {25} [style=dotted];
     25 -> {26};
-    25 -> {31} [style=dotted];
-    25 -> {26} [style=dashed];
-    26 -> {27};
-    26 -> {35 42 61} [color=red];
-    26 -> {30} [style=dotted];
-    26 -> {27} [style=dashed];
+    26 -> {27 108};
+    26 -> {108} [style=dashed];
     27 -> {28};
+    27 -> {33} [style=dotted];
+    27 -> {28} [style=dashed];
     28 -> {29};
+    28 -> {37 44 67} [color=red];
+    28 -> {32} [style=dotted];
+    28 -> {29} [style=dashed];
     29 -> {30};
     30 -> {31};
-    30 -> {35 42 61} [color=green];
-    30 -> {35 42 61} [style=dashed];
     31 -> {32};
     32 -> {33};
+    32 -> {37 44 67} [color=green];
+    32 -> {37 44 67} [style=dashed];
     33 -> {34};
+    34 -> {35};
     35 -> {36};
-    36 -> {37};
     37 -> {38};
-    38 -> {41};
-    38 -> {39} [style=dotted];
-    39 -> {40} [style=dotted];
+    38 -> {39};
+    39 -> {40};
+    40 -> {43};
     40 -> {41} [style=dotted];
-    42 -> {43};
-    43 -> {44};
-    44 -> {45 55 56};
-    44 -> {45} [style=dashed];
+    41 -> {42} [style=dotted];
+    42 -> {43} [style=dotted];
+    44 -> {45};
     45 -> {46};
     46 -> {47};
-    47 -> {48};
+    47 -> {48 60 61};
+    47 -> {48} [style=dashed];
     48 -> {49};
     49 -> {50};
     50 -> {51};
@@ -397,109 +442,109 @@ digraph localClassesWithImplicit_kt {
     53 -> {54};
     54 -> {55};
     55 -> {56};
-    55 -> {44} [color=green style=dashed];
     56 -> {57};
-    57 -> {60};
-    57 -> {58} [style=dotted];
-    58 -> {59} [style=dotted];
-    59 -> {60} [style=dotted];
+    57 -> {58};
+    58 -> {59};
+    59 -> {61};
+    60 -> {62};
     61 -> {62};
+    61 -> {47} [color=green style=dashed];
     62 -> {63};
-    63 -> {64 92 93};
-    63 -> {64} [style=dashed];
-    64 -> {65};
-    65 -> {66};
-    66 -> {67};
+    63 -> {66};
+    63 -> {64} [style=dotted];
+    64 -> {65} [style=dotted];
+    65 -> {66} [style=dotted];
     67 -> {68};
     68 -> {69};
     69 -> {70};
-    70 -> {71};
+    70 -> {71 101 102};
+    70 -> {71} [style=dashed];
     71 -> {72};
     72 -> {73};
-    73 -> {74 81};
+    73 -> {74};
     74 -> {75};
     75 -> {76};
     76 -> {77};
     77 -> {78};
     78 -> {79};
     79 -> {80};
-    80 -> {89};
+    80 -> {81 88};
     81 -> {82};
     82 -> {83};
     83 -> {84};
     84 -> {85};
     85 -> {86};
     86 -> {87};
-    87 -> {88};
+    87 -> {98};
     88 -> {89};
     89 -> {90};
     90 -> {91};
     91 -> {92};
     92 -> {93};
-    92 -> {63} [color=green style=dashed];
     93 -> {94};
-    94 -> {97};
-    94 -> {95} [style=dotted];
-    95 -> {96} [style=dotted];
-    96 -> {97} [style=dotted];
+    94 -> {95};
+    95 -> {96};
+    96 -> {97};
+    97 -> {98};
     98 -> {99};
-    98 -> {103 110 129} [color=red];
-    98 -> {102} [style=dotted];
-    98 -> {99} [style=dashed];
     99 -> {100};
-    100 -> {101};
-    101 -> {102} [color=green];
-    102 -> {103 110 129} [color=green];
-    102 -> {103 110 129} [style=dashed];
+    100 -> {102};
+    101 -> {103};
+    102 -> {103};
+    102 -> {70} [color=green style=dashed];
     103 -> {104};
-    104 -> {105};
-    105 -> {106};
-    106 -> {109};
+    104 -> {107};
+    104 -> {105} [style=dotted];
+    105 -> {106} [style=dotted];
     106 -> {107} [style=dotted];
-    107 -> {108} [style=dotted];
-    108 -> {109} [style=dotted];
+    108 -> {109};
+    108 -> {113 120 143} [color=red];
+    108 -> {112} [style=dotted];
+    108 -> {109} [style=dashed];
+    109 -> {110};
     110 -> {111};
-    111 -> {112};
-    112 -> {113 123 124};
-    112 -> {113} [style=dashed];
+    111 -> {112} [color=green];
+    112 -> {113 120 143} [color=green];
+    112 -> {113 120 143} [style=dashed];
     113 -> {114};
     114 -> {115};
     115 -> {116};
-    116 -> {117};
-    117 -> {118};
-    118 -> {119};
-    119 -> {120};
+    116 -> {119};
+    116 -> {117} [style=dotted];
+    117 -> {118} [style=dotted];
+    118 -> {119} [style=dotted];
     120 -> {121};
     121 -> {122};
     122 -> {123};
-    123 -> {124};
-    123 -> {112} [color=green style=dashed];
+    123 -> {124 136 137};
+    123 -> {124} [style=dashed];
     124 -> {125};
-    125 -> {128};
-    125 -> {126} [style=dotted];
-    126 -> {127} [style=dotted];
-    127 -> {128} [style=dotted];
+    125 -> {126};
+    126 -> {127};
+    127 -> {128};
+    128 -> {129};
     129 -> {130};
     130 -> {131};
-    131 -> {132 160 161};
-    131 -> {132} [style=dashed];
+    131 -> {132};
     132 -> {133};
     133 -> {134};
     134 -> {135};
-    135 -> {136};
-    136 -> {137};
+    135 -> {137};
+    136 -> {138};
     137 -> {138};
+    137 -> {123} [color=green style=dashed];
     138 -> {139};
-    139 -> {140};
-    140 -> {141};
-    141 -> {142 149};
-    142 -> {143};
+    139 -> {142};
+    139 -> {140} [style=dotted];
+    140 -> {141} [style=dotted];
+    141 -> {142} [style=dotted];
     143 -> {144};
     144 -> {145};
     145 -> {146};
-    146 -> {147};
+    146 -> {147 177 178};
+    146 -> {147} [style=dashed];
     147 -> {148};
-    148 -> {157};
+    148 -> {149};
     149 -> {150};
     150 -> {151};
     151 -> {152};
@@ -507,16 +552,34 @@ digraph localClassesWithImplicit_kt {
     153 -> {154};
     154 -> {155};
     155 -> {156};
-    156 -> {157};
+    156 -> {157 164};
     157 -> {158};
     158 -> {159};
     159 -> {160};
     160 -> {161};
-    160 -> {131} [color=green style=dashed];
     161 -> {162};
-    162 -> {165};
-    162 -> {163} [style=dotted];
-    163 -> {164} [style=dotted];
-    164 -> {165} [style=dotted];
+    162 -> {163};
+    163 -> {174};
+    164 -> {165};
+    165 -> {166};
+    166 -> {167};
+    167 -> {168};
+    168 -> {169};
+    169 -> {170};
+    170 -> {171};
+    171 -> {172};
+    172 -> {173};
+    173 -> {174};
+    174 -> {175};
+    175 -> {176};
+    176 -> {178};
+    177 -> {179};
+    178 -> {179};
+    178 -> {146} [color=green style=dashed];
+    179 -> {180};
+    180 -> {183};
+    180 -> {181} [style=dotted];
+    181 -> {182} [style=dotted];
+    182 -> {183} [style=dotted];
 
 }

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

@@ -128,51 +128,71 @@ digraph loops_kt {
             subgraph cluster_15 {
                 color=blue
                 40 [label="Enter block"];
-                41 [label="Const: Int(0)"];
-                42 [label="Const: Int(5)"];
-                43 [label="Function call: Int(0).R|kotlin/Int.rangeTo|(...)" style="filled" fillcolor=yellow];
-                44 [label="Function call: Int(0).R|kotlin/Int.rangeTo|(...).R|kotlin/ranges/IntProgression.iterator|()" style="filled" fillcolor=yellow];
-                45 [label="Variable declaration: lval <iterator>: R|kotlin/collections/IntIterator|"];
                 subgraph cluster_16 {
                     color=blue
-                    46 [label="Enter while loop"];
+                    41 [label="Function call arguments enter"];
                     subgraph cluster_17 {
                         color=blue
-                        47 [label="Enter loop condition"];
-                        48 [label="Access variable R|<local>/<iterator>|"];
-                        49 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/IntIterator.hasNext: R|kotlin/Boolean|>|()" style="filled" fillcolor=yellow];
-                        50 [label="Exit loop condition"];
+                        42 [label="Function call arguments enter"];
+                        43 [label="Const: Int(0)"];
+                        44 [label="Const: Int(5)"];
+                        45 [label="Function call arguments exit"];
                     }
-                    subgraph cluster_18 {
-                        color=blue
-                        51 [label="Enter loop block"];
-                        subgraph cluster_19 {
-                            color=blue
-                            52 [label="Enter block"];
-                            53 [label="Access variable R|<local>/<iterator>|"];
-                            54 [label="Function call: R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()" style="filled" fillcolor=yellow];
-                            55 [label="Variable declaration: lval i: R|kotlin/Int|"];
-                            subgraph cluster_20 {
-                                color=blue
-                                56 [label="Enter block"];
-                                57 [label="Access variable R|<local>/x|"];
-                                58 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-                                59 [label="Variable declaration: lval y: R|kotlin/Boolean|"];
-                                60 [label="Exit block"];
-                            }
-                            61 [label="Exit block"];
-                        }
-                        62 [label="Exit loop block"];
-                    }
-                    63 [label="Exit while loop"];
+                    46 [label="Function call: Int(0).R|kotlin/Int.rangeTo|(...)" style="filled" fillcolor=yellow];
+                    47 [label="Function call arguments exit"];
                 }
-                64 [label="Exit block"];
+                48 [label="Function call: Int(0).R|kotlin/Int.rangeTo|(...).R|kotlin/ranges/IntProgression.iterator|()" style="filled" fillcolor=yellow];
+                49 [label="Variable declaration: lval <iterator>: R|kotlin/collections/IntIterator|"];
+                subgraph cluster_18 {
+                    color=blue
+                    50 [label="Enter while loop"];
+                    subgraph cluster_19 {
+                        color=blue
+                        51 [label="Enter loop condition"];
+                        subgraph cluster_20 {
+                            color=blue
+                            52 [label="Function call arguments enter"];
+                            53 [label="Access variable R|<local>/<iterator>|"];
+                            54 [label="Function call arguments exit"];
+                        }
+                        55 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/IntIterator.hasNext: R|kotlin/Boolean|>|()" style="filled" fillcolor=yellow];
+                        56 [label="Exit loop condition"];
+                    }
+                    subgraph cluster_21 {
+                        color=blue
+                        57 [label="Enter loop block"];
+                        subgraph cluster_22 {
+                            color=blue
+                            58 [label="Enter block"];
+                            subgraph cluster_23 {
+                                color=blue
+                                59 [label="Function call arguments enter"];
+                                60 [label="Access variable R|<local>/<iterator>|"];
+                                61 [label="Function call arguments exit"];
+                            }
+                            62 [label="Function call: R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()" style="filled" fillcolor=yellow];
+                            63 [label="Variable declaration: lval i: R|kotlin/Int|"];
+                            subgraph cluster_24 {
+                                color=blue
+                                64 [label="Enter block"];
+                                65 [label="Access variable R|<local>/x|"];
+                                66 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+                                67 [label="Variable declaration: lval y: R|kotlin/Boolean|"];
+                                68 [label="Exit block"];
+                            }
+                            69 [label="Exit block"];
+                        }
+                        70 [label="Exit loop block"];
+                    }
+                    71 [label="Exit while loop"];
+                }
+                72 [label="Exit block"];
             }
-            65 [label="Access variable R|<local>/x|"];
-            66 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-            67 [label="Exit block"];
+            73 [label="Access variable R|<local>/x|"];
+            74 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+            75 [label="Exit block"];
         }
-        68 [label="Exit function testFor" style="filled" fillcolor=red];
+        76 [label="Exit function testFor" style="filled" fillcolor=red];
     }
     38 -> {39};
     39 -> {40};
@@ -186,381 +206,389 @@ digraph loops_kt {
     47 -> {48};
     48 -> {49};
     49 -> {50};
-    50 -> {51 63};
+    50 -> {51};
     51 -> {52};
     52 -> {53};
     53 -> {54};
     54 -> {55};
     55 -> {56};
-    56 -> {57};
+    56 -> {57 71};
     57 -> {58};
     58 -> {59};
     59 -> {60};
     60 -> {61};
     61 -> {62};
-    62 -> {47} [color=green style=dashed];
+    62 -> {63};
     63 -> {64};
     64 -> {65};
     65 -> {66};
     66 -> {67};
     67 -> {68};
-
-    subgraph cluster_21 {
-        color=red
-        69 [label="Enter function testWhileTrue" style="filled" fillcolor=red];
-        subgraph cluster_22 {
-            color=blue
-            70 [label="Enter block"];
-            subgraph cluster_23 {
-                color=blue
-                71 [label="Enter while loop"];
-                subgraph cluster_24 {
-                    color=blue
-                    72 [label="Enter loop condition"];
-                    73 [label="Const: Boolean(true)"];
-                    74 [label="Exit loop condition"];
-                }
-                subgraph cluster_25 {
-                    color=blue
-                    75 [label="Enter loop block"];
-                    subgraph cluster_26 {
-                        color=blue
-                        76 [label="Enter block"];
-                        77 [label="Const: Int(1)"];
-                        78 [label="Exit block"];
-                    }
-                    79 [label="Exit loop block"];
-                }
-                80 [label="Exit while loop" style="filled" fillcolor=gray];
-            }
-            81 [label="Const: Int(1)" style="filled" fillcolor=gray];
-            82 [label="Exit block" style="filled" fillcolor=gray];
-        }
-        83 [label="Exit function testWhileTrue" style="filled" fillcolor=gray];
-    }
+    68 -> {69};
     69 -> {70};
-    70 -> {71};
+    70 -> {51} [color=green style=dashed];
     71 -> {72};
     72 -> {73};
     73 -> {74};
     74 -> {75};
-    74 -> {80} [style=dotted];
     75 -> {76};
-    76 -> {77};
+
+    subgraph cluster_25 {
+        color=red
+        77 [label="Enter function testWhileTrue" style="filled" fillcolor=red];
+        subgraph cluster_26 {
+            color=blue
+            78 [label="Enter block"];
+            subgraph cluster_27 {
+                color=blue
+                79 [label="Enter while loop"];
+                subgraph cluster_28 {
+                    color=blue
+                    80 [label="Enter loop condition"];
+                    81 [label="Const: Boolean(true)"];
+                    82 [label="Exit loop condition"];
+                }
+                subgraph cluster_29 {
+                    color=blue
+                    83 [label="Enter loop block"];
+                    subgraph cluster_30 {
+                        color=blue
+                        84 [label="Enter block"];
+                        85 [label="Const: Int(1)"];
+                        86 [label="Exit block"];
+                    }
+                    87 [label="Exit loop block"];
+                }
+                88 [label="Exit while loop" style="filled" fillcolor=gray];
+            }
+            89 [label="Const: Int(1)" style="filled" fillcolor=gray];
+            90 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        91 [label="Exit function testWhileTrue" style="filled" fillcolor=gray];
+    }
     77 -> {78};
     78 -> {79};
-    79 -> {72} [color=green style=dashed];
-    80 -> {81} [style=dotted];
-    81 -> {82} [style=dotted];
-    82 -> {83} [style=dotted];
-
-    subgraph cluster_27 {
-        color=red
-        84 [label="Enter function testWhileTrueWithBreak" style="filled" fillcolor=red];
-        subgraph cluster_28 {
-            color=blue
-            85 [label="Enter block"];
-            subgraph cluster_29 {
-                color=blue
-                86 [label="Enter while loop"];
-                subgraph cluster_30 {
-                    color=blue
-                    87 [label="Enter loop condition"];
-                    88 [label="Const: Boolean(true)"];
-                    89 [label="Exit loop condition"];
-                }
-                subgraph cluster_31 {
-                    color=blue
-                    90 [label="Enter loop block"];
-                    subgraph cluster_32 {
-                        color=blue
-                        91 [label="Enter block"];
-                        subgraph cluster_33 {
-                            color=blue
-                            92 [label="Enter when"];
-                            subgraph cluster_34 {
-                                color=blue
-                                93 [label="Enter when branch condition "];
-                                94 [label="Access variable R|<local>/b|"];
-                                95 [label="Exit when branch condition"];
-                            }
-                            96 [label="Synthetic else branch"];
-                            97 [label="Enter when branch result"];
-                            subgraph cluster_35 {
-                                color=blue
-                                98 [label="Enter block"];
-                                99 [label="Jump: break@@@[Boolean(true)] "];
-                                100 [label="Stub" style="filled" fillcolor=gray];
-                                101 [label="Exit block" style="filled" fillcolor=gray];
-                            }
-                            102 [label="Exit when branch result" style="filled" fillcolor=gray];
-                            103 [label="Exit when"];
-                        }
-                        104 [label="Exit block"];
-                    }
-                    105 [label="Exit loop block"];
-                }
-                106 [label="Exit while loop"];
-            }
-            107 [label="Const: Int(1)"];
-            108 [label="Exit block"];
-        }
-        109 [label="Exit function testWhileTrueWithBreak" style="filled" fillcolor=red];
-    }
+    79 -> {80};
+    80 -> {81};
+    81 -> {82};
+    82 -> {83};
+    82 -> {88} [style=dotted];
+    83 -> {84};
     84 -> {85};
     85 -> {86};
     86 -> {87};
-    87 -> {88};
-    88 -> {89};
-    89 -> {90};
-    89 -> {106} [style=dotted];
-    90 -> {91};
-    91 -> {92};
+    87 -> {80} [color=green style=dashed];
+    88 -> {89} [style=dotted];
+    89 -> {90} [style=dotted];
+    90 -> {91} [style=dotted];
+
+    subgraph cluster_31 {
+        color=red
+        92 [label="Enter function testWhileTrueWithBreak" style="filled" fillcolor=red];
+        subgraph cluster_32 {
+            color=blue
+            93 [label="Enter block"];
+            subgraph cluster_33 {
+                color=blue
+                94 [label="Enter while loop"];
+                subgraph cluster_34 {
+                    color=blue
+                    95 [label="Enter loop condition"];
+                    96 [label="Const: Boolean(true)"];
+                    97 [label="Exit loop condition"];
+                }
+                subgraph cluster_35 {
+                    color=blue
+                    98 [label="Enter loop block"];
+                    subgraph cluster_36 {
+                        color=blue
+                        99 [label="Enter block"];
+                        subgraph cluster_37 {
+                            color=blue
+                            100 [label="Enter when"];
+                            subgraph cluster_38 {
+                                color=blue
+                                101 [label="Enter when branch condition "];
+                                102 [label="Access variable R|<local>/b|"];
+                                103 [label="Exit when branch condition"];
+                            }
+                            104 [label="Synthetic else branch"];
+                            105 [label="Enter when branch result"];
+                            subgraph cluster_39 {
+                                color=blue
+                                106 [label="Enter block"];
+                                107 [label="Jump: break@@@[Boolean(true)] "];
+                                108 [label="Stub" style="filled" fillcolor=gray];
+                                109 [label="Exit block" style="filled" fillcolor=gray];
+                            }
+                            110 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            111 [label="Exit when"];
+                        }
+                        112 [label="Exit block"];
+                    }
+                    113 [label="Exit loop block"];
+                }
+                114 [label="Exit while loop"];
+            }
+            115 [label="Const: Int(1)"];
+            116 [label="Exit block"];
+        }
+        117 [label="Exit function testWhileTrueWithBreak" style="filled" fillcolor=red];
+    }
     92 -> {93};
     93 -> {94};
     94 -> {95};
-    95 -> {96 97};
-    96 -> {103};
+    95 -> {96};
+    96 -> {97};
     97 -> {98};
+    97 -> {114} [style=dotted];
     98 -> {99};
-    99 -> {106};
-    99 -> {100} [style=dotted];
-    100 -> {101} [style=dotted];
-    101 -> {102} [style=dotted];
-    102 -> {103} [style=dotted];
-    103 -> {104};
-    104 -> {105};
-    105 -> {87} [color=green style=dashed];
+    99 -> {100};
+    100 -> {101};
+    101 -> {102};
+    102 -> {103};
+    103 -> {104 105};
+    104 -> {111};
+    105 -> {106};
     106 -> {107};
-    107 -> {108};
-    108 -> {109};
-
-    subgraph cluster_36 {
-        color=red
-        110 [label="Enter function testWhileFalse" style="filled" fillcolor=red];
-        subgraph cluster_37 {
-            color=blue
-            111 [label="Enter block"];
-            subgraph cluster_38 {
-                color=blue
-                112 [label="Enter while loop"];
-                subgraph cluster_39 {
-                    color=blue
-                    113 [label="Enter loop condition"];
-                    114 [label="Const: Boolean(false)"];
-                    115 [label="Exit loop condition"];
-                }
-                subgraph cluster_40 {
-                    color=blue
-                    116 [label="Enter loop block" style="filled" fillcolor=gray];
-                    subgraph cluster_41 {
-                        color=blue
-                        117 [label="Enter block" style="filled" fillcolor=gray];
-                        118 [label="Const: Int(1)" style="filled" fillcolor=gray];
-                        119 [label="Exit block" style="filled" fillcolor=gray];
-                    }
-                    120 [label="Exit loop block" style="filled" fillcolor=gray];
-                }
-                121 [label="Exit while loop"];
-            }
-            122 [label="Const: Int(1)"];
-            123 [label="Exit block"];
-        }
-        124 [label="Exit function testWhileFalse" style="filled" fillcolor=red];
-    }
-    110 -> {111};
+    107 -> {114};
+    107 -> {108} [style=dotted];
+    108 -> {109} [style=dotted];
+    109 -> {110} [style=dotted];
+    110 -> {111} [style=dotted];
     111 -> {112};
     112 -> {113};
-    113 -> {114};
+    113 -> {95} [color=green style=dashed];
     114 -> {115};
-    115 -> {121};
-    115 -> {116} [style=dotted];
-    116 -> {117} [style=dotted];
-    117 -> {118} [style=dotted];
-    118 -> {119} [style=dotted];
-    119 -> {120} [style=dotted];
-    120 -> {113} [color=green style=dotted];
+    115 -> {116};
+    116 -> {117};
+
+    subgraph cluster_40 {
+        color=red
+        118 [label="Enter function testWhileFalse" style="filled" fillcolor=red];
+        subgraph cluster_41 {
+            color=blue
+            119 [label="Enter block"];
+            subgraph cluster_42 {
+                color=blue
+                120 [label="Enter while loop"];
+                subgraph cluster_43 {
+                    color=blue
+                    121 [label="Enter loop condition"];
+                    122 [label="Const: Boolean(false)"];
+                    123 [label="Exit loop condition"];
+                }
+                subgraph cluster_44 {
+                    color=blue
+                    124 [label="Enter loop block" style="filled" fillcolor=gray];
+                    subgraph cluster_45 {
+                        color=blue
+                        125 [label="Enter block" style="filled" fillcolor=gray];
+                        126 [label="Const: Int(1)" style="filled" fillcolor=gray];
+                        127 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    128 [label="Exit loop block" style="filled" fillcolor=gray];
+                }
+                129 [label="Exit while loop"];
+            }
+            130 [label="Const: Int(1)"];
+            131 [label="Exit block"];
+        }
+        132 [label="Exit function testWhileFalse" style="filled" fillcolor=red];
+    }
+    118 -> {119};
+    119 -> {120};
+    120 -> {121};
     121 -> {122};
     122 -> {123};
-    123 -> {124};
-
-    subgraph cluster_42 {
-        color=red
-        125 [label="Enter function testDoWhileTrue" style="filled" fillcolor=red];
-        subgraph cluster_43 {
-            color=blue
-            126 [label="Enter block"];
-            subgraph cluster_44 {
-                color=blue
-                127 [label="Enter do-while loop"];
-                subgraph cluster_45 {
-                    color=blue
-                    128 [label="Enter loop block"];
-                    subgraph cluster_46 {
-                        color=blue
-                        129 [label="Enter block"];
-                        130 [label="Const: Int(1)"];
-                        131 [label="Exit block"];
-                    }
-                    132 [label="Exit loop block"];
-                }
-                subgraph cluster_47 {
-                    color=blue
-                    133 [label="Enter loop condition"];
-                    134 [label="Const: Boolean(true)"];
-                    135 [label="Exit loop condition"];
-                }
-                136 [label="Exit do-while loop" style="filled" fillcolor=gray];
-            }
-            137 [label="Const: Int(1)" style="filled" fillcolor=gray];
-            138 [label="Exit block" style="filled" fillcolor=gray];
-        }
-        139 [label="Exit function testDoWhileTrue" style="filled" fillcolor=gray];
-    }
-    125 -> {126};
-    126 -> {127};
-    127 -> {128};
-    128 -> {129};
+    123 -> {129};
+    123 -> {124} [style=dotted];
+    124 -> {125} [style=dotted];
+    125 -> {126} [style=dotted];
+    126 -> {127} [style=dotted];
+    127 -> {128} [style=dotted];
+    128 -> {121} [color=green style=dotted];
     129 -> {130};
     130 -> {131};
     131 -> {132};
-    132 -> {133};
-    133 -> {134};
-    134 -> {135};
-    135 -> {128} [color=green style=dashed];
-    135 -> {136} [style=dotted];
-    136 -> {137} [style=dotted];
-    137 -> {138} [style=dotted];
-    138 -> {139} [style=dotted];
 
-    subgraph cluster_48 {
+    subgraph cluster_46 {
         color=red
-        140 [label="Enter function testDoWhileTrueWithBreak" style="filled" fillcolor=red];
-        subgraph cluster_49 {
+        133 [label="Enter function testDoWhileTrue" style="filled" fillcolor=red];
+        subgraph cluster_47 {
             color=blue
-            141 [label="Enter block"];
-            subgraph cluster_50 {
+            134 [label="Enter block"];
+            subgraph cluster_48 {
                 color=blue
-                142 [label="Enter do-while loop"];
+                135 [label="Enter do-while loop"];
+                subgraph cluster_49 {
+                    color=blue
+                    136 [label="Enter loop block"];
+                    subgraph cluster_50 {
+                        color=blue
+                        137 [label="Enter block"];
+                        138 [label="Const: Int(1)"];
+                        139 [label="Exit block"];
+                    }
+                    140 [label="Exit loop block"];
+                }
                 subgraph cluster_51 {
                     color=blue
-                    143 [label="Enter loop block"];
-                    subgraph cluster_52 {
-                        color=blue
-                        144 [label="Enter block"];
-                        subgraph cluster_53 {
-                            color=blue
-                            145 [label="Enter when"];
-                            subgraph cluster_54 {
-                                color=blue
-                                146 [label="Enter when branch condition "];
-                                147 [label="Access variable R|<local>/b|"];
-                                148 [label="Exit when branch condition"];
-                            }
-                            149 [label="Synthetic else branch"];
-                            150 [label="Enter when branch result"];
-                            subgraph cluster_55 {
-                                color=blue
-                                151 [label="Enter block"];
-                                152 [label="Jump: break@@@[Boolean(true)] "];
-                                153 [label="Stub" style="filled" fillcolor=gray];
-                                154 [label="Exit block" style="filled" fillcolor=gray];
-                            }
-                            155 [label="Exit when branch result" style="filled" fillcolor=gray];
-                            156 [label="Exit when"];
-                        }
-                        157 [label="Exit block"];
-                    }
-                    158 [label="Exit loop block"];
+                    141 [label="Enter loop condition"];
+                    142 [label="Const: Boolean(true)"];
+                    143 [label="Exit loop condition"];
                 }
-                subgraph cluster_56 {
-                    color=blue
-                    159 [label="Enter loop condition"];
-                    160 [label="Const: Boolean(true)"];
-                    161 [label="Exit loop condition"];
-                }
-                162 [label="Exit do-while loop"];
+                144 [label="Exit do-while loop" style="filled" fillcolor=gray];
             }
-            163 [label="Const: Int(1)"];
-            164 [label="Exit block"];
+            145 [label="Const: Int(1)" style="filled" fillcolor=gray];
+            146 [label="Exit block" style="filled" fillcolor=gray];
         }
-        165 [label="Exit function testDoWhileTrueWithBreak" style="filled" fillcolor=red];
+        147 [label="Exit function testDoWhileTrue" style="filled" fillcolor=gray];
     }
+    133 -> {134};
+    134 -> {135};
+    135 -> {136};
+    136 -> {137};
+    137 -> {138};
+    138 -> {139};
+    139 -> {140};
     140 -> {141};
     141 -> {142};
     142 -> {143};
-    143 -> {144};
-    144 -> {145};
-    145 -> {146};
-    146 -> {147};
-    147 -> {148};
-    148 -> {149 150};
-    149 -> {156};
-    150 -> {151};
-    151 -> {152};
-    152 -> {162};
-    152 -> {153} [style=dotted];
-    153 -> {154} [style=dotted];
-    154 -> {155} [style=dotted];
-    155 -> {156} [style=dotted];
-    156 -> {157};
-    157 -> {158};
-    158 -> {159};
-    159 -> {160};
-    160 -> {161};
-    161 -> {143} [color=green style=dashed];
-    161 -> {162} [style=dotted];
-    162 -> {163};
-    163 -> {164};
-    164 -> {165};
+    143 -> {136} [color=green style=dashed];
+    143 -> {144} [style=dotted];
+    144 -> {145} [style=dotted];
+    145 -> {146} [style=dotted];
+    146 -> {147} [style=dotted];
 
-    subgraph cluster_57 {
+    subgraph cluster_52 {
         color=red
-        166 [label="Enter function testDoWhileFalse" style="filled" fillcolor=red];
-        subgraph cluster_58 {
+        148 [label="Enter function testDoWhileTrueWithBreak" style="filled" fillcolor=red];
+        subgraph cluster_53 {
             color=blue
-            167 [label="Enter block"];
-            subgraph cluster_59 {
+            149 [label="Enter block"];
+            subgraph cluster_54 {
                 color=blue
-                168 [label="Enter do-while loop"];
+                150 [label="Enter do-while loop"];
+                subgraph cluster_55 {
+                    color=blue
+                    151 [label="Enter loop block"];
+                    subgraph cluster_56 {
+                        color=blue
+                        152 [label="Enter block"];
+                        subgraph cluster_57 {
+                            color=blue
+                            153 [label="Enter when"];
+                            subgraph cluster_58 {
+                                color=blue
+                                154 [label="Enter when branch condition "];
+                                155 [label="Access variable R|<local>/b|"];
+                                156 [label="Exit when branch condition"];
+                            }
+                            157 [label="Synthetic else branch"];
+                            158 [label="Enter when branch result"];
+                            subgraph cluster_59 {
+                                color=blue
+                                159 [label="Enter block"];
+                                160 [label="Jump: break@@@[Boolean(true)] "];
+                                161 [label="Stub" style="filled" fillcolor=gray];
+                                162 [label="Exit block" style="filled" fillcolor=gray];
+                            }
+                            163 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            164 [label="Exit when"];
+                        }
+                        165 [label="Exit block"];
+                    }
+                    166 [label="Exit loop block"];
+                }
                 subgraph cluster_60 {
                     color=blue
-                    169 [label="Enter loop block"];
-                    subgraph cluster_61 {
-                        color=blue
-                        170 [label="Enter block"];
-                        171 [label="Const: Int(1)"];
-                        172 [label="Exit block"];
-                    }
-                    173 [label="Exit loop block"];
+                    167 [label="Enter loop condition"];
+                    168 [label="Const: Boolean(true)"];
+                    169 [label="Exit loop condition"];
                 }
-                subgraph cluster_62 {
-                    color=blue
-                    174 [label="Enter loop condition"];
-                    175 [label="Const: Boolean(false)"];
-                    176 [label="Exit loop condition"];
-                }
-                177 [label="Exit do-while loop"];
+                170 [label="Exit do-while loop"];
             }
-            178 [label="Const: Int(1)"];
-            179 [label="Exit block"];
+            171 [label="Const: Int(1)"];
+            172 [label="Exit block"];
         }
-        180 [label="Exit function testDoWhileFalse" style="filled" fillcolor=red];
+        173 [label="Exit function testDoWhileTrueWithBreak" style="filled" fillcolor=red];
     }
+    148 -> {149};
+    149 -> {150};
+    150 -> {151};
+    151 -> {152};
+    152 -> {153};
+    153 -> {154};
+    154 -> {155};
+    155 -> {156};
+    156 -> {157 158};
+    157 -> {164};
+    158 -> {159};
+    159 -> {160};
+    160 -> {170};
+    160 -> {161} [style=dotted];
+    161 -> {162} [style=dotted];
+    162 -> {163} [style=dotted];
+    163 -> {164} [style=dotted];
+    164 -> {165};
+    165 -> {166};
     166 -> {167};
     167 -> {168};
     168 -> {169};
-    169 -> {170};
+    169 -> {151} [color=green style=dashed];
+    169 -> {170} [style=dotted];
     170 -> {171};
     171 -> {172};
     172 -> {173};
-    173 -> {174};
+
+    subgraph cluster_61 {
+        color=red
+        174 [label="Enter function testDoWhileFalse" style="filled" fillcolor=red];
+        subgraph cluster_62 {
+            color=blue
+            175 [label="Enter block"];
+            subgraph cluster_63 {
+                color=blue
+                176 [label="Enter do-while loop"];
+                subgraph cluster_64 {
+                    color=blue
+                    177 [label="Enter loop block"];
+                    subgraph cluster_65 {
+                        color=blue
+                        178 [label="Enter block"];
+                        179 [label="Const: Int(1)"];
+                        180 [label="Exit block"];
+                    }
+                    181 [label="Exit loop block"];
+                }
+                subgraph cluster_66 {
+                    color=blue
+                    182 [label="Enter loop condition"];
+                    183 [label="Const: Boolean(false)"];
+                    184 [label="Exit loop condition"];
+                }
+                185 [label="Exit do-while loop"];
+            }
+            186 [label="Const: Int(1)"];
+            187 [label="Exit block"];
+        }
+        188 [label="Exit function testDoWhileFalse" style="filled" fillcolor=red];
+    }
     174 -> {175};
     175 -> {176};
     176 -> {177};
-    176 -> {169} [color=green style=dotted];
     177 -> {178};
     178 -> {179};
     179 -> {180};
+    180 -> {181};
+    181 -> {182};
+    182 -> {183};
+    183 -> {184};
+    184 -> {185};
+    184 -> {177} [color=green style=dotted];
+    185 -> {186};
+    186 -> {187};
+    187 -> {188};
 
 }

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

@@ -40,78 +40,92 @@ digraph postponedLambdaInConstructor_kt {
         subgraph cluster_5 {
             color=blue
             11 [label="Enter function <init>" style="filled" fillcolor=red];
-            12 [label="Access variable R|<local>/s|"];
-            13 [label="Postponed enter to lambda"];
             subgraph cluster_6 {
                 color=blue
-                14 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                12 [label="Function call arguments enter"];
+                13 [label="Access variable R|<local>/s|"];
+                14 [label="Postponed enter to lambda"];
                 subgraph cluster_7 {
                     color=blue
-                    15 [label="Enter block"];
-                    16 [label="Exit anonymous function expression"];
+                    15 [label="Enter function <anonymous>" style="filled" fillcolor=red];
                     subgraph cluster_8 {
                         color=blue
-                        17 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                        16 [label="Enter block"];
+                        17 [label="Exit anonymous function expression"];
                         subgraph cluster_9 {
                             color=blue
-                            18 [label="Enter block"];
-                            19 [label="Access variable R|<local>/it|"];
-                            20 [label="Exit block"];
+                            18 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                            subgraph cluster_10 {
+                                color=blue
+                                19 [label="Enter block"];
+                                20 [label="Access variable R|<local>/it|"];
+                                21 [label="Exit block"];
+                            }
+                            22 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                         }
-                        21 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                        23 [label="Exit block"];
                     }
-                    22 [label="Exit block"];
+                    24 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                 }
-                23 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                25 [label="Function call arguments exit"];
             }
-            24 [label="Postponed exit from lambda"];
-            25 [label="Function call: R|<local>/s|.R|kotlin/let|<R|kotlin/String|, R|() -> kotlin/String|>(...)" style="filled" fillcolor=yellow];
-            26 [label="Delegated constructor call: super<R|A|>(...)" style="filled" fillcolor=yellow];
-            27 [label="Exit function <init>" style="filled" fillcolor=red];
+            26 [label="Postponed exit from lambda"];
+            27 [label="Function call: R|<local>/s|.R|kotlin/let|<R|kotlin/String|, R|() -> kotlin/String|>(...)" style="filled" fillcolor=yellow];
+            28 [label="Delegated constructor call: super<R|A|>(...)" style="filled" fillcolor=yellow];
+            29 [label="Exit function <init>" style="filled" fillcolor=red];
         }
-        28 [label="Exit class B" style="filled" fillcolor=red];
+        30 [label="Exit class B" style="filled" fillcolor=red];
     }
     7 -> {8} [color=green];
-    7 -> {28} [style=dotted];
+    7 -> {30} [style=dotted];
     7 -> {8 11} [style=dashed];
     8 -> {9};
     9 -> {10};
     10 -> {11} [color=green];
     11 -> {12};
     12 -> {13};
-    13 -> {14 25};
-    13 -> {24} [style=dotted];
-    13 -> {14} [style=dashed];
-    14 -> {15};
+    13 -> {14};
+    14 -> {15 25};
+    14 -> {26} [style=dotted];
+    14 -> {15} [style=dashed];
     15 -> {16};
-    16 -> {17 22};
-    16 -> {17} [style=dashed];
-    17 -> {18};
+    16 -> {17};
+    17 -> {18 23};
+    17 -> {18} [style=dashed];
     18 -> {19};
     19 -> {20};
     20 -> {21};
-    22 -> {23};
+    21 -> {22};
     23 -> {24};
-    24 -> {25} [color=green];
-    24 -> {26} [color=red];
-    25 -> {26};
-    26 -> {27};
-    27 -> {28} [color=green];
+    24 -> {26};
+    25 -> {27};
+    26 -> {27} [color=green];
+    26 -> {28} [color=red];
+    27 -> {28};
+    28 -> {29};
+    29 -> {30} [color=green];
 
-    subgraph cluster_10 {
+    subgraph cluster_11 {
         color=red
-        29 [label="Enter function foo" style="filled" fillcolor=red];
-        subgraph cluster_11 {
+        31 [label="Enter function foo" style="filled" fillcolor=red];
+        subgraph cluster_12 {
             color=blue
-            30 [label="Enter block"];
-            31 [label="Function call: this@R|/B|.R|/B.foo|()" style="filled" fillcolor=yellow];
-            32 [label="Exit block"];
+            32 [label="Enter block"];
+            subgraph cluster_13 {
+                color=blue
+                33 [label="Function call arguments enter"];
+                34 [label="Function call arguments exit"];
+            }
+            35 [label="Function call: this@R|/B|.R|/B.foo|()" style="filled" fillcolor=yellow];
+            36 [label="Exit block"];
         }
-        33 [label="Exit function foo" style="filled" fillcolor=red];
+        37 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    29 -> {30};
-    30 -> {31};
     31 -> {32};
     32 -> {33};
+    33 -> {34};
+    34 -> {35};
+    35 -> {36};
+    36 -> {37};
 
 }

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

@@ -50,15 +50,25 @@ digraph postponedLambdaInReturn_kt {
                 12 [label="Enter block"];
                 13 [label="Exit block"];
             }
-            14 [label="Function call: R|/Lateinit.Lateinit|<R|R|>()" style="filled" fillcolor=yellow];
-            15 [label="Access variable R|<local>/builder|"];
-            16 [label="Function call: R|/Lateinit.Lateinit|<R|R|>().R|kotlin/apply|<R|Lateinit<R>|>(...)" style="filled" fillcolor=yellow];
-            17 [label="Access variable R|SubstitutionOverride</Lateinit.value: R|R|>|"];
-            18 [label="Jump: ^build R|/Lateinit.Lateinit|<R|R|>().R|kotlin/apply|<R|Lateinit<R>|>(R|<local>/builder|).R|SubstitutionOverride</Lateinit.value: R|R|>|"];
-            19 [label="Stub" style="filled" fillcolor=gray];
-            20 [label="Exit block" style="filled" fillcolor=gray];
+            subgraph cluster_7 {
+                color=blue
+                14 [label="Function call arguments enter"];
+                subgraph cluster_8 {
+                    color=blue
+                    15 [label="Function call arguments enter"];
+                    16 [label="Function call arguments exit"];
+                }
+                17 [label="Function call: R|/Lateinit.Lateinit|<R|R|>()" style="filled" fillcolor=yellow];
+                18 [label="Access variable R|<local>/builder|"];
+                19 [label="Function call arguments exit"];
+            }
+            20 [label="Function call: R|/Lateinit.Lateinit|<R|R|>().R|kotlin/apply|<R|Lateinit<R>|>(...)" style="filled" fillcolor=yellow];
+            21 [label="Access variable R|SubstitutionOverride</Lateinit.value: R|R|>|"];
+            22 [label="Jump: ^build R|/Lateinit.Lateinit|<R|R|>().R|kotlin/apply|<R|Lateinit<R>|>(R|<local>/builder|).R|SubstitutionOverride</Lateinit.value: R|R|>|"];
+            23 [label="Stub" style="filled" fillcolor=gray];
+            24 [label="Exit block" style="filled" fillcolor=gray];
         }
-        21 [label="Exit function build" style="filled" fillcolor=red];
+        25 [label="Exit function build" style="filled" fillcolor=red];
     }
     10 -> {11};
     11 -> {12};
@@ -68,439 +78,499 @@ digraph postponedLambdaInReturn_kt {
     15 -> {16};
     16 -> {17};
     17 -> {18};
-    18 -> {21};
-    18 -> {19} [style=dotted];
-    19 -> {20} [style=dotted];
-    20 -> {21} [style=dotted];
+    18 -> {19};
+    19 -> {20};
+    20 -> {21};
+    21 -> {22};
+    22 -> {25};
+    22 -> {23} [style=dotted];
+    23 -> {24} [style=dotted];
+    24 -> {25} [style=dotted];
 
-    subgraph cluster_7 {
+    subgraph cluster_9 {
         color=red
-        22 [label="Enter function test1" style="filled" fillcolor=red];
-        subgraph cluster_8 {
+        26 [label="Enter function test1" style="filled" fillcolor=red];
+        subgraph cluster_10 {
             color=blue
-            23 [label="Enter block"];
-            24 [label="Const: Null(null)"];
-            25 [label="Variable declaration: lvar y: R|kotlin/String?|"];
-            26 [label="Postponed enter to lambda"];
-            subgraph cluster_9 {
+            27 [label="Enter block"];
+            28 [label="Const: Null(null)"];
+            29 [label="Variable declaration: lvar y: R|kotlin/String?|"];
+            subgraph cluster_11 {
                 color=blue
-                27 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_10 {
+                30 [label="Function call arguments enter"];
+                31 [label="Postponed enter to lambda"];
+                subgraph cluster_12 {
                     color=blue
-                    28 [label="Enter block"];
-                    subgraph cluster_11 {
+                    32 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_13 {
                         color=blue
-                        29 [label="Enter when"];
-                        subgraph cluster_12 {
-                            color=blue
-                            30 [label="Enter when branch condition "];
-                            31 [label="Access variable R|/p|"];
-                            32 [label="Exit when branch condition"];
-                        }
-                        subgraph cluster_13 {
-                            color=blue
-                            33 [label="Enter when branch condition else"];
-                            34 [label="Exit when branch condition"];
-                        }
-                        35 [label="Enter when branch result"];
+                        33 [label="Enter block"];
                         subgraph cluster_14 {
                             color=blue
-                            36 [label="Enter block"];
-                            37 [label="Const: String()"];
-                            38 [label="Jump: ^@run String()"];
-                            39 [label="Stub" style="filled" fillcolor=gray];
-                            40 [label="Exit block" style="filled" fillcolor=gray];
-                        }
-                        41 [label="Exit when branch result" style="filled" fillcolor=gray];
-                        42 [label="Enter when branch result"];
-                        subgraph cluster_15 {
-                            color=blue
-                            43 [label="Enter block"];
-                            44 [label="Postponed enter to lambda"];
+                            34 [label="Enter when"];
+                            subgraph cluster_15 {
+                                color=blue
+                                35 [label="Enter when branch condition "];
+                                36 [label="Access variable R|/p|"];
+                                37 [label="Exit when branch condition"];
+                            }
                             subgraph cluster_16 {
                                 color=blue
-                                45 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                                subgraph cluster_17 {
-                                    color=blue
-                                    46 [label="Enter block"];
-                                    47 [label="Access variable R|<local>/y|"];
-                                    48 [label="Type operator: (R|<local>/y| as R|kotlin/String|)"];
-                                    49 [label="Const: String(...)"];
-                                    50 [label="Assignment: R|SubstitutionOverride</Lateinit.value: R|kotlin/String|>|"];
-                                    51 [label="Exit block"];
-                                }
-                                52 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                                38 [label="Enter when branch condition else"];
+                                39 [label="Exit when branch condition"];
                             }
-                            53 [label="Postponed exit from lambda"];
-                            54 [label="Function call: R|/build|<R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
-                            55 [label="Jump: ^@run R|/build|<R|kotlin/String|>(<L> = build@fun R|Lateinit<kotlin/String>|.<anonymous>(): R|kotlin/Unit| <inline=CrossInline, kind=EXACTLY_ONCE>  {
+                            40 [label="Enter when branch result"];
+                            subgraph cluster_17 {
+                                color=blue
+                                41 [label="Enter block"];
+                                42 [label="Const: String()"];
+                                43 [label="Jump: ^@run String()"];
+                                44 [label="Stub" style="filled" fillcolor=gray];
+                                45 [label="Exit block" style="filled" fillcolor=gray];
+                            }
+                            46 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            47 [label="Enter when branch result"];
+                            subgraph cluster_18 {
+                                color=blue
+                                48 [label="Enter block"];
+                                subgraph cluster_19 {
+                                    color=blue
+                                    49 [label="Function call arguments enter"];
+                                    50 [label="Postponed enter to lambda"];
+                                    subgraph cluster_20 {
+                                        color=blue
+                                        51 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                                        subgraph cluster_21 {
+                                            color=blue
+                                            52 [label="Enter block"];
+                                            53 [label="Access variable R|<local>/y|"];
+                                            54 [label="Type operator: (R|<local>/y| as R|kotlin/String|)"];
+                                            55 [label="Const: String(...)"];
+                                            56 [label="Assignment: R|SubstitutionOverride</Lateinit.value: R|kotlin/String|>|"];
+                                            57 [label="Exit block"];
+                                        }
+                                        58 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                                    }
+                                    59 [label="Function call arguments exit"];
+                                }
+                                60 [label="Postponed exit from lambda"];
+                                61 [label="Function call: R|/build|<R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
+                                62 [label="Jump: ^@run R|/build|<R|kotlin/String|>(<L> = build@fun R|Lateinit<kotlin/String>|.<anonymous>(): R|kotlin/Unit| <inline=CrossInline, kind=EXACTLY_ONCE>  {
     (R|<local>/y| as R|kotlin/String|)
     this@R|special/anonymous|.R|SubstitutionOverride</Lateinit.value: R|kotlin/String|>| = String(...)
 }
 )"];
-                            56 [label="Stub" style="filled" fillcolor=gray];
-                            57 [label="Exit block" style="filled" fillcolor=gray];
+                                63 [label="Stub" style="filled" fillcolor=gray];
+                                64 [label="Exit block" style="filled" fillcolor=gray];
+                            }
+                            65 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            66 [label="Exit when" style="filled" fillcolor=gray];
                         }
-                        58 [label="Exit when branch result" style="filled" fillcolor=gray];
-                        59 [label="Exit when" style="filled" fillcolor=gray];
+                        67 [label="Exit block" style="filled" fillcolor=gray];
                     }
-                    60 [label="Exit block" style="filled" fillcolor=gray];
+                    68 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                 }
-                61 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                69 [label="Function call arguments exit"];
             }
-            62 [label="Postponed exit from lambda"];
-            63 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
-            64 [label="Variable declaration: lval x: R|kotlin/String|"];
-            65 [label="Access variable R|<local>/y|"];
-            66 [label="Access variable R|kotlin/String.length<Inapplicable(UNSAFE_CALL): kotlin/String.length>#|"];
-            67 [label="Exit block"];
+            70 [label="Postponed exit from lambda"];
+            71 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
+            72 [label="Variable declaration: lval x: R|kotlin/String|"];
+            73 [label="Access variable R|<local>/y|"];
+            74 [label="Access variable R|kotlin/String.length<Inapplicable(UNSAFE_CALL): kotlin/String.length>#|"];
+            75 [label="Exit block"];
         }
-        68 [label="Exit function test1" style="filled" fillcolor=red];
+        76 [label="Exit function test1" style="filled" fillcolor=red];
     }
-    22 -> {23};
-    23 -> {24};
-    24 -> {25};
-    25 -> {26};
-    26 -> {27 63};
-    26 -> {62} [style=dotted];
-    26 -> {27} [style=dashed];
+    26 -> {27};
     27 -> {28};
     28 -> {29};
     29 -> {30};
     30 -> {31};
-    31 -> {32};
-    32 -> {33 42};
+    31 -> {32 69};
+    31 -> {70} [style=dotted];
+    31 -> {32} [style=dashed];
+    32 -> {33};
     33 -> {34};
     34 -> {35};
     35 -> {36};
     36 -> {37};
-    37 -> {38};
-    38 -> {61};
-    38 -> {39} [style=dotted];
-    39 -> {40} [style=dotted];
-    40 -> {41} [style=dotted];
-    41 -> {59} [style=dotted];
+    37 -> {38 47};
+    38 -> {39};
+    39 -> {40};
+    40 -> {41};
+    41 -> {42};
     42 -> {43};
-    43 -> {44};
-    44 -> {45 54};
-    44 -> {53} [style=dotted];
-    44 -> {45} [style=dashed];
-    45 -> {46};
-    46 -> {47};
+    43 -> {68};
+    43 -> {44} [style=dotted];
+    44 -> {45} [style=dotted];
+    45 -> {46} [style=dotted];
+    46 -> {66} [style=dotted];
     47 -> {48};
     48 -> {49};
     49 -> {50};
-    50 -> {51};
+    50 -> {51 59};
+    50 -> {60} [style=dotted];
+    50 -> {51} [style=dashed];
     51 -> {52};
     52 -> {53};
-    53 -> {54} [color=green];
+    53 -> {54};
     54 -> {55};
-    55 -> {61};
-    55 -> {56} [style=dotted];
-    56 -> {57} [style=dotted];
-    57 -> {58} [style=dotted];
-    58 -> {59} [style=dotted];
-    59 -> {60} [style=dotted];
-    60 -> {61} [style=dotted];
+    55 -> {56};
+    56 -> {57};
+    57 -> {58};
+    58 -> {60};
+    59 -> {61};
+    60 -> {61} [color=green];
     61 -> {62};
-    62 -> {63};
-    63 -> {64};
-    64 -> {65};
-    65 -> {66};
-    66 -> {67};
-    67 -> {68};
-
-    subgraph cluster_18 {
-        color=red
-        69 [label="Enter function test2" style="filled" fillcolor=red];
-        subgraph cluster_19 {
-            color=blue
-            70 [label="Enter block"];
-            71 [label="Postponed enter to lambda"];
-            subgraph cluster_20 {
-                color=blue
-                72 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_21 {
-                    color=blue
-                    73 [label="Enter block"];
-                    subgraph cluster_22 {
-                        color=blue
-                        74 [label="Enter while loop"];
-                        subgraph cluster_23 {
-                            color=blue
-                            75 [label="Enter loop condition"];
-                            76 [label="Const: Boolean(true)"];
-                            77 [label="Exit loop condition"];
-                        }
-                        subgraph cluster_24 {
-                            color=blue
-                            78 [label="Enter loop block"];
-                            subgraph cluster_25 {
-                                color=blue
-                                79 [label="Enter block"];
-                                subgraph cluster_26 {
-                                    color=blue
-                                    80 [label="Try expression enter"];
-                                    subgraph cluster_27 {
-                                        color=blue
-                                        81 [label="Try main block enter"];
-                                        subgraph cluster_28 {
-                                            color=blue
-                                            82 [label="Enter block"];
-                                            83 [label="Postponed enter to lambda"];
-                                            subgraph cluster_29 {
-                                                color=blue
-                                                84 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                                                subgraph cluster_30 {
-                                                    color=blue
-                                                    85 [label="Enter block"];
-                                                    86 [label="Const: String(...)"];
-                                                    87 [label="Assignment: R|SubstitutionOverride</Lateinit.value: R|kotlin/String|>|"];
-                                                    88 [label="Exit block"];
-                                                }
-                                                89 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-                                            }
-                                            90 [label="Postponed exit from lambda"];
-                                            91 [label="Function call: R|/build|<R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
-                                            92 [label="Jump: ^@run R|/build|<R|kotlin/String|>(<L> = build@fun R|Lateinit<kotlin/String>|.<anonymous>(): R|kotlin/Unit| <inline=CrossInline, kind=EXACTLY_ONCE>  {
-    this@R|special/anonymous|.R|SubstitutionOverride</Lateinit.value: R|kotlin/String|>| = String(...)
-}
-)"];
-                                            93 [label="Stub" style="filled" fillcolor=gray];
-                                            94 [label="Exit block" style="filled" fillcolor=gray];
-                                        }
-                                        95 [label="Try main block exit" style="filled" fillcolor=gray];
-                                    }
-                                    subgraph cluster_31 {
-                                        color=blue
-                                        96 [label="Catch enter"];
-                                        97 [label="Variable declaration: e: R|kotlin/Throwable|"];
-                                        subgraph cluster_32 {
-                                            color=blue
-                                            98 [label="Enter block"];
-                                            99 [label="Exit block"];
-                                        }
-                                        100 [label="Catch exit"];
-                                    }
-                                    101 [label="Try expression exit"];
-                                }
-                                102 [label="Exit block"];
-                            }
-                            103 [label="Exit loop block"];
-                        }
-                        104 [label="Exit while loop" style="filled" fillcolor=gray];
-                    }
-                    105 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=gray];
-                    106 [label="Throw: throw R|java/lang/Exception.Exception|()" style="filled" fillcolor=gray];
-                    107 [label="Stub" style="filled" fillcolor=gray];
-                    108 [label="Exit block" style="filled" fillcolor=gray];
-                }
-                109 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            110 [label="Postponed exit from lambda"];
-            111 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
-            112 [label="Variable declaration: lval x: R|kotlin/String|"];
-            113 [label="Access variable R|<local>/x|"];
-            114 [label="Access variable R|kotlin/String.length|"];
-            115 [label="Exit block"];
-        }
-        116 [label="Exit function test2" style="filled" fillcolor=red];
-    }
-    69 -> {70};
+    62 -> {68};
+    62 -> {63} [style=dotted];
+    63 -> {64} [style=dotted];
+    64 -> {65} [style=dotted];
+    65 -> {66} [style=dotted];
+    66 -> {67} [style=dotted];
+    67 -> {68} [style=dotted];
+    68 -> {70};
+    69 -> {71};
     70 -> {71};
-    71 -> {72 111};
-    71 -> {110} [style=dotted];
-    71 -> {72} [style=dashed];
+    71 -> {72};
     72 -> {73};
     73 -> {74};
     74 -> {75};
     75 -> {76};
-    76 -> {77};
+
+    subgraph cluster_22 {
+        color=red
+        77 [label="Enter function test2" style="filled" fillcolor=red];
+        subgraph cluster_23 {
+            color=blue
+            78 [label="Enter block"];
+            subgraph cluster_24 {
+                color=blue
+                79 [label="Function call arguments enter"];
+                80 [label="Postponed enter to lambda"];
+                subgraph cluster_25 {
+                    color=blue
+                    81 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_26 {
+                        color=blue
+                        82 [label="Enter block"];
+                        subgraph cluster_27 {
+                            color=blue
+                            83 [label="Enter while loop"];
+                            subgraph cluster_28 {
+                                color=blue
+                                84 [label="Enter loop condition"];
+                                85 [label="Const: Boolean(true)"];
+                                86 [label="Exit loop condition"];
+                            }
+                            subgraph cluster_29 {
+                                color=blue
+                                87 [label="Enter loop block"];
+                                subgraph cluster_30 {
+                                    color=blue
+                                    88 [label="Enter block"];
+                                    subgraph cluster_31 {
+                                        color=blue
+                                        89 [label="Try expression enter"];
+                                        subgraph cluster_32 {
+                                            color=blue
+                                            90 [label="Try main block enter"];
+                                            subgraph cluster_33 {
+                                                color=blue
+                                                91 [label="Enter block"];
+                                                subgraph cluster_34 {
+                                                    color=blue
+                                                    92 [label="Function call arguments enter"];
+                                                    93 [label="Postponed enter to lambda"];
+                                                    subgraph cluster_35 {
+                                                        color=blue
+                                                        94 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                                                        subgraph cluster_36 {
+                                                            color=blue
+                                                            95 [label="Enter block"];
+                                                            96 [label="Const: String(...)"];
+                                                            97 [label="Assignment: R|SubstitutionOverride</Lateinit.value: R|kotlin/String|>|"];
+                                                            98 [label="Exit block"];
+                                                        }
+                                                        99 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                                                    }
+                                                    100 [label="Function call arguments exit"];
+                                                }
+                                                101 [label="Postponed exit from lambda"];
+                                                102 [label="Function call: R|/build|<R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
+                                                103 [label="Jump: ^@run R|/build|<R|kotlin/String|>(<L> = build@fun R|Lateinit<kotlin/String>|.<anonymous>(): R|kotlin/Unit| <inline=CrossInline, kind=EXACTLY_ONCE>  {
+    this@R|special/anonymous|.R|SubstitutionOverride</Lateinit.value: R|kotlin/String|>| = String(...)
+}
+)"];
+                                                104 [label="Stub" style="filled" fillcolor=gray];
+                                                105 [label="Exit block" style="filled" fillcolor=gray];
+                                            }
+                                            106 [label="Try main block exit" style="filled" fillcolor=gray];
+                                        }
+                                        subgraph cluster_37 {
+                                            color=blue
+                                            107 [label="Catch enter"];
+                                            108 [label="Variable declaration: e: R|kotlin/Throwable|"];
+                                            subgraph cluster_38 {
+                                                color=blue
+                                                109 [label="Enter block"];
+                                                110 [label="Exit block"];
+                                            }
+                                            111 [label="Catch exit"];
+                                        }
+                                        112 [label="Try expression exit"];
+                                    }
+                                    113 [label="Exit block"];
+                                }
+                                114 [label="Exit loop block"];
+                            }
+                            115 [label="Exit while loop" style="filled" fillcolor=gray];
+                        }
+                        subgraph cluster_39 {
+                            color=blue
+                            116 [label="Function call arguments enter" style="filled" fillcolor=gray];
+                            117 [label="Function call arguments exit" style="filled" fillcolor=gray];
+                        }
+                        118 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=gray];
+                        119 [label="Throw: throw R|java/lang/Exception.Exception|()" style="filled" fillcolor=gray];
+                        120 [label="Stub" style="filled" fillcolor=gray];
+                        121 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    122 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                123 [label="Function call arguments exit"];
+            }
+            124 [label="Postponed exit from lambda"];
+            125 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
+            126 [label="Variable declaration: lval x: R|kotlin/String|"];
+            127 [label="Access variable R|<local>/x|"];
+            128 [label="Access variable R|kotlin/String.length|"];
+            129 [label="Exit block"];
+        }
+        130 [label="Exit function test2" style="filled" fillcolor=red];
+    }
     77 -> {78};
-    77 -> {104} [style=dotted];
     78 -> {79};
     79 -> {80};
-    80 -> {81 96};
+    80 -> {81 123};
+    80 -> {124} [style=dotted];
+    80 -> {81} [style=dashed];
     81 -> {82};
     82 -> {83};
-    83 -> {84 91};
-    83 -> {90} [style=dotted];
-    83 -> {84} [style=dashed];
+    83 -> {84};
     84 -> {85};
     85 -> {86};
     86 -> {87};
+    86 -> {115} [style=dotted];
     87 -> {88};
     88 -> {89};
-    89 -> {90};
-    90 -> {91} [color=green];
+    89 -> {90 107};
+    90 -> {91};
     91 -> {92};
-    92 -> {109};
-    92 -> {93} [style=dotted];
-    93 -> {94} [style=dotted];
-    94 -> {95} [style=dotted];
-    95 -> {96 101} [style=dotted];
+    92 -> {93};
+    93 -> {94 100};
+    93 -> {101} [style=dotted];
+    93 -> {94} [style=dashed];
+    94 -> {95};
+    95 -> {96};
     96 -> {97};
     97 -> {98};
     98 -> {99};
-    99 -> {100};
-    100 -> {101};
-    101 -> {102};
+    99 -> {101};
+    100 -> {102};
+    101 -> {102} [color=green];
     102 -> {103};
-    103 -> {75} [color=green style=dashed];
+    103 -> {122};
+    103 -> {104} [style=dotted];
     104 -> {105} [style=dotted];
     105 -> {106} [style=dotted];
-    106 -> {107} [style=dotted];
-    107 -> {108} [style=dotted];
-    108 -> {109} [style=dotted];
+    106 -> {107 112} [style=dotted];
+    107 -> {108};
+    108 -> {109};
     109 -> {110};
     110 -> {111};
     111 -> {112};
     112 -> {113};
     113 -> {114};
-    114 -> {115};
-    115 -> {116};
-
-    subgraph cluster_33 {
-        color=red
-        117 [label="Enter function test3" style="filled" fillcolor=red];
-        subgraph cluster_34 {
-            color=blue
-            118 [label="Enter block"];
-            119 [label="Variable declaration: lvar y: R|kotlin/String?|"];
-            120 [label="Const: String()"];
-            121 [label="Assignment: R|<local>/y|"];
-            122 [label="Postponed enter to lambda"];
-            subgraph cluster_35 {
-                color=blue
-                123 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_36 {
-                    color=blue
-                    124 [label="Enter block"];
-                    subgraph cluster_37 {
-                        color=blue
-                        125 [label="Enter when"];
-                        subgraph cluster_38 {
-                            color=blue
-                            126 [label="Enter when branch condition "];
-                            127 [label="Access variable R|/p|"];
-                            128 [label="Function call: R|/p|.R|kotlin/Boolean.not|()" style="filled" fillcolor=yellow];
-                            129 [label="Exit when branch condition"];
-                        }
-                        subgraph cluster_39 {
-                            color=blue
-                            130 [label="Enter when branch condition else"];
-                            131 [label="Exit when branch condition"];
-                        }
-                        132 [label="Enter when branch result"];
-                        subgraph cluster_40 {
-                            color=blue
-                            133 [label="Enter block"];
-                            134 [label="Const: String()"];
-                            135 [label="Jump: ^@run String()"];
-                            136 [label="Stub" style="filled" fillcolor=gray];
-                            137 [label="Exit block" style="filled" fillcolor=gray];
-                        }
-                        138 [label="Exit when branch result" style="filled" fillcolor=gray];
-                        139 [label="Enter when branch result"];
-                        subgraph cluster_41 {
-                            color=blue
-                            140 [label="Enter block"];
-                            141 [label="Postponed enter to lambda"];
-                            subgraph cluster_42 {
-                                color=blue
-                                142 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                                subgraph cluster_43 {
-                                    color=blue
-                                    143 [label="Enter block"];
-                                    144 [label="Const: Null(null)"];
-                                    145 [label="Assignment: R|<local>/y|"];
-                                    146 [label="Const: String(...)"];
-                                    147 [label="Assignment: R|SubstitutionOverride</Lateinit.value: R|kotlin/String|>|"];
-                                    148 [label="Exit block"];
-                                }
-                                149 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-                            }
-                            150 [label="Postponed exit from lambda"];
-                            151 [label="Function call: R|/build|<R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
-                            152 [label="Jump: ^@run R|/build|<R|kotlin/String|>(<L> = build@fun R|Lateinit<kotlin/String>|.<anonymous>(): R|kotlin/Unit| <inline=CrossInline, kind=EXACTLY_ONCE>  {
-    R|<local>/y| = Null(null)
-    this@R|special/anonymous|.R|SubstitutionOverride</Lateinit.value: R|kotlin/String|>| = String(...)
-}
-)"];
-                            153 [label="Stub" style="filled" fillcolor=gray];
-                            154 [label="Exit block" style="filled" fillcolor=gray];
-                        }
-                        155 [label="Exit when branch result" style="filled" fillcolor=gray];
-                        156 [label="Exit when" style="filled" fillcolor=gray];
-                    }
-                    157 [label="Exit block" style="filled" fillcolor=gray];
-                }
-                158 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            159 [label="Postponed exit from lambda"];
-            160 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
-            161 [label="Variable declaration: lval x: R|kotlin/String|"];
-            162 [label="Access variable R|<local>/y|"];
-            163 [label="Smart cast: R|<local>/y|"];
-            164 [label="Access variable R|kotlin/String.length|"];
-            165 [label="Exit block"];
-        }
-        166 [label="Exit function test3" style="filled" fillcolor=red];
-    }
-    117 -> {118};
-    118 -> {119};
-    119 -> {120};
-    120 -> {121};
-    121 -> {122};
-    122 -> {123 160};
-    122 -> {159} [style=dotted];
-    122 -> {123} [style=dashed];
-    123 -> {124};
+    114 -> {84} [color=green style=dashed];
+    115 -> {116} [style=dotted];
+    116 -> {117} [style=dotted];
+    117 -> {118} [style=dotted];
+    118 -> {119} [style=dotted];
+    119 -> {120} [style=dotted];
+    120 -> {121} [style=dotted];
+    121 -> {122} [style=dotted];
+    122 -> {124};
+    123 -> {125};
     124 -> {125};
     125 -> {126};
     126 -> {127};
     127 -> {128};
     128 -> {129};
-    129 -> {130 139};
-    130 -> {131};
+    129 -> {130};
+
+    subgraph cluster_40 {
+        color=red
+        131 [label="Enter function test3" style="filled" fillcolor=red];
+        subgraph cluster_41 {
+            color=blue
+            132 [label="Enter block"];
+            133 [label="Variable declaration: lvar y: R|kotlin/String?|"];
+            134 [label="Const: String()"];
+            135 [label="Assignment: R|<local>/y|"];
+            subgraph cluster_42 {
+                color=blue
+                136 [label="Function call arguments enter"];
+                137 [label="Postponed enter to lambda"];
+                subgraph cluster_43 {
+                    color=blue
+                    138 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_44 {
+                        color=blue
+                        139 [label="Enter block"];
+                        subgraph cluster_45 {
+                            color=blue
+                            140 [label="Enter when"];
+                            subgraph cluster_46 {
+                                color=blue
+                                141 [label="Enter when branch condition "];
+                                subgraph cluster_47 {
+                                    color=blue
+                                    142 [label="Function call arguments enter"];
+                                    143 [label="Access variable R|/p|"];
+                                    144 [label="Function call arguments exit"];
+                                }
+                                145 [label="Function call: R|/p|.R|kotlin/Boolean.not|()" style="filled" fillcolor=yellow];
+                                146 [label="Exit when branch condition"];
+                            }
+                            subgraph cluster_48 {
+                                color=blue
+                                147 [label="Enter when branch condition else"];
+                                148 [label="Exit when branch condition"];
+                            }
+                            149 [label="Enter when branch result"];
+                            subgraph cluster_49 {
+                                color=blue
+                                150 [label="Enter block"];
+                                151 [label="Const: String()"];
+                                152 [label="Jump: ^@run String()"];
+                                153 [label="Stub" style="filled" fillcolor=gray];
+                                154 [label="Exit block" style="filled" fillcolor=gray];
+                            }
+                            155 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            156 [label="Enter when branch result"];
+                            subgraph cluster_50 {
+                                color=blue
+                                157 [label="Enter block"];
+                                subgraph cluster_51 {
+                                    color=blue
+                                    158 [label="Function call arguments enter"];
+                                    159 [label="Postponed enter to lambda"];
+                                    subgraph cluster_52 {
+                                        color=blue
+                                        160 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                                        subgraph cluster_53 {
+                                            color=blue
+                                            161 [label="Enter block"];
+                                            162 [label="Const: Null(null)"];
+                                            163 [label="Assignment: R|<local>/y|"];
+                                            164 [label="Const: String(...)"];
+                                            165 [label="Assignment: R|SubstitutionOverride</Lateinit.value: R|kotlin/String|>|"];
+                                            166 [label="Exit block"];
+                                        }
+                                        167 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                                    }
+                                    168 [label="Function call arguments exit"];
+                                }
+                                169 [label="Postponed exit from lambda"];
+                                170 [label="Function call: R|/build|<R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
+                                171 [label="Jump: ^@run R|/build|<R|kotlin/String|>(<L> = build@fun R|Lateinit<kotlin/String>|.<anonymous>(): R|kotlin/Unit| <inline=CrossInline, kind=EXACTLY_ONCE>  {
+    R|<local>/y| = Null(null)
+    this@R|special/anonymous|.R|SubstitutionOverride</Lateinit.value: R|kotlin/String|>| = String(...)
+}
+)"];
+                                172 [label="Stub" style="filled" fillcolor=gray];
+                                173 [label="Exit block" style="filled" fillcolor=gray];
+                            }
+                            174 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            175 [label="Exit when" style="filled" fillcolor=gray];
+                        }
+                        176 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    177 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                178 [label="Function call arguments exit"];
+            }
+            179 [label="Postponed exit from lambda"];
+            180 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
+            181 [label="Variable declaration: lval x: R|kotlin/String|"];
+            182 [label="Access variable R|<local>/y|"];
+            183 [label="Smart cast: R|<local>/y|"];
+            184 [label="Access variable R|kotlin/String.length|"];
+            185 [label="Exit block"];
+        }
+        186 [label="Exit function test3" style="filled" fillcolor=red];
+    }
     131 -> {132};
     132 -> {133};
     133 -> {134};
     134 -> {135};
-    135 -> {158};
-    135 -> {136} [style=dotted];
-    136 -> {137} [style=dotted];
-    137 -> {138} [style=dotted];
-    138 -> {156} [style=dotted];
+    135 -> {136};
+    136 -> {137};
+    137 -> {138 178};
+    137 -> {179} [style=dotted];
+    137 -> {138} [style=dashed];
+    138 -> {139};
     139 -> {140};
     140 -> {141};
-    141 -> {142 151};
-    141 -> {150} [style=dotted];
-    141 -> {142} [style=dashed];
+    141 -> {142};
     142 -> {143};
     143 -> {144};
     144 -> {145};
     145 -> {146};
-    146 -> {147};
+    146 -> {147 156};
     147 -> {148};
     148 -> {149};
     149 -> {150};
-    150 -> {151} [color=green];
+    150 -> {151};
     151 -> {152};
-    152 -> {158};
+    152 -> {177};
     152 -> {153} [style=dotted];
     153 -> {154} [style=dotted];
     154 -> {155} [style=dotted];
-    155 -> {156} [style=dotted];
-    156 -> {157} [style=dotted];
-    157 -> {158} [style=dotted];
+    155 -> {175} [style=dotted];
+    156 -> {157};
+    157 -> {158};
     158 -> {159};
-    159 -> {160};
+    159 -> {160 168};
+    159 -> {169} [style=dotted];
+    159 -> {160} [style=dashed];
     160 -> {161};
     161 -> {162};
     162 -> {163};
     163 -> {164};
     164 -> {165};
     165 -> {166};
+    166 -> {167};
+    167 -> {169};
+    168 -> {170};
+    169 -> {170} [color=green];
+    170 -> {171};
+    171 -> {177};
+    171 -> {172} [style=dotted];
+    172 -> {173} [style=dotted];
+    173 -> {174} [style=dotted];
+    174 -> {175} [style=dotted];
+    175 -> {176} [style=dotted];
+    176 -> {177} [style=dotted];
+    177 -> {179};
+    178 -> {180};
+    179 -> {180};
+    180 -> {181};
+    181 -> {182};
+    182 -> {183};
+    183 -> {184};
+    184 -> {185};
+    185 -> {186};
 
 }

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

@@ -30,38 +30,45 @@ digraph postponedLambdas_kt {
         subgraph cluster_4 {
             color=blue
             7 [label="Enter block"];
-            8 [label="Access variable R|<local>/a|"];
-            9 [label="Access variable R|<local>/b|"];
-            10 [label="Postponed enter to lambda"];
             subgraph cluster_5 {
                 color=blue
-                11 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                8 [label="Function call arguments enter"];
+                9 [label="Access variable R|<local>/a|"];
+                10 [label="Access variable R|<local>/b|"];
+                11 [label="Postponed enter to lambda"];
                 subgraph cluster_6 {
                     color=blue
-                    12 [label="Enter block"];
-                    13 [label="Const: String()"];
-                    14 [label="Exit block"];
+                    12 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_7 {
+                        color=blue
+                        13 [label="Enter block"];
+                        14 [label="Const: String()"];
+                        15 [label="Exit block"];
+                    }
+                    16 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                 }
-                15 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                17 [label="Function call arguments exit"];
             }
-            16 [label="Postponed exit from lambda"];
-            17 [label="Function call: R|/foo|(...)" style="filled" fillcolor=yellow];
-            18 [label="Exit block"];
+            18 [label="Postponed exit from lambda"];
+            19 [label="Function call: R|/foo|(...)" style="filled" fillcolor=yellow];
+            20 [label="Exit block"];
         }
-        19 [label="Exit function test" style="filled" fillcolor=red];
+        21 [label="Exit function test" style="filled" fillcolor=red];
     }
     6 -> {7};
     7 -> {8};
     8 -> {9};
     9 -> {10};
-    10 -> {11 16 17};
-    10 -> {11} [style=dashed];
-    11 -> {12};
+    10 -> {11};
+    11 -> {12 17 18};
+    11 -> {12} [style=dashed];
     12 -> {13};
     13 -> {14};
     14 -> {15};
-    16 -> {17};
-    17 -> {18};
+    15 -> {16};
+    17 -> {19};
     18 -> {19};
+    19 -> {20};
+    20 -> {21};
 
 }

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

@@ -21,117 +21,142 @@ digraph propertiesAndInitBlocks_kt {
         subgraph cluster_3 {
             color=blue
             7 [label="Enter property" style="filled" fillcolor=red];
-            8 [label="Postponed enter to lambda"];
             subgraph cluster_4 {
                 color=blue
-                9 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                8 [label="Function call arguments enter"];
+                9 [label="Postponed enter to lambda"];
                 subgraph cluster_5 {
                     color=blue
-                    10 [label="Enter block"];
-                    11 [label="Local function declaration"];
-                    12 [label="Local class declaration"];
-                    13 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
-                    14 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                    15 [label="Stub" style="filled" fillcolor=gray];
-                    16 [label="Exit block" style="filled" fillcolor=gray];
-                }
-                17 [label="Exit function <anonymous>" style="filled" fillcolor=gray];
-            }
-            subgraph cluster_6 {
-                color=blue
-                18 [label="Enter class InitializerLocalClass" style="filled" fillcolor=red];
-                subgraph cluster_7 {
-                    color=blue
-                    19 [label="Enter init block" style="filled" fillcolor=red];
-                    subgraph cluster_8 {
+                    10 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_6 {
                         color=blue
-                        20 [label="Enter block"];
-                        21 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
-                        22 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                        23 [label="Stub" style="filled" fillcolor=gray];
-                        24 [label="Const: Int(1)" style="filled" fillcolor=gray];
-                        25 [label="Exit block" style="filled" fillcolor=gray];
+                        11 [label="Enter block"];
+                        12 [label="Local function declaration"];
+                        13 [label="Local class declaration"];
+                        subgraph cluster_7 {
+                            color=blue
+                            14 [label="Function call arguments enter"];
+                            15 [label="Function call arguments exit"];
+                        }
+                        16 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
+                        17 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                        18 [label="Stub" style="filled" fillcolor=gray];
+                        19 [label="Exit block" style="filled" fillcolor=gray];
                     }
-                    26 [label="Exit init block" style="filled" fillcolor=gray];
+                    20 [label="Exit function <anonymous>" style="filled" fillcolor=gray];
                 }
-                subgraph cluster_9 {
+                subgraph cluster_8 {
                     color=blue
-                    27 [label="Enter function <init>" style="filled" fillcolor=gray];
-                    28 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=gray];
-                    29 [label="Exit function <init>" style="filled" fillcolor=gray];
+                    21 [label="Enter class InitializerLocalClass" style="filled" fillcolor=red];
+                    subgraph cluster_9 {
+                        color=blue
+                        22 [label="Enter init block" style="filled" fillcolor=red];
+                        subgraph cluster_10 {
+                            color=blue
+                            23 [label="Enter block"];
+                            subgraph cluster_11 {
+                                color=blue
+                                24 [label="Function call arguments enter"];
+                                25 [label="Function call arguments exit"];
+                            }
+                            26 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
+                            27 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                            28 [label="Stub" style="filled" fillcolor=gray];
+                            29 [label="Const: Int(1)" style="filled" fillcolor=gray];
+                            30 [label="Exit block" style="filled" fillcolor=gray];
+                        }
+                        31 [label="Exit init block" style="filled" fillcolor=gray];
+                    }
+                    subgraph cluster_12 {
+                        color=blue
+                        32 [label="Enter function <init>" style="filled" fillcolor=gray];
+                        33 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=gray];
+                        34 [label="Exit function <init>" style="filled" fillcolor=gray];
+                    }
+                    35 [label="Exit class InitializerLocalClass" style="filled" fillcolor=gray];
                 }
-                30 [label="Exit class InitializerLocalClass" style="filled" fillcolor=gray];
-            }
-            subgraph cluster_10 {
-                color=blue
-                31 [label="Enter function foo" style="filled" fillcolor=red];
-                subgraph cluster_11 {
+                subgraph cluster_13 {
                     color=blue
-                    32 [label="Enter block"];
-                    33 [label="Const: Int(1)"];
-                    34 [label="Const: Int(1)"];
-                    35 [label="Function call: Int(1).R|kotlin/Int.plus|(...)" style="filled" fillcolor=yellow];
-                    36 [label="Variable declaration: lval c: R|kotlin/Int|"];
-                    37 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
-                    38 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                    39 [label="Stub" style="filled" fillcolor=gray];
-                    40 [label="Exit block" style="filled" fillcolor=gray];
+                    36 [label="Enter function foo" style="filled" fillcolor=red];
+                    subgraph cluster_14 {
+                        color=blue
+                        37 [label="Enter block"];
+                        subgraph cluster_15 {
+                            color=blue
+                            38 [label="Function call arguments enter"];
+                            39 [label="Const: Int(1)"];
+                            40 [label="Const: Int(1)"];
+                            41 [label="Function call arguments exit"];
+                        }
+                        42 [label="Function call: Int(1).R|kotlin/Int.plus|(...)" style="filled" fillcolor=yellow];
+                        43 [label="Variable declaration: lval c: R|kotlin/Int|"];
+                        subgraph cluster_16 {
+                            color=blue
+                            44 [label="Function call arguments enter"];
+                            45 [label="Function call arguments exit"];
+                        }
+                        46 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
+                        47 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                        48 [label="Stub" style="filled" fillcolor=gray];
+                        49 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    50 [label="Exit function foo" style="filled" fillcolor=gray];
                 }
-                41 [label="Exit function foo" style="filled" fillcolor=gray];
+                51 [label="Function call arguments exit"];
             }
-            42 [label="Postponed exit from lambda"];
-            43 [label="Function call: R|/run|(...)" style="filled" fillcolor=yellow];
-            44 [label="Exit property" style="filled" fillcolor=red];
+            52 [label="Postponed exit from lambda"];
+            53 [label="Function call: R|/run|(...)" style="filled" fillcolor=yellow];
+            54 [label="Exit property" style="filled" fillcolor=red];
         }
-        subgraph cluster_12 {
+        subgraph cluster_17 {
             color=blue
-            45 [label="Enter property" style="filled" fillcolor=red];
-            subgraph cluster_13 {
+            55 [label="Enter property" style="filled" fillcolor=red];
+            subgraph cluster_18 {
                 color=blue
-                46 [label="Try expression enter"];
-                subgraph cluster_14 {
+                56 [label="Try expression enter"];
+                subgraph cluster_19 {
                     color=blue
-                    47 [label="Try main block enter"];
-                    subgraph cluster_15 {
+                    57 [label="Try main block enter"];
+                    subgraph cluster_20 {
                         color=blue
-                        48 [label="Enter block"];
-                        49 [label="Const: Int(1)"];
-                        50 [label="Exit block"];
+                        58 [label="Enter block"];
+                        59 [label="Const: Int(1)"];
+                        60 [label="Exit block"];
                     }
-                    51 [label="Try main block exit"];
+                    61 [label="Try main block exit"];
                 }
-                subgraph cluster_16 {
+                subgraph cluster_21 {
                     color=blue
-                    52 [label="Catch enter"];
-                    53 [label="Variable declaration: e: R|kotlin/Exception|"];
-                    subgraph cluster_17 {
+                    62 [label="Catch enter"];
+                    63 [label="Variable declaration: e: R|kotlin/Exception|"];
+                    subgraph cluster_22 {
                         color=blue
-                        54 [label="Enter block"];
-                        55 [label="Const: Int(2)"];
-                        56 [label="Exit block"];
+                        64 [label="Enter block"];
+                        65 [label="Const: Int(2)"];
+                        66 [label="Exit block"];
                     }
-                    57 [label="Catch exit"];
+                    67 [label="Catch exit"];
                 }
-                subgraph cluster_18 {
+                subgraph cluster_23 {
                     color=blue
-                    58 [label="Enter finally"];
-                    subgraph cluster_19 {
+                    68 [label="Enter finally"];
+                    subgraph cluster_24 {
                         color=blue
-                        59 [label="Enter block"];
-                        60 [label="Const: Int(0)"];
-                        61 [label="Exit block"];
+                        69 [label="Enter block"];
+                        70 [label="Const: Int(0)"];
+                        71 [label="Exit block"];
                     }
-                    62 [label="Exit finally"];
+                    72 [label="Exit finally"];
                 }
-                63 [label="Try expression exit"];
+                73 [label="Try expression exit"];
             }
-            64 [label="Exit property" style="filled" fillcolor=red];
+            74 [label="Exit property" style="filled" fillcolor=red];
         }
-        65 [label="Exit file propertiesAndInitBlocks.kt" style="filled" fillcolor=red];
+        75 [label="Exit file propertiesAndInitBlocks.kt" style="filled" fillcolor=red];
     }
     0 -> {1} [color=green];
-    0 -> {65} [style=dotted];
-    0 -> {1 4 7 45} [style=dashed];
+    0 -> {75} [style=dotted];
+    0 -> {1 4 7 55} [style=dashed];
     1 -> {2};
     2 -> {3};
     3 -> {4} [color=green];
@@ -139,179 +164,203 @@ digraph propertiesAndInitBlocks_kt {
     5 -> {6};
     6 -> {7} [color=green];
     7 -> {8};
-    8 -> {9 42 43};
-    8 -> {9} [style=dashed];
-    9 -> {10};
+    8 -> {9};
+    9 -> {10 51 52};
+    9 -> {10} [style=dashed];
     10 -> {11};
-    11 -> {12 31};
-    11 -> {31} [style=dashed];
-    12 -> {13 18};
-    12 -> {18} [style=dashed];
-    13 -> {14};
-    14 -> {15} [style=dotted];
-    15 -> {16} [style=dotted];
-    16 -> {17} [style=dotted];
-    17 -> {42} [style=dotted];
-    18 -> {19};
-    18 -> {27} [color=red];
-    18 -> {30} [style=dotted];
-    18 -> {19 27} [style=dashed];
-    19 -> {20};
-    20 -> {21};
+    11 -> {12};
+    12 -> {13 36};
+    12 -> {36} [style=dashed];
+    13 -> {14 21};
+    13 -> {21} [style=dashed];
+    14 -> {15};
+    15 -> {16};
+    16 -> {17};
+    17 -> {18} [style=dotted];
+    18 -> {19} [style=dotted];
+    19 -> {20} [style=dotted];
+    20 -> {52} [style=dotted];
     21 -> {22};
-    22 -> {23} [style=dotted];
-    23 -> {24} [style=dotted];
-    24 -> {25} [style=dotted];
-    25 -> {26} [style=dotted];
-    26 -> {27} [style=dotted];
+    21 -> {32} [color=red];
+    21 -> {35} [style=dotted];
+    21 -> {22 32} [style=dashed];
+    22 -> {23};
+    23 -> {24};
+    24 -> {25};
+    25 -> {26};
+    26 -> {27};
     27 -> {28} [style=dotted];
     28 -> {29} [style=dotted];
     29 -> {30} [style=dotted];
-    31 -> {32};
-    32 -> {33};
-    33 -> {34};
-    34 -> {35};
-    35 -> {36};
+    30 -> {31} [style=dotted];
+    31 -> {32} [style=dotted];
+    32 -> {33} [style=dotted];
+    33 -> {34} [style=dotted];
+    34 -> {35} [style=dotted];
     36 -> {37};
     37 -> {38};
-    38 -> {39} [style=dotted];
-    39 -> {40} [style=dotted];
-    40 -> {41} [style=dotted];
+    38 -> {39};
+    39 -> {40};
+    40 -> {41};
+    41 -> {42};
     42 -> {43};
-    42 -> {8} [color=green style=dashed];
     43 -> {44};
-    44 -> {45} [color=green];
+    44 -> {45};
     45 -> {46};
-    46 -> {47 52};
-    46 -> {58} [label="onUncaughtException"];
-    47 -> {48};
-    48 -> {49};
-    49 -> {50};
-    50 -> {51};
-    51 -> {52 58};
+    46 -> {47};
+    47 -> {48} [style=dotted];
+    48 -> {49} [style=dotted];
+    49 -> {50} [style=dotted];
+    51 -> {53};
     52 -> {53};
-    52 -> {58} [label="onUncaughtException"];
+    52 -> {9} [color=green style=dashed];
     53 -> {54};
-    54 -> {55};
+    54 -> {55} [color=green];
     55 -> {56};
-    56 -> {57};
+    56 -> {57 62};
+    56 -> {68} [label="onUncaughtException"];
     57 -> {58};
     58 -> {59};
     59 -> {60};
     60 -> {61};
-    61 -> {62};
+    61 -> {62 68};
     62 -> {63};
+    62 -> {68} [label="onUncaughtException"];
     63 -> {64};
-    64 -> {65} [color=green];
-
-    subgraph cluster_20 {
-        color=red
-        66 [label="Enter function run" style="filled" fillcolor=red];
-        subgraph cluster_21 {
-            color=blue
-            67 [label="Enter block"];
-            68 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            69 [label="Exit block"];
-        }
-        70 [label="Exit function run" style="filled" fillcolor=red];
-    }
+    64 -> {65};
+    65 -> {66};
     66 -> {67};
     67 -> {68};
     68 -> {69};
     69 -> {70};
-
-    subgraph cluster_22 {
-        color=red
-        71 [label="Enter function <getter>" style="filled" fillcolor=red];
-        subgraph cluster_23 {
-            color=blue
-            72 [label="Enter block"];
-            73 [label="Const: Int(1)"];
-            74 [label="Jump: ^ Int(1)"];
-            75 [label="Stub" style="filled" fillcolor=gray];
-            76 [label="Exit block" style="filled" fillcolor=gray];
-        }
-        77 [label="Exit function <getter>" style="filled" fillcolor=red];
-    }
+    70 -> {71};
     71 -> {72};
     72 -> {73};
     73 -> {74};
-    74 -> {77};
-    74 -> {75} [style=dotted];
-    75 -> {76} [style=dotted];
-    76 -> {77} [style=dotted];
+    74 -> {75} [color=green];
 
-    subgraph cluster_24 {
+    subgraph cluster_25 {
         color=red
-        78 [label="Enter function <setter>" style="filled" fillcolor=red];
-        subgraph cluster_25 {
+        76 [label="Enter function run" style="filled" fillcolor=red];
+        subgraph cluster_26 {
             color=blue
-            79 [label="Enter block"];
-            80 [label="Const: Int(1)"];
-            81 [label="Assignment: F|/x2|"];
-            82 [label="Exit block"];
+            77 [label="Enter block"];
+            subgraph cluster_27 {
+                color=blue
+                78 [label="Function call arguments enter"];
+                79 [label="Function call arguments exit"];
+            }
+            80 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            81 [label="Exit block"];
         }
-        83 [label="Exit function <setter>" style="filled" fillcolor=red];
+        82 [label="Exit function run" style="filled" fillcolor=red];
     }
+    76 -> {77};
+    77 -> {78};
     78 -> {79};
     79 -> {80};
     80 -> {81};
     81 -> {82};
-    82 -> {83};
 
-    subgraph cluster_26 {
-        color=red
-        84 [label="Enter function <getter>" style="filled" fillcolor=red];
-        subgraph cluster_27 {
-            color=blue
-            85 [label="Enter block"];
-            86 [label="Local class declaration"];
-            87 [label="Exit block"];
-        }
-        88 [label="Exit function <getter>" style="filled" fillcolor=red];
-    }
     subgraph cluster_28 {
-        color=blue
-        89 [label="Enter class GetterLocalClass" style="filled" fillcolor=red];
+        color=red
+        83 [label="Enter function <getter>" style="filled" fillcolor=red];
         subgraph cluster_29 {
             color=blue
-            90 [label="Enter init block" style="filled" fillcolor=red];
-            subgraph cluster_30 {
-                color=blue
-                91 [label="Enter block"];
-                92 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
-                93 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                94 [label="Stub" style="filled" fillcolor=gray];
-                95 [label="Exit block" style="filled" fillcolor=gray];
-            }
-            96 [label="Exit init block" style="filled" fillcolor=gray];
+            84 [label="Enter block"];
+            85 [label="Const: Int(1)"];
+            86 [label="Jump: ^ Int(1)"];
+            87 [label="Stub" style="filled" fillcolor=gray];
+            88 [label="Exit block" style="filled" fillcolor=gray];
         }
-        subgraph cluster_31 {
-            color=blue
-            97 [label="Enter function <init>" style="filled" fillcolor=gray];
-            98 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=gray];
-            99 [label="Exit function <init>" style="filled" fillcolor=gray];
-        }
-        100 [label="Exit class GetterLocalClass" style="filled" fillcolor=gray];
+        89 [label="Exit function <getter>" style="filled" fillcolor=red];
     }
+    83 -> {84};
     84 -> {85};
     85 -> {86};
-    86 -> {87 89};
-    86 -> {89} [style=dashed];
-    87 -> {88};
-    89 -> {90};
-    89 -> {97} [color=red];
-    89 -> {100} [style=dotted];
-    89 -> {90 97} [style=dashed];
+    86 -> {89};
+    86 -> {87} [style=dotted];
+    87 -> {88} [style=dotted];
+    88 -> {89} [style=dotted];
+
+    subgraph cluster_30 {
+        color=red
+        90 [label="Enter function <setter>" style="filled" fillcolor=red];
+        subgraph cluster_31 {
+            color=blue
+            91 [label="Enter block"];
+            92 [label="Const: Int(1)"];
+            93 [label="Assignment: F|/x2|"];
+            94 [label="Exit block"];
+        }
+        95 [label="Exit function <setter>" style="filled" fillcolor=red];
+    }
     90 -> {91};
     91 -> {92};
     92 -> {93};
-    93 -> {94} [style=dotted];
-    94 -> {95} [style=dotted];
-    95 -> {96} [style=dotted];
-    96 -> {97} [style=dotted];
-    97 -> {98} [style=dotted];
-    98 -> {99} [style=dotted];
-    99 -> {100} [style=dotted];
+    93 -> {94};
+    94 -> {95};
+
+    subgraph cluster_32 {
+        color=red
+        96 [label="Enter function <getter>" style="filled" fillcolor=red];
+        subgraph cluster_33 {
+            color=blue
+            97 [label="Enter block"];
+            98 [label="Local class declaration"];
+            99 [label="Exit block"];
+        }
+        100 [label="Exit function <getter>" style="filled" fillcolor=red];
+    }
+    subgraph cluster_34 {
+        color=blue
+        101 [label="Enter class GetterLocalClass" style="filled" fillcolor=red];
+        subgraph cluster_35 {
+            color=blue
+            102 [label="Enter init block" style="filled" fillcolor=red];
+            subgraph cluster_36 {
+                color=blue
+                103 [label="Enter block"];
+                subgraph cluster_37 {
+                    color=blue
+                    104 [label="Function call arguments enter"];
+                    105 [label="Function call arguments exit"];
+                }
+                106 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
+                107 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                108 [label="Stub" style="filled" fillcolor=gray];
+                109 [label="Exit block" style="filled" fillcolor=gray];
+            }
+            110 [label="Exit init block" style="filled" fillcolor=gray];
+        }
+        subgraph cluster_38 {
+            color=blue
+            111 [label="Enter function <init>" style="filled" fillcolor=gray];
+            112 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=gray];
+            113 [label="Exit function <init>" style="filled" fillcolor=gray];
+        }
+        114 [label="Exit class GetterLocalClass" style="filled" fillcolor=gray];
+    }
+    96 -> {97};
+    97 -> {98};
+    98 -> {99 101};
+    98 -> {101} [style=dashed];
+    99 -> {100};
+    101 -> {102};
+    101 -> {111} [color=red];
+    101 -> {114} [style=dotted];
+    101 -> {102 111} [style=dashed];
+    102 -> {103};
+    103 -> {104};
+    104 -> {105};
+    105 -> {106};
+    106 -> {107};
+    107 -> {108} [style=dotted];
+    108 -> {109} [style=dotted];
+    109 -> {110} [style=dotted];
+    110 -> {111} [style=dotted];
+    111 -> {112} [style=dotted];
+    112 -> {113} [style=dotted];
+    113 -> {114} [style=dotted];
 
 }

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

@@ -59,164 +59,206 @@ digraph returnValuesFromLambda_kt {
         subgraph cluster_7 {
             color=blue
             15 [label="Enter block"];
-            16 [label="Postponed enter to lambda"];
             subgraph cluster_8 {
                 color=blue
-                17 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                16 [label="Function call arguments enter"];
+                17 [label="Postponed enter to lambda"];
                 subgraph cluster_9 {
                     color=blue
-                    18 [label="Enter block"];
+                    18 [label="Enter function <anonymous>" style="filled" fillcolor=red];
                     subgraph cluster_10 {
                         color=blue
-                        19 [label="Enter when"];
+                        19 [label="Enter block"];
                         subgraph cluster_11 {
                             color=blue
-                            20 [label="Enter when branch condition "];
-                            21 [label="Access variable R|<local>/b|"];
-                            22 [label="Exit when branch condition"];
+                            20 [label="Enter when"];
+                            subgraph cluster_12 {
+                                color=blue
+                                21 [label="Enter when branch condition "];
+                                22 [label="Access variable R|<local>/b|"];
+                                23 [label="Exit when branch condition"];
+                            }
+                            24 [label="Synthetic else branch"];
+                            25 [label="Enter when branch result"];
+                            subgraph cluster_13 {
+                                color=blue
+                                26 [label="Enter block"];
+                                subgraph cluster_14 {
+                                    color=blue
+                                    27 [label="Function call arguments enter"];
+                                    28 [label="Function call arguments exit"];
+                                }
+                                29 [label="Function call: R|/B.B|()" style="filled" fillcolor=yellow];
+                                30 [label="Jump: ^@run R|/B.B|()"];
+                                31 [label="Stub" style="filled" fillcolor=gray];
+                                32 [label="Exit block" style="filled" fillcolor=gray];
+                            }
+                            33 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            34 [label="Exit when"];
                         }
-                        23 [label="Synthetic else branch"];
-                        24 [label="Enter when branch result"];
-                        subgraph cluster_12 {
+                        subgraph cluster_15 {
                             color=blue
-                            25 [label="Enter block"];
-                            26 [label="Function call: R|/B.B|()" style="filled" fillcolor=yellow];
-                            27 [label="Jump: ^@run R|/B.B|()"];
-                            28 [label="Stub" style="filled" fillcolor=gray];
-                            29 [label="Exit block" style="filled" fillcolor=gray];
+                            35 [label="Function call arguments enter"];
+                            36 [label="Function call arguments exit"];
                         }
-                        30 [label="Exit when branch result" style="filled" fillcolor=gray];
-                        31 [label="Exit when"];
+                        37 [label="Function call: R|/C.C|()" style="filled" fillcolor=yellow];
+                        38 [label="Exit block"];
                     }
-                    32 [label="Function call: R|/C.C|()" style="filled" fillcolor=yellow];
-                    33 [label="Exit block"];
+                    39 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                 }
-                34 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                40 [label="Function call arguments exit"];
             }
-            35 [label="Postponed exit from lambda"];
-            36 [label="Function call: R|kotlin/run|<R|A|>(...)" style="filled" fillcolor=yellow];
-            37 [label="Variable declaration: lval x: R|A|"];
-            38 [label="Exit block"];
+            41 [label="Postponed exit from lambda"];
+            42 [label="Function call: R|kotlin/run|<R|A|>(...)" style="filled" fillcolor=yellow];
+            43 [label="Variable declaration: lval x: R|A|"];
+            44 [label="Exit block"];
         }
-        39 [label="Exit function test_1" style="filled" fillcolor=red];
+        45 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     14 -> {15};
     15 -> {16};
-    16 -> {17 36};
-    16 -> {35} [style=dotted];
-    16 -> {17} [style=dashed];
-    17 -> {18};
+    16 -> {17};
+    17 -> {18 40};
+    17 -> {41} [style=dotted];
+    17 -> {18} [style=dashed];
     18 -> {19};
     19 -> {20};
     20 -> {21};
     21 -> {22};
-    22 -> {23 24};
-    23 -> {31};
-    24 -> {25};
+    22 -> {23};
+    23 -> {24 25};
+    24 -> {34};
     25 -> {26};
     26 -> {27};
-    27 -> {34};
-    27 -> {28} [style=dotted];
-    28 -> {29} [style=dotted];
-    29 -> {30} [style=dotted];
+    27 -> {28};
+    28 -> {29};
+    29 -> {30};
+    30 -> {39};
     30 -> {31} [style=dotted];
-    31 -> {32};
-    32 -> {33};
-    33 -> {34};
+    31 -> {32} [style=dotted];
+    32 -> {33} [style=dotted];
+    33 -> {34} [style=dotted];
     34 -> {35};
     35 -> {36};
     36 -> {37};
     37 -> {38};
     38 -> {39};
-
-    subgraph cluster_13 {
-        color=red
-        40 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_14 {
-            color=blue
-            41 [label="Enter block"];
-            42 [label="Postponed enter to lambda"];
-            subgraph cluster_15 {
-                color=blue
-                43 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_16 {
-                    color=blue
-                    44 [label="Enter block"];
-                    45 [label="Function call: R|/C.C|()" style="filled" fillcolor=yellow];
-                    46 [label="Jump: ^@run R|/C.C|()"];
-                    47 [label="Stub" style="filled" fillcolor=gray];
-                    48 [label="Exit block" style="filled" fillcolor=gray];
-                }
-                49 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            50 [label="Postponed exit from lambda"];
-            51 [label="Function call: R|kotlin/run|<R|C|>(...)" style="filled" fillcolor=yellow];
-            52 [label="Variable declaration: lval x: R|C|"];
-            53 [label="Exit block"];
-        }
-        54 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
-    40 -> {41};
+    39 -> {41};
+    40 -> {42};
     41 -> {42};
-    42 -> {43 51};
-    42 -> {50} [style=dotted];
-    42 -> {43} [style=dashed];
+    42 -> {43};
     43 -> {44};
     44 -> {45};
-    45 -> {46};
-    46 -> {49};
-    46 -> {47} [style=dotted];
-    47 -> {48} [style=dotted];
-    48 -> {49} [style=dotted];
-    49 -> {50};
+
+    subgraph cluster_16 {
+        color=red
+        46 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_17 {
+            color=blue
+            47 [label="Enter block"];
+            subgraph cluster_18 {
+                color=blue
+                48 [label="Function call arguments enter"];
+                49 [label="Postponed enter to lambda"];
+                subgraph cluster_19 {
+                    color=blue
+                    50 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_20 {
+                        color=blue
+                        51 [label="Enter block"];
+                        subgraph cluster_21 {
+                            color=blue
+                            52 [label="Function call arguments enter"];
+                            53 [label="Function call arguments exit"];
+                        }
+                        54 [label="Function call: R|/C.C|()" style="filled" fillcolor=yellow];
+                        55 [label="Jump: ^@run R|/C.C|()"];
+                        56 [label="Stub" style="filled" fillcolor=gray];
+                        57 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    58 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                59 [label="Function call arguments exit"];
+            }
+            60 [label="Postponed exit from lambda"];
+            61 [label="Function call: R|kotlin/run|<R|C|>(...)" style="filled" fillcolor=yellow];
+            62 [label="Variable declaration: lval x: R|C|"];
+            63 [label="Exit block"];
+        }
+        64 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
+    46 -> {47};
+    47 -> {48};
+    48 -> {49};
+    49 -> {50 59};
+    49 -> {60} [style=dotted];
+    49 -> {50} [style=dashed];
     50 -> {51};
     51 -> {52};
     52 -> {53};
     53 -> {54};
+    54 -> {55};
+    55 -> {58};
+    55 -> {56} [style=dotted];
+    56 -> {57} [style=dotted];
+    57 -> {58} [style=dotted];
+    58 -> {60};
+    59 -> {61};
+    60 -> {61};
+    61 -> {62};
+    62 -> {63};
+    63 -> {64};
 
-    subgraph cluster_17 {
+    subgraph cluster_22 {
         color=red
-        55 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_18 {
+        65 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_23 {
             color=blue
-            56 [label="Enter block"];
-            57 [label="Postponed enter to lambda"];
-            subgraph cluster_19 {
+            66 [label="Enter block"];
+            subgraph cluster_24 {
                 color=blue
-                58 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_20 {
+                67 [label="Function call arguments enter"];
+                68 [label="Postponed enter to lambda"];
+                subgraph cluster_25 {
                     color=blue
-                    59 [label="Enter block"];
-                    60 [label="Jump: ^test_3 Unit"];
-                    61 [label="Stub" style="filled" fillcolor=gray];
-                    62 [label="Exit block" style="filled" fillcolor=gray];
+                    69 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_26 {
+                        color=blue
+                        70 [label="Enter block"];
+                        71 [label="Jump: ^test_3 Unit"];
+                        72 [label="Stub" style="filled" fillcolor=gray];
+                        73 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    74 [label="Exit function <anonymous>" style="filled" fillcolor=gray];
                 }
-                63 [label="Exit function <anonymous>" style="filled" fillcolor=gray];
+                75 [label="Function call arguments exit"];
             }
-            64 [label="Postponed exit from lambda" style="filled" fillcolor=gray];
-            65 [label="Function call: R|kotlin/run|<R|kotlin/Nothing|>(...)" style="filled" fillcolor=gray];
-            66 [label="Stub" style="filled" fillcolor=gray];
-            67 [label="Variable declaration: lval x: R|kotlin/Nothing|" style="filled" fillcolor=gray];
-            68 [label="Exit block" style="filled" fillcolor=gray];
+            76 [label="Postponed exit from lambda" style="filled" fillcolor=gray];
+            77 [label="Function call: R|kotlin/run|<R|kotlin/Nothing|>(...)" style="filled" fillcolor=gray];
+            78 [label="Stub" style="filled" fillcolor=gray];
+            79 [label="Variable declaration: lval x: R|kotlin/Nothing|" style="filled" fillcolor=gray];
+            80 [label="Exit block" style="filled" fillcolor=gray];
         }
-        69 [label="Exit function test_3" style="filled" fillcolor=red];
+        81 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    55 -> {56};
-    56 -> {57};
-    57 -> {58};
-    57 -> {64 65} [style=dotted];
-    57 -> {58} [style=dashed];
-    58 -> {59};
-    59 -> {60};
-    60 -> {69};
-    60 -> {61} [style=dotted];
-    61 -> {62} [style=dotted];
-    62 -> {63} [style=dotted];
-    63 -> {64} [style=dotted];
-    64 -> {65} [style=dotted];
-    65 -> {66} [style=dotted];
-    66 -> {67} [style=dotted];
-    67 -> {68} [style=dotted];
-    68 -> {69} [style=dotted];
+    65 -> {66};
+    66 -> {67};
+    67 -> {68};
+    68 -> {69 75};
+    68 -> {76} [style=dotted];
+    68 -> {69} [style=dashed];
+    69 -> {70};
+    70 -> {71};
+    71 -> {81};
+    71 -> {72} [style=dotted];
+    72 -> {73} [style=dotted];
+    73 -> {74} [style=dotted];
+    74 -> {76} [style=dotted];
+    75 -> {77} [style=dotted];
+    76 -> {77} [style=dotted];
+    77 -> {78} [style=dotted];
+    78 -> {79} [style=dotted];
+    79 -> {80} [style=dotted];
+    80 -> {81} [style=dotted];
 
 }

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

@@ -46,117 +46,138 @@ digraph safeCalls_kt {
             11 [label="Enter block"];
             12 [label="Access variable R|<local>/x|"];
             13 [label="Enter safe call"];
-            14 [label="Function call: $subj$.R|/A.foo|()" style="filled" fillcolor=yellow];
-            15 [label="Enter safe call"];
-            16 [label="Const: String()"];
-            17 [label="Function call: $subj$.R|/A.bar|(...)" style="filled" fillcolor=yellow];
-            18 [label="Exit safe call"];
-            19 [label="Exit safe call"];
-            20 [label="Exit block"];
+            subgraph cluster_7 {
+                color=blue
+                14 [label="Function call arguments enter"];
+                15 [label="Function call arguments exit"];
+            }
+            16 [label="Function call: $subj$.R|/A.foo|()" style="filled" fillcolor=yellow];
+            17 [label="Enter safe call"];
+            subgraph cluster_8 {
+                color=blue
+                18 [label="Function call arguments enter"];
+                19 [label="Const: String()"];
+                20 [label="Function call arguments exit"];
+            }
+            21 [label="Function call: $subj$.R|/A.bar|(...)" style="filled" fillcolor=yellow];
+            22 [label="Exit safe call"];
+            23 [label="Exit safe call"];
+            24 [label="Exit block"];
         }
-        21 [label="Exit function test_1" style="filled" fillcolor=red];
+        25 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     10 -> {11};
     11 -> {12};
-    12 -> {13 18};
+    12 -> {13 22};
     13 -> {14};
-    14 -> {15 18};
+    14 -> {15};
     15 -> {16};
-    16 -> {17};
-    17 -> {19};
+    16 -> {17 22};
+    17 -> {18};
     18 -> {19};
     19 -> {20};
     20 -> {21};
-
-    subgraph cluster_7 {
-        color=red
-        22 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_8 {
-            color=blue
-            23 [label="Enter block"];
-            24 [label="Access variable R|<local>/x|"];
-            25 [label="Enter safe call"];
-            26 [label="Access variable R|/B.foo|"];
-            27 [label="Enter safe call"];
-            28 [label="Access variable R|/B.bar|"];
-            29 [label="Exit safe call"];
-            30 [label="Exit safe call"];
-            31 [label="Exit block"];
-        }
-        32 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
+    21 -> {23};
     22 -> {23};
     23 -> {24};
-    24 -> {25 29};
-    25 -> {26};
-    26 -> {27 29};
-    27 -> {28};
-    28 -> {30};
-    29 -> {30};
-    30 -> {31};
-    31 -> {32};
+    24 -> {25};
 
     subgraph cluster_9 {
         color=red
-        33 [label="Enter function test_3" style="filled" fillcolor=red];
+        26 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_10 {
             color=blue
-            34 [label="Enter block"];
-            subgraph cluster_11 {
-                color=blue
-                35 [label="Enter when"];
-                subgraph cluster_12 {
-                    color=blue
-                    36 [label="Enter when branch condition "];
-                    37 [label="Access variable R|<local>/x|"];
-                    38 [label="Enter safe call"];
-                    39 [label="Access variable R|<local>/y|"];
-                    40 [label="Type operator: (R|<local>/y| as R|kotlin/String|)"];
-                    41 [label="Function call: $subj$.R|/A.bar|(...)" style="filled" fillcolor=yellow];
-                    42 [label="Exit safe call"];
-                    43 [label="Const: Null(null)"];
-                    44 [label="Equality operator !="];
-                    45 [label="Exit when branch condition"];
-                }
-                46 [label="Synthetic else branch"];
-                47 [label="Enter when branch result"];
-                subgraph cluster_13 {
-                    color=blue
-                    48 [label="Enter block"];
-                    49 [label="Access variable R|<local>/y|"];
-                    50 [label="Smart cast: R|<local>/y|"];
-                    51 [label="Access variable R|kotlin/String.length|"];
-                    52 [label="Exit block"];
-                }
-                53 [label="Exit when branch result"];
-                54 [label="Exit when"];
-            }
-            55 [label="Exit block"];
+            27 [label="Enter block"];
+            28 [label="Access variable R|<local>/x|"];
+            29 [label="Enter safe call"];
+            30 [label="Access variable R|/B.foo|"];
+            31 [label="Enter safe call"];
+            32 [label="Access variable R|/B.bar|"];
+            33 [label="Exit safe call"];
+            34 [label="Exit safe call"];
+            35 [label="Exit block"];
         }
-        56 [label="Exit function test_3" style="filled" fillcolor=red];
+        36 [label="Exit function test_2" style="filled" fillcolor=red];
     }
+    26 -> {27};
+    27 -> {28};
+    28 -> {29 33};
+    29 -> {30};
+    30 -> {31 33};
+    31 -> {32};
+    32 -> {34};
     33 -> {34};
     34 -> {35};
     35 -> {36};
-    36 -> {37};
-    37 -> {38 42};
+
+    subgraph cluster_11 {
+        color=red
+        37 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_12 {
+            color=blue
+            38 [label="Enter block"];
+            subgraph cluster_13 {
+                color=blue
+                39 [label="Enter when"];
+                subgraph cluster_14 {
+                    color=blue
+                    40 [label="Enter when branch condition "];
+                    41 [label="Access variable R|<local>/x|"];
+                    42 [label="Enter safe call"];
+                    subgraph cluster_15 {
+                        color=blue
+                        43 [label="Function call arguments enter"];
+                        44 [label="Access variable R|<local>/y|"];
+                        45 [label="Type operator: (R|<local>/y| as R|kotlin/String|)"];
+                        46 [label="Function call arguments exit"];
+                    }
+                    47 [label="Function call: $subj$.R|/A.bar|(...)" style="filled" fillcolor=yellow];
+                    48 [label="Exit safe call"];
+                    49 [label="Const: Null(null)"];
+                    50 [label="Equality operator !="];
+                    51 [label="Exit when branch condition"];
+                }
+                52 [label="Synthetic else branch"];
+                53 [label="Enter when branch result"];
+                subgraph cluster_16 {
+                    color=blue
+                    54 [label="Enter block"];
+                    55 [label="Access variable R|<local>/y|"];
+                    56 [label="Smart cast: R|<local>/y|"];
+                    57 [label="Access variable R|kotlin/String.length|"];
+                    58 [label="Exit block"];
+                }
+                59 [label="Exit when branch result"];
+                60 [label="Exit when"];
+            }
+            61 [label="Exit block"];
+        }
+        62 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
+    37 -> {38};
     38 -> {39};
     39 -> {40};
     40 -> {41};
-    41 -> {42};
+    41 -> {42 48};
     42 -> {43};
     43 -> {44};
     44 -> {45};
-    45 -> {46 47};
-    46 -> {54};
+    45 -> {46};
+    46 -> {47};
     47 -> {48};
     48 -> {49};
     49 -> {50};
     50 -> {51};
-    51 -> {52};
-    52 -> {53};
+    51 -> {52 53};
+    52 -> {60};
     53 -> {54};
     54 -> {55};
     55 -> {56};
+    56 -> {57};
+    57 -> {58};
+    58 -> {59};
+    59 -> {60};
+    60 -> {61};
+    61 -> {62};
 
 }

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

@@ -32,14 +32,24 @@ digraph simple_kt {
             7 [label="Enter block"];
             8 [label="Const: Int(1)"];
             9 [label="Variable declaration: lval x: R|kotlin/Int|"];
-            10 [label="Access variable R|<local>/x|"];
-            11 [label="Const: Int(1)"];
-            12 [label="Function call: R|<local>/x|.R|kotlin/Int.plus|(...)" style="filled" fillcolor=yellow];
-            13 [label="Variable declaration: lval y: R|kotlin/Int|"];
-            14 [label="Function call: R|/foo|()" style="filled" fillcolor=yellow];
-            15 [label="Exit block"];
+            subgraph cluster_5 {
+                color=blue
+                10 [label="Function call arguments enter"];
+                11 [label="Access variable R|<local>/x|"];
+                12 [label="Const: Int(1)"];
+                13 [label="Function call arguments exit"];
+            }
+            14 [label="Function call: R|<local>/x|.R|kotlin/Int.plus|(...)" style="filled" fillcolor=yellow];
+            15 [label="Variable declaration: lval y: R|kotlin/Int|"];
+            subgraph cluster_6 {
+                color=blue
+                16 [label="Function call arguments enter"];
+                17 [label="Function call arguments exit"];
+            }
+            18 [label="Function call: R|/foo|()" style="filled" fillcolor=yellow];
+            19 [label="Exit block"];
         }
-        16 [label="Exit function test" style="filled" fillcolor=red];
+        20 [label="Exit function test" style="filled" fillcolor=red];
     }
     6 -> {7};
     7 -> {8};
@@ -51,5 +61,9 @@ digraph simple_kt {
     13 -> {14};
     14 -> {15};
     15 -> {16};
+    16 -> {17};
+    17 -> {18};
+    18 -> {19};
+    19 -> {20};
 
 }

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

@@ -205,67 +205,72 @@ digraph tryCatch_kt {
                                         subgraph cluster_30 {
                                             color=blue
                                             72 [label="Enter when branch condition "];
-                                            73 [label="Access variable R|<local>/b|"];
-                                            74 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()" style="filled" fillcolor=yellow];
-                                            75 [label="Exit when branch condition"];
+                                            subgraph cluster_31 {
+                                                color=blue
+                                                73 [label="Function call arguments enter"];
+                                                74 [label="Access variable R|<local>/b|"];
+                                                75 [label="Function call arguments exit"];
+                                            }
+                                            76 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()" style="filled" fillcolor=yellow];
+                                            77 [label="Exit when branch condition"];
                                         }
-                                        76 [label="Synthetic else branch"];
-                                        77 [label="Enter when branch result"];
-                                        subgraph cluster_31 {
+                                        78 [label="Synthetic else branch"];
+                                        79 [label="Enter when branch result"];
+                                        subgraph cluster_32 {
                                             color=blue
-                                            78 [label="Enter block"];
-                                            79 [label="Jump: break@@@[Boolean(true)] "];
-                                            80 [label="Stub" style="filled" fillcolor=gray];
-                                            81 [label="Exit block" style="filled" fillcolor=gray];
+                                            80 [label="Enter block"];
+                                            81 [label="Jump: break@@@[Boolean(true)] "];
+                                            82 [label="Stub" style="filled" fillcolor=gray];
+                                            83 [label="Exit block" style="filled" fillcolor=gray];
                                         }
-                                        82 [label="Exit when branch result" style="filled" fillcolor=gray];
-                                        83 [label="Exit when"];
+                                        84 [label="Exit when branch result" style="filled" fillcolor=gray];
+                                        85 [label="Exit when"];
                                     }
-                                    84 [label="Exit block"];
+                                    86 [label="Exit block"];
                                 }
-                                85 [label="Try main block exit"];
+                                87 [label="Try main block exit"];
                             }
-                            subgraph cluster_32 {
+                            subgraph cluster_33 {
                                 color=blue
-                                86 [label="Catch enter"];
-                                87 [label="Variable declaration: e: R|kotlin/Exception|"];
-                                subgraph cluster_33 {
+                                88 [label="Catch enter"];
+                                89 [label="Variable declaration: e: R|kotlin/Exception|"];
+                                subgraph cluster_34 {
                                     color=blue
-                                    88 [label="Enter block"];
-                                    89 [label="Jump: continue@@@[Boolean(true)] "];
-                                    90 [label="Stub" style="filled" fillcolor=gray];
-                                    91 [label="Exit block" style="filled" fillcolor=gray];
+                                    90 [label="Enter block"];
+                                    91 [label="Jump: continue@@@[Boolean(true)] "];
+                                    92 [label="Stub" style="filled" fillcolor=gray];
+                                    93 [label="Exit block" style="filled" fillcolor=gray];
                                 }
-                                92 [label="Catch exit" style="filled" fillcolor=gray];
+                                94 [label="Catch exit" style="filled" fillcolor=gray];
                             }
-                            subgraph cluster_34 {
+                            subgraph cluster_35 {
                                 color=blue
-                                93 [label="Catch enter"];
-                                94 [label="Variable declaration: e: R|kotlin/RuntimeException|"];
-                                subgraph cluster_35 {
+                                95 [label="Catch enter"];
+                                96 [label="Variable declaration: e: R|kotlin/RuntimeException|"];
+                                subgraph cluster_36 {
                                     color=blue
-                                    95 [label="Enter block"];
-                                    96 [label="Jump: break@@@[Boolean(true)] "];
-                                    97 [label="Stub" style="filled" fillcolor=gray];
-                                    98 [label="Exit block" style="filled" fillcolor=gray];
+                                    97 [label="Enter block"];
+                                    98 [label="Jump: break@@@[Boolean(true)] "];
+                                    99 [label="Stub" style="filled" fillcolor=gray];
+                                    100 [label="Exit block" style="filled" fillcolor=gray];
                                 }
-                                99 [label="Catch exit" style="filled" fillcolor=gray];
+                                101 [label="Catch exit" style="filled" fillcolor=gray];
                             }
-                            100 [label="Try expression exit"];
+                            102 [label="Try expression exit"];
                         }
-                        101 [label="Const: Int(2)"];
-                        102 [label="Variable declaration: lval y: R|kotlin/Int|"];
-                        103 [label="Exit block"];
+                        103 [label="Const: Int(2)"];
+                        104 [label="Variable declaration: lval y: R|kotlin/Int|"];
+                        105 [label="Exit block"];
                     }
-                    104 [label="Exit loop block"];
+                    106 [label="Exit loop block"];
                 }
-                105 [label="Exit while loop"];
+                107 [label="Exit while loop"];
             }
-            106 [label="Const: Int(3)"];
-            107 [label="Variable declaration: lval z: R|kotlin/Int|"];
-            108 [label="Exit block"];
+            108 [label="Const: Int(3)"];
+            109 [label="Variable declaration: lval z: R|kotlin/Int|"];
+            110 [label="Exit block"];
         }
-        109 [label="Exit function test_3" style="filled" fillcolor=red];
+        111 [label="Exit function test_3" style="filled" fillcolor=red];
     }
     46 -> {47};
     47 -> {48};
@@ -273,10 +278,10 @@ digraph tryCatch_kt {
     49 -> {50};
     50 -> {51};
     51 -> {52};
-    51 -> {105} [style=dotted];
+    51 -> {107} [style=dotted];
     52 -> {53};
     53 -> {54};
-    54 -> {55 86 93};
+    54 -> {55 88 95};
     55 -> {56};
     56 -> {57};
     57 -> {58};
@@ -286,7 +291,7 @@ digraph tryCatch_kt {
     61 -> {68};
     62 -> {63};
     63 -> {64};
-    64 -> {109};
+    64 -> {111};
     64 -> {65} [style=dotted];
     65 -> {66} [style=dotted];
     66 -> {67} [style=dotted];
@@ -298,42 +303,44 @@ digraph tryCatch_kt {
     72 -> {73};
     73 -> {74};
     74 -> {75};
-    75 -> {76 77};
-    76 -> {83};
-    77 -> {78};
-    78 -> {79};
-    79 -> {105};
-    79 -> {80} [style=dotted];
-    80 -> {81} [style=dotted];
+    75 -> {76};
+    76 -> {77};
+    77 -> {78 79};
+    78 -> {85};
+    79 -> {80};
+    80 -> {81};
+    81 -> {107};
     81 -> {82} [style=dotted];
     82 -> {83} [style=dotted];
-    83 -> {84};
-    84 -> {85};
-    85 -> {86 93 100};
+    83 -> {84} [style=dotted];
+    84 -> {85} [style=dotted];
+    85 -> {86};
     86 -> {87};
-    87 -> {88};
+    87 -> {88 95 102};
     88 -> {89};
-    89 -> {49} [color=green style=dashed];
-    89 -> {90} [style=dotted];
-    90 -> {91} [style=dotted];
+    89 -> {90};
+    90 -> {91};
+    91 -> {49} [color=green style=dashed];
     91 -> {92} [style=dotted];
-    92 -> {100} [style=dotted];
-    93 -> {94};
-    94 -> {95};
+    92 -> {93} [style=dotted];
+    93 -> {94} [style=dotted];
+    94 -> {102} [style=dotted];
     95 -> {96};
-    96 -> {105};
-    96 -> {97} [style=dotted];
-    97 -> {98} [style=dotted];
+    96 -> {97};
+    97 -> {98};
+    98 -> {107};
     98 -> {99} [style=dotted];
     99 -> {100} [style=dotted];
-    100 -> {101};
-    101 -> {102};
+    100 -> {101} [style=dotted];
+    101 -> {102} [style=dotted];
     102 -> {103};
     103 -> {104};
-    104 -> {49} [color=green style=dashed];
+    104 -> {105};
     105 -> {106};
-    106 -> {107};
+    106 -> {49} [color=green style=dashed];
     107 -> {108};
     108 -> {109};
+    109 -> {110};
+    110 -> {111};
 
 }

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

@@ -26,110 +26,131 @@ digraph variableInitializedInTryBlock_kt {
                     subgraph cluster_5 {
                         color=blue
                         7 [label="Enter block"];
-                        8 [label="Function call: R|/getStringOrNull|()" style="filled" fillcolor=yellow];
-                        9 [label="Exit lhs of ?:"];
-                        10 [label="Enter rhs of ?:"];
-                        11 [label="Jump: ^test Unit"];
-                        12 [label="Stub" style="filled" fillcolor=gray];
-                        13 [label="Lhs of ?: is not null"];
-                        14 [label="Exit ?:"];
-                        15 [label="Variable declaration: lval s: R|kotlin/String|"];
-                        16 [label="Access variable R|<local>/s|"];
-                        17 [label="Access variable R|kotlin/String.length|"];
-                        18 [label="Const: Int(0)"];
-                        19 [label="Equality operator !="];
-                        20 [label="Assignment: R|<local>/b|"];
-                        21 [label="Exit block"];
+                        subgraph cluster_6 {
+                            color=blue
+                            8 [label="Function call arguments enter"];
+                            9 [label="Function call arguments exit"];
+                        }
+                        10 [label="Function call: R|/getStringOrNull|()" style="filled" fillcolor=yellow];
+                        11 [label="Exit lhs of ?:"];
+                        12 [label="Enter rhs of ?:"];
+                        13 [label="Jump: ^test Unit"];
+                        14 [label="Stub" style="filled" fillcolor=gray];
+                        15 [label="Lhs of ?: is not null"];
+                        16 [label="Exit ?:"];
+                        17 [label="Variable declaration: lval s: R|kotlin/String|"];
+                        18 [label="Access variable R|<local>/s|"];
+                        19 [label="Access variable R|kotlin/String.length|"];
+                        20 [label="Const: Int(0)"];
+                        21 [label="Equality operator !="];
+                        22 [label="Assignment: R|<local>/b|"];
+                        23 [label="Exit block"];
                     }
-                    22 [label="Try main block exit"];
+                    24 [label="Try main block exit"];
                 }
-                subgraph cluster_6 {
+                subgraph cluster_7 {
                     color=blue
-                    23 [label="Enter finally"];
-                    subgraph cluster_7 {
+                    25 [label="Enter finally"];
+                    subgraph cluster_8 {
                         color=blue
-                        24 [label="Enter block"];
-                        25 [label="Function call: R|/test|()" style="filled" fillcolor=yellow];
-                        26 [label="Exit block"];
+                        26 [label="Enter block"];
+                        subgraph cluster_9 {
+                            color=blue
+                            27 [label="Function call arguments enter"];
+                            28 [label="Function call arguments exit"];
+                        }
+                        29 [label="Function call: R|/test|()" style="filled" fillcolor=yellow];
+                        30 [label="Exit block"];
                     }
-                    27 [label="Exit finally"];
+                    31 [label="Exit finally"];
                 }
-                28 [label="Try expression exit"];
+                32 [label="Try expression exit"];
             }
-            29 [label="Access variable R|<local>/b|"];
-            30 [label="Function call: R|/takeBoolean|(...)" style="filled" fillcolor=yellow];
-            31 [label="Exit block"];
+            subgraph cluster_10 {
+                color=blue
+                33 [label="Function call arguments enter"];
+                34 [label="Access variable R|<local>/b|"];
+                35 [label="Function call arguments exit"];
+            }
+            36 [label="Function call: R|/takeBoolean|(...)" style="filled" fillcolor=yellow];
+            37 [label="Exit block"];
         }
-        32 [label="Exit function test" style="filled" fillcolor=red];
+        38 [label="Exit function test" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
     4 -> {5};
     5 -> {6};
-    5 -> {23} [label="onUncaughtException"];
+    5 -> {25} [label="onUncaughtException"];
     6 -> {7};
     7 -> {8};
     8 -> {9};
-    9 -> {10 13};
+    9 -> {10};
     10 -> {11};
-    11 -> {23} [label="return@/test"];
-    11 -> {12} [style=dotted];
-    12 -> {14} [style=dotted];
-    13 -> {14};
-    14 -> {15};
+    11 -> {12 15};
+    12 -> {13};
+    13 -> {25} [label="return@/test"];
+    13 -> {14} [style=dotted];
+    14 -> {16} [style=dotted];
     15 -> {16};
     16 -> {17};
     17 -> {18};
     18 -> {19};
     19 -> {20};
     20 -> {21};
-    20 -> {23} [label="onUncaughtException"];
     21 -> {22};
     22 -> {23};
+    22 -> {25} [label="onUncaughtException"];
     23 -> {24};
     24 -> {25};
     25 -> {26};
     26 -> {27};
     27 -> {28};
-    27 -> {32} [label="return@/test"];
     28 -> {29};
     29 -> {30};
     30 -> {31};
     31 -> {32};
-
-    subgraph cluster_8 {
-        color=red
-        33 [label="Enter function takeBoolean" style="filled" fillcolor=red];
-        subgraph cluster_9 {
-            color=blue
-            34 [label="Enter block"];
-            35 [label="Exit block"];
-        }
-        36 [label="Exit function takeBoolean" style="filled" fillcolor=red];
-    }
+    31 -> {38} [label="return@/test"];
+    32 -> {33};
     33 -> {34};
     34 -> {35};
     35 -> {36};
-
-    subgraph cluster_10 {
-        color=red
-        37 [label="Enter function getStringOrNull" style="filled" fillcolor=red];
-        subgraph cluster_11 {
-            color=blue
-            38 [label="Enter block"];
-            39 [label="Const: String(hello)"];
-            40 [label="Jump: ^getStringOrNull String(hello)"];
-            41 [label="Stub" style="filled" fillcolor=gray];
-            42 [label="Exit block" style="filled" fillcolor=gray];
-        }
-        43 [label="Exit function getStringOrNull" style="filled" fillcolor=red];
-    }
+    36 -> {37};
     37 -> {38};
-    38 -> {39};
+
+    subgraph cluster_11 {
+        color=red
+        39 [label="Enter function takeBoolean" style="filled" fillcolor=red];
+        subgraph cluster_12 {
+            color=blue
+            40 [label="Enter block"];
+            41 [label="Exit block"];
+        }
+        42 [label="Exit function takeBoolean" style="filled" fillcolor=red];
+    }
     39 -> {40};
-    40 -> {43};
-    40 -> {41} [style=dotted];
-    41 -> {42} [style=dotted];
-    42 -> {43} [style=dotted];
+    40 -> {41};
+    41 -> {42};
+
+    subgraph cluster_13 {
+        color=red
+        43 [label="Enter function getStringOrNull" style="filled" fillcolor=red];
+        subgraph cluster_14 {
+            color=blue
+            44 [label="Enter block"];
+            45 [label="Const: String(hello)"];
+            46 [label="Jump: ^getStringOrNull String(hello)"];
+            47 [label="Stub" style="filled" fillcolor=gray];
+            48 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        49 [label="Exit function getStringOrNull" style="filled" fillcolor=red];
+    }
+    43 -> {44};
+    44 -> {45};
+    45 -> {46};
+    46 -> {49};
+    46 -> {47} [style=dotted];
+    47 -> {48} [style=dotted];
+    48 -> {49} [style=dotted];
 
 }

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

@@ -30,67 +30,77 @@ digraph when_kt {
                 subgraph cluster_5 {
                     color=blue
                     10 [label="Enter when branch condition "];
-                    11 [label="Access variable R|<local>/x|"];
-                    12 [label="Const: Int(2)"];
-                    13 [label="Function call: R|<local>/x|.R|kotlin/Int.rem|(...)" style="filled" fillcolor=yellow];
-                    14 [label="Const: Int(0)"];
-                    15 [label="Equality operator =="];
-                    16 [label="Exit when branch condition"];
-                }
-                subgraph cluster_6 {
-                    color=blue
-                    17 [label="Enter when branch condition "];
-                    18 [label="Const: Int(1)"];
-                    19 [label="Const: Int(1)"];
-                    20 [label="Function call: Int(1).R|kotlin/Int.minus|(...)" style="filled" fillcolor=yellow];
-                    21 [label="Const: Int(0)"];
-                    22 [label="Equality operator =="];
-                    23 [label="Exit when branch condition"];
+                    subgraph cluster_6 {
+                        color=blue
+                        11 [label="Function call arguments enter"];
+                        12 [label="Access variable R|<local>/x|"];
+                        13 [label="Const: Int(2)"];
+                        14 [label="Function call arguments exit"];
+                    }
+                    15 [label="Function call: R|<local>/x|.R|kotlin/Int.rem|(...)" style="filled" fillcolor=yellow];
+                    16 [label="Const: Int(0)"];
+                    17 [label="Equality operator =="];
+                    18 [label="Exit when branch condition"];
                 }
                 subgraph cluster_7 {
                     color=blue
-                    24 [label="Enter when branch condition else"];
-                    25 [label="Exit when branch condition"];
+                    19 [label="Enter when branch condition "];
+                    subgraph cluster_8 {
+                        color=blue
+                        20 [label="Function call arguments enter"];
+                        21 [label="Const: Int(1)"];
+                        22 [label="Const: Int(1)"];
+                        23 [label="Function call arguments exit"];
+                    }
+                    24 [label="Function call: Int(1).R|kotlin/Int.minus|(...)" style="filled" fillcolor=yellow];
+                    25 [label="Const: Int(0)"];
+                    26 [label="Equality operator =="];
+                    27 [label="Exit when branch condition"];
                 }
-                26 [label="Enter when branch result"];
-                subgraph cluster_8 {
-                    color=blue
-                    27 [label="Enter block"];
-                    28 [label="Const: Int(5)"];
-                    29 [label="Exit block"];
-                }
-                30 [label="Exit when branch result"];
-                31 [label="Enter when branch result"];
                 subgraph cluster_9 {
                     color=blue
-                    32 [label="Enter block"];
-                    33 [label="Jump: ^test_1 Unit"];
-                    34 [label="Stub" style="filled" fillcolor=gray];
-                    35 [label="Exit block" style="filled" fillcolor=gray];
+                    28 [label="Enter when branch condition else"];
+                    29 [label="Exit when branch condition"];
                 }
-                36 [label="Exit when branch result" style="filled" fillcolor=gray];
-                37 [label="Enter when branch result"];
+                30 [label="Enter when branch result"];
                 subgraph cluster_10 {
                     color=blue
-                    38 [label="Enter block"];
-                    39 [label="Const: Int(20)"];
-                    40 [label="Exit block"];
+                    31 [label="Enter block"];
+                    32 [label="Const: Int(5)"];
+                    33 [label="Exit block"];
                 }
-                41 [label="Exit when branch result"];
-                42 [label="Enter when branch result"];
+                34 [label="Exit when branch result"];
+                35 [label="Enter when branch result"];
                 subgraph cluster_11 {
                     color=blue
-                    43 [label="Enter block"];
-                    44 [label="Const: Int(10)"];
-                    45 [label="Exit block"];
+                    36 [label="Enter block"];
+                    37 [label="Jump: ^test_1 Unit"];
+                    38 [label="Stub" style="filled" fillcolor=gray];
+                    39 [label="Exit block" style="filled" fillcolor=gray];
                 }
-                46 [label="Exit when branch result"];
-                47 [label="Exit when"];
+                40 [label="Exit when branch result" style="filled" fillcolor=gray];
+                41 [label="Enter when branch result"];
+                subgraph cluster_12 {
+                    color=blue
+                    42 [label="Enter block"];
+                    43 [label="Const: Int(20)"];
+                    44 [label="Exit block"];
+                }
+                45 [label="Exit when branch result"];
+                46 [label="Enter when branch result"];
+                subgraph cluster_13 {
+                    color=blue
+                    47 [label="Enter block"];
+                    48 [label="Const: Int(10)"];
+                    49 [label="Exit block"];
+                }
+                50 [label="Exit when branch result"];
+                51 [label="Exit when"];
             }
-            48 [label="Variable declaration: lval y: R|kotlin/Int|"];
-            49 [label="Exit block"];
+            52 [label="Variable declaration: lval y: R|kotlin/Int|"];
+            53 [label="Exit block"];
         }
-        50 [label="Exit function test_1" style="filled" fillcolor=red];
+        54 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
@@ -99,129 +109,133 @@ digraph when_kt {
     6 -> {7};
     7 -> {8};
     8 -> {9};
-    9 -> {10 42};
+    9 -> {10 46};
     10 -> {11};
     11 -> {12};
     12 -> {13};
     13 -> {14};
     14 -> {15};
     15 -> {16};
-    16 -> {17 37};
+    16 -> {17};
     17 -> {18};
-    18 -> {19};
+    18 -> {19 41};
     19 -> {20};
     20 -> {21};
     21 -> {22};
     22 -> {23};
-    23 -> {24 31};
+    23 -> {24};
     24 -> {25};
     25 -> {26};
     26 -> {27};
-    27 -> {28};
+    27 -> {28 35};
     28 -> {29};
     29 -> {30};
-    30 -> {47};
+    30 -> {31};
     31 -> {32};
     32 -> {33};
-    33 -> {50};
-    33 -> {34} [style=dotted];
-    34 -> {35} [style=dotted];
-    35 -> {36} [style=dotted];
-    36 -> {47} [style=dotted];
-    37 -> {38};
-    38 -> {39};
-    39 -> {40};
-    40 -> {41};
-    41 -> {47};
+    33 -> {34};
+    34 -> {51};
+    35 -> {36};
+    36 -> {37};
+    37 -> {54};
+    37 -> {38} [style=dotted];
+    38 -> {39} [style=dotted];
+    39 -> {40} [style=dotted];
+    40 -> {51} [style=dotted];
+    41 -> {42};
     42 -> {43};
     43 -> {44};
     44 -> {45};
-    45 -> {46};
+    45 -> {51};
     46 -> {47};
     47 -> {48};
     48 -> {49};
     49 -> {50};
-
-    subgraph cluster_12 {
-        color=red
-        51 [label="Enter class A" style="filled" fillcolor=red];
-        52 [label="Exit class A" style="filled" fillcolor=red];
-    }
-    51 -> {52} [color=green];
-
-    subgraph cluster_13 {
-        color=red
-        53 [label="Enter class B" style="filled" fillcolor=red];
-        54 [label="Exit class B" style="filled" fillcolor=red];
-    }
-    53 -> {54} [color=green];
+    50 -> {51};
+    51 -> {52};
+    52 -> {53};
+    53 -> {54};
 
     subgraph cluster_14 {
         color=red
-        55 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_15 {
+        55 [label="Enter class A" style="filled" fillcolor=red];
+        56 [label="Exit class A" style="filled" fillcolor=red];
+    }
+    55 -> {56} [color=green];
+
+    subgraph cluster_15 {
+        color=red
+        57 [label="Enter class B" style="filled" fillcolor=red];
+        58 [label="Exit class B" style="filled" fillcolor=red];
+    }
+    57 -> {58} [color=green];
+
+    subgraph cluster_16 {
+        color=red
+        59 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_17 {
             color=blue
-            56 [label="Enter block"];
-            subgraph cluster_16 {
+            60 [label="Enter block"];
+            subgraph cluster_18 {
                 color=blue
-                57 [label="Enter when"];
-                subgraph cluster_17 {
-                    color=blue
-                    58 [label="Enter when branch condition "];
-                    subgraph cluster_18 {
-                        color=blue
-                        59 [label="Enter &&"];
-                        60 [label="Access variable R|<local>/x|"];
-                        61 [label="Type operator: (R|<local>/x| is R|A|)"];
-                        62 [label="Exit left part of &&"];
-                        63 [label="Enter right part of &&"];
-                        64 [label="Access variable R|<local>/x|"];
-                        65 [label="Smart cast: R|<local>/x|"];
-                        66 [label="Type operator: (R|<local>/x| is R|B|)"];
-                        67 [label="Exit &&"];
-                    }
-                    68 [label="Exit when branch condition"];
-                }
-                69 [label="Synthetic else branch"];
-                70 [label="Enter when branch result"];
+                61 [label="Enter when"];
                 subgraph cluster_19 {
                     color=blue
-                    71 [label="Enter block"];
-                    72 [label="Access variable R|<local>/x|"];
-                    73 [label="Smart cast: R|<local>/x|"];
-                    74 [label="Type operator: (R|<local>/x| is R|A|)"];
-                    75 [label="Exit block"];
+                    62 [label="Enter when branch condition "];
+                    subgraph cluster_20 {
+                        color=blue
+                        63 [label="Enter &&"];
+                        64 [label="Access variable R|<local>/x|"];
+                        65 [label="Type operator: (R|<local>/x| is R|A|)"];
+                        66 [label="Exit left part of &&"];
+                        67 [label="Enter right part of &&"];
+                        68 [label="Access variable R|<local>/x|"];
+                        69 [label="Smart cast: R|<local>/x|"];
+                        70 [label="Type operator: (R|<local>/x| is R|B|)"];
+                        71 [label="Exit &&"];
+                    }
+                    72 [label="Exit when branch condition"];
                 }
-                76 [label="Exit when branch result"];
-                77 [label="Exit when"];
+                73 [label="Synthetic else branch"];
+                74 [label="Enter when branch result"];
+                subgraph cluster_21 {
+                    color=blue
+                    75 [label="Enter block"];
+                    76 [label="Access variable R|<local>/x|"];
+                    77 [label="Smart cast: R|<local>/x|"];
+                    78 [label="Type operator: (R|<local>/x| is R|A|)"];
+                    79 [label="Exit block"];
+                }
+                80 [label="Exit when branch result"];
+                81 [label="Exit when"];
             }
-            78 [label="Exit block"];
+            82 [label="Exit block"];
         }
-        79 [label="Exit function test_2" style="filled" fillcolor=red];
+        83 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    55 -> {56};
-    56 -> {57};
-    57 -> {58};
-    58 -> {59};
     59 -> {60};
     60 -> {61};
     61 -> {62};
-    62 -> {63 67};
+    62 -> {63};
     63 -> {64};
     64 -> {65};
     65 -> {66};
-    66 -> {67};
+    66 -> {67 71};
     67 -> {68};
-    68 -> {69 70};
-    69 -> {77};
+    68 -> {69};
+    69 -> {70};
     70 -> {71};
     71 -> {72};
-    72 -> {73};
-    73 -> {74};
+    72 -> {73 74};
+    73 -> {81};
     74 -> {75};
     75 -> {76};
     76 -> {77};
     77 -> {78};
     78 -> {79};
+    79 -> {80};
+    80 -> {81};
+    81 -> {82};
+    82 -> {83};
 
 }

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

@@ -16,48 +16,55 @@ digraph classCallInLambda_kt {
         subgraph cluster_2 {
             color=blue
             3 [label="Enter block"];
-            4 [label="Access variable R|<local>/x|"];
-            5 [label="Postponed enter to lambda"];
             subgraph cluster_3 {
                 color=blue
-                6 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                4 [label="Function call arguments enter"];
+                5 [label="Access variable R|<local>/x|"];
+                6 [label="Postponed enter to lambda"];
                 subgraph cluster_4 {
                     color=blue
-                    7 [label="Enter block"];
-                    8 [label="Access variable R|<local>/it|"];
-                    9 [label="::class call"];
-                    10 [label="Exit block"];
+                    7 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_5 {
+                        color=blue
+                        8 [label="Enter block"];
+                        9 [label="Access variable R|<local>/it|"];
+                        10 [label="::class call"];
+                        11 [label="Exit block"];
+                    }
+                    12 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                 }
-                11 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                13 [label="Function call arguments exit"];
             }
-            12 [label="Postponed exit from lambda"];
-            13 [label="Function call: R|<local>/x|.R|kotlin/let|<R|kotlin/String|, R|kotlin/reflect/KClass<out kotlin/String>|>(...)" style="filled" fillcolor=yellow];
-            14 [label="Jump: ^test R|<local>/x|.R|kotlin/let|<R|kotlin/String|, R|kotlin/reflect/KClass<out kotlin/String>|>(<L> = let@fun <anonymous>(it: R|kotlin/String|): R|kotlin/reflect/KClass<out kotlin/String>| <inline=Inline, kind=EXACTLY_ONCE>  {
+            14 [label="Postponed exit from lambda"];
+            15 [label="Function call: R|<local>/x|.R|kotlin/let|<R|kotlin/String|, R|kotlin/reflect/KClass<out kotlin/String>|>(...)" style="filled" fillcolor=yellow];
+            16 [label="Jump: ^test R|<local>/x|.R|kotlin/let|<R|kotlin/String|, R|kotlin/reflect/KClass<out kotlin/String>|>(<L> = let@fun <anonymous>(it: R|kotlin/String|): R|kotlin/reflect/KClass<out kotlin/String>| <inline=Inline, kind=EXACTLY_ONCE>  {
     ^ <getClass>(R|<local>/it|)
 }
 )"];
-            15 [label="Stub" style="filled" fillcolor=gray];
-            16 [label="Exit block" style="filled" fillcolor=gray];
+            17 [label="Stub" style="filled" fillcolor=gray];
+            18 [label="Exit block" style="filled" fillcolor=gray];
         }
-        17 [label="Exit function test" style="filled" fillcolor=red];
+        19 [label="Exit function test" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
     4 -> {5};
-    5 -> {6 13};
-    5 -> {12} [style=dotted];
-    5 -> {6} [style=dashed];
-    6 -> {7};
+    5 -> {6};
+    6 -> {7 13};
+    6 -> {14} [style=dotted];
+    6 -> {7} [style=dashed];
     7 -> {8};
     8 -> {9};
     9 -> {10};
     10 -> {11};
     11 -> {12};
-    12 -> {13};
-    13 -> {14};
-    14 -> {17};
-    14 -> {15} [style=dotted];
-    15 -> {16} [style=dotted];
+    12 -> {14};
+    13 -> {15};
+    14 -> {15};
+    15 -> {16};
+    16 -> {19};
     16 -> {17} [style=dotted];
+    17 -> {18} [style=dotted];
+    18 -> {19} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolve/exhaustiveness/positive/exhaustiveWhenAndDNNType.dot

@@ -96,26 +96,41 @@ digraph exhaustiveWhenAndDNNType_kt {
                 subgraph cluster_12 {
                     color=blue
                     37 [label="Enter block"];
-                    38 [label="Function call: R|/B.B|()" style="filled" fillcolor=yellow];
-                    39 [label="Exit block"];
+                    subgraph cluster_13 {
+                        color=blue
+                        38 [label="Function call arguments enter"];
+                        39 [label="Function call arguments exit"];
+                    }
+                    40 [label="Function call: R|/B.B|()" style="filled" fillcolor=yellow];
+                    41 [label="Exit block"];
                 }
-                40 [label="Exit when branch result"];
-                41 [label="Enter when branch result"];
-                subgraph cluster_13 {
+                42 [label="Exit when branch result"];
+                43 [label="Enter when branch result"];
+                subgraph cluster_14 {
                     color=blue
-                    42 [label="Enter block"];
-                    43 [label="Function call: R|/B.B|()" style="filled" fillcolor=yellow];
-                    44 [label="Exit block"];
+                    44 [label="Enter block"];
+                    subgraph cluster_15 {
+                        color=blue
+                        45 [label="Function call arguments enter"];
+                        46 [label="Function call arguments exit"];
+                    }
+                    47 [label="Function call: R|/B.B|()" style="filled" fillcolor=yellow];
+                    48 [label="Exit block"];
                 }
-                45 [label="Exit when branch result"];
-                46 [label="Exit when"];
+                49 [label="Exit when branch result"];
+                50 [label="Exit when"];
             }
-            47 [label="Variable declaration: lval b: R|B|"];
-            48 [label="Access variable R|<local>/b|"];
-            49 [label="Function call: R|/takeB|(...)" style="filled" fillcolor=yellow];
-            50 [label="Exit block"];
+            51 [label="Variable declaration: lval b: R|B|"];
+            subgraph cluster_16 {
+                color=blue
+                52 [label="Function call arguments enter"];
+                53 [label="Access variable R|<local>/b|"];
+                54 [label="Function call arguments exit"];
+            }
+            55 [label="Function call: R|/takeB|(...)" style="filled" fillcolor=yellow];
+            56 [label="Exit block"];
         }
-        51 [label="Exit function test_1" style="filled" fillcolor=red];
+        57 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     16 -> {17};
     17 -> {18};
@@ -130,7 +145,7 @@ digraph exhaustiveWhenAndDNNType_kt {
     26 -> {27};
     27 -> {28};
     28 -> {29};
-    29 -> {30 41};
+    29 -> {30 43};
     30 -> {31};
     31 -> {32};
     32 -> {33};
@@ -141,9 +156,9 @@ digraph exhaustiveWhenAndDNNType_kt {
     37 -> {38};
     38 -> {39};
     39 -> {40};
-    40 -> {46};
+    40 -> {41};
     41 -> {42};
-    42 -> {43};
+    42 -> {50};
     43 -> {44};
     44 -> {45};
     45 -> {46};
@@ -152,70 +167,85 @@ digraph exhaustiveWhenAndDNNType_kt {
     48 -> {49};
     49 -> {50};
     50 -> {51};
-
-    subgraph cluster_14 {
-        color=red
-        52 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_15 {
-            color=blue
-            53 [label="Enter block"];
-            54 [label="Access qualifier /SomeEnum"];
-            55 [label="Access variable R|/SomeEnum.A1|"];
-            56 [label="Variable declaration: lval flag: R|SomeEnum|"];
-            subgraph cluster_16 {
-                color=blue
-                57 [label="Enter when"];
-                58 [label="Access variable R|<local>/flag|"];
-                59 [label="Check not null: R|<local>/flag|!!" style="filled" fillcolor=yellow];
-                subgraph cluster_17 {
-                    color=blue
-                    60 [label="Enter when branch condition "];
-                    61 [label="Exit $subj"];
-                    62 [label="Access qualifier /SomeEnum"];
-                    63 [label="Access variable R|/SomeEnum.A1|"];
-                    64 [label="Equality operator =="];
-                    65 [label="Exit when branch condition"];
-                }
-                subgraph cluster_18 {
-                    color=blue
-                    66 [label="Enter when branch condition "];
-                    67 [label="Exit $subj"];
-                    68 [label="Access qualifier /SomeEnum"];
-                    69 [label="Access variable R|/SomeEnum.A2|"];
-                    70 [label="Equality operator =="];
-                    71 [label="Exit when branch condition"];
-                }
-                72 [label="Enter when branch result"];
-                subgraph cluster_19 {
-                    color=blue
-                    73 [label="Enter block"];
-                    74 [label="Function call: R|/B.B|()" style="filled" fillcolor=yellow];
-                    75 [label="Exit block"];
-                }
-                76 [label="Exit when branch result"];
-                77 [label="Enter when branch result"];
-                subgraph cluster_20 {
-                    color=blue
-                    78 [label="Enter block"];
-                    79 [label="Function call: R|/B.B|()" style="filled" fillcolor=yellow];
-                    80 [label="Exit block"];
-                }
-                81 [label="Exit when branch result"];
-                82 [label="Exit when"];
-            }
-            83 [label="Variable declaration: lval b: R|B|"];
-            84 [label="Access variable R|<local>/b|"];
-            85 [label="Function call: R|/takeB|(...)" style="filled" fillcolor=yellow];
-            86 [label="Exit block"];
-        }
-        87 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
+    51 -> {52};
     52 -> {53};
     53 -> {54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
-    57 -> {58};
+
+    subgraph cluster_17 {
+        color=red
+        58 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_18 {
+            color=blue
+            59 [label="Enter block"];
+            60 [label="Access qualifier /SomeEnum"];
+            61 [label="Access variable R|/SomeEnum.A1|"];
+            62 [label="Variable declaration: lval flag: R|SomeEnum|"];
+            subgraph cluster_19 {
+                color=blue
+                63 [label="Enter when"];
+                64 [label="Access variable R|<local>/flag|"];
+                65 [label="Check not null: R|<local>/flag|!!" style="filled" fillcolor=yellow];
+                subgraph cluster_20 {
+                    color=blue
+                    66 [label="Enter when branch condition "];
+                    67 [label="Exit $subj"];
+                    68 [label="Access qualifier /SomeEnum"];
+                    69 [label="Access variable R|/SomeEnum.A1|"];
+                    70 [label="Equality operator =="];
+                    71 [label="Exit when branch condition"];
+                }
+                subgraph cluster_21 {
+                    color=blue
+                    72 [label="Enter when branch condition "];
+                    73 [label="Exit $subj"];
+                    74 [label="Access qualifier /SomeEnum"];
+                    75 [label="Access variable R|/SomeEnum.A2|"];
+                    76 [label="Equality operator =="];
+                    77 [label="Exit when branch condition"];
+                }
+                78 [label="Enter when branch result"];
+                subgraph cluster_22 {
+                    color=blue
+                    79 [label="Enter block"];
+                    subgraph cluster_23 {
+                        color=blue
+                        80 [label="Function call arguments enter"];
+                        81 [label="Function call arguments exit"];
+                    }
+                    82 [label="Function call: R|/B.B|()" style="filled" fillcolor=yellow];
+                    83 [label="Exit block"];
+                }
+                84 [label="Exit when branch result"];
+                85 [label="Enter when branch result"];
+                subgraph cluster_24 {
+                    color=blue
+                    86 [label="Enter block"];
+                    subgraph cluster_25 {
+                        color=blue
+                        87 [label="Function call arguments enter"];
+                        88 [label="Function call arguments exit"];
+                    }
+                    89 [label="Function call: R|/B.B|()" style="filled" fillcolor=yellow];
+                    90 [label="Exit block"];
+                }
+                91 [label="Exit when branch result"];
+                92 [label="Exit when"];
+            }
+            93 [label="Variable declaration: lval b: R|B|"];
+            subgraph cluster_26 {
+                color=blue
+                94 [label="Function call arguments enter"];
+                95 [label="Access variable R|<local>/b|"];
+                96 [label="Function call arguments exit"];
+            }
+            97 [label="Function call: R|/takeB|(...)" style="filled" fillcolor=yellow];
+            98 [label="Exit block"];
+        }
+        99 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
     58 -> {59};
     59 -> {60};
     60 -> {61};
@@ -223,18 +253,18 @@ digraph exhaustiveWhenAndDNNType_kt {
     62 -> {63};
     63 -> {64};
     64 -> {65};
-    65 -> {66 77};
+    65 -> {66};
     66 -> {67};
     67 -> {68};
     68 -> {69};
     69 -> {70};
     70 -> {71};
-    71 -> {72};
+    71 -> {72 85};
     72 -> {73};
     73 -> {74};
     74 -> {75};
     75 -> {76};
-    76 -> {82};
+    76 -> {77};
     77 -> {78};
     78 -> {79};
     79 -> {80};
@@ -242,66 +272,10 @@ digraph exhaustiveWhenAndDNNType_kt {
     81 -> {82};
     82 -> {83};
     83 -> {84};
-    84 -> {85};
+    84 -> {92};
     85 -> {86};
     86 -> {87};
-
-    subgraph cluster_21 {
-        color=red
-        88 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_22 {
-            color=blue
-            89 [label="Enter block"];
-            90 [label="Access qualifier /SomeEnum"];
-            91 [label="Access variable R|/SomeEnum.A1|"];
-            92 [label="Variable declaration: lval flag: R|SomeEnum|"];
-            subgraph cluster_23 {
-                color=blue
-                93 [label="Enter when"];
-                94 [label="Access variable R|<local>/flag|"];
-                subgraph cluster_24 {
-                    color=blue
-                    95 [label="Enter when branch condition "];
-                    96 [label="Exit $subj"];
-                    97 [label="Access qualifier /SomeEnum"];
-                    98 [label="Access variable R|/SomeEnum.A1|"];
-                    99 [label="Equality operator =="];
-                    100 [label="Exit when branch condition"];
-                }
-                subgraph cluster_25 {
-                    color=blue
-                    101 [label="Enter when branch condition "];
-                    102 [label="Exit $subj"];
-                    103 [label="Access qualifier /SomeEnum"];
-                    104 [label="Access variable R|/SomeEnum.A2|"];
-                    105 [label="Equality operator =="];
-                    106 [label="Exit when branch condition"];
-                }
-                107 [label="Enter when branch result"];
-                subgraph cluster_26 {
-                    color=blue
-                    108 [label="Enter block"];
-                    109 [label="Function call: R|/B.B|()" style="filled" fillcolor=yellow];
-                    110 [label="Exit block"];
-                }
-                111 [label="Exit when branch result"];
-                112 [label="Enter when branch result"];
-                subgraph cluster_27 {
-                    color=blue
-                    113 [label="Enter block"];
-                    114 [label="Function call: R|/B.B|()" style="filled" fillcolor=yellow];
-                    115 [label="Exit block"];
-                }
-                116 [label="Exit when branch result"];
-                117 [label="Exit when"];
-            }
-            118 [label="Variable declaration: lval b: R|B|"];
-            119 [label="Access variable R|<local>/b|"];
-            120 [label="Function call: R|/takeB|(...)" style="filled" fillcolor=yellow];
-            121 [label="Exit block"];
-        }
-        122 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
+    87 -> {88};
     88 -> {89};
     89 -> {90};
     90 -> {91};
@@ -313,8 +287,79 @@ digraph exhaustiveWhenAndDNNType_kt {
     96 -> {97};
     97 -> {98};
     98 -> {99};
-    99 -> {100};
-    100 -> {101 112};
+
+    subgraph cluster_27 {
+        color=red
+        100 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_28 {
+            color=blue
+            101 [label="Enter block"];
+            102 [label="Access qualifier /SomeEnum"];
+            103 [label="Access variable R|/SomeEnum.A1|"];
+            104 [label="Variable declaration: lval flag: R|SomeEnum|"];
+            subgraph cluster_29 {
+                color=blue
+                105 [label="Enter when"];
+                106 [label="Access variable R|<local>/flag|"];
+                subgraph cluster_30 {
+                    color=blue
+                    107 [label="Enter when branch condition "];
+                    108 [label="Exit $subj"];
+                    109 [label="Access qualifier /SomeEnum"];
+                    110 [label="Access variable R|/SomeEnum.A1|"];
+                    111 [label="Equality operator =="];
+                    112 [label="Exit when branch condition"];
+                }
+                subgraph cluster_31 {
+                    color=blue
+                    113 [label="Enter when branch condition "];
+                    114 [label="Exit $subj"];
+                    115 [label="Access qualifier /SomeEnum"];
+                    116 [label="Access variable R|/SomeEnum.A2|"];
+                    117 [label="Equality operator =="];
+                    118 [label="Exit when branch condition"];
+                }
+                119 [label="Enter when branch result"];
+                subgraph cluster_32 {
+                    color=blue
+                    120 [label="Enter block"];
+                    subgraph cluster_33 {
+                        color=blue
+                        121 [label="Function call arguments enter"];
+                        122 [label="Function call arguments exit"];
+                    }
+                    123 [label="Function call: R|/B.B|()" style="filled" fillcolor=yellow];
+                    124 [label="Exit block"];
+                }
+                125 [label="Exit when branch result"];
+                126 [label="Enter when branch result"];
+                subgraph cluster_34 {
+                    color=blue
+                    127 [label="Enter block"];
+                    subgraph cluster_35 {
+                        color=blue
+                        128 [label="Function call arguments enter"];
+                        129 [label="Function call arguments exit"];
+                    }
+                    130 [label="Function call: R|/B.B|()" style="filled" fillcolor=yellow];
+                    131 [label="Exit block"];
+                }
+                132 [label="Exit when branch result"];
+                133 [label="Exit when"];
+            }
+            134 [label="Variable declaration: lval b: R|B|"];
+            subgraph cluster_36 {
+                color=blue
+                135 [label="Function call arguments enter"];
+                136 [label="Access variable R|<local>/b|"];
+                137 [label="Function call arguments exit"];
+            }
+            138 [label="Function call: R|/takeB|(...)" style="filled" fillcolor=yellow];
+            139 [label="Exit block"];
+        }
+        140 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
+    100 -> {101};
     101 -> {102};
     102 -> {103};
     103 -> {104};
@@ -325,8 +370,8 @@ digraph exhaustiveWhenAndDNNType_kt {
     108 -> {109};
     109 -> {110};
     110 -> {111};
-    111 -> {117};
-    112 -> {113};
+    111 -> {112};
+    112 -> {113 126};
     113 -> {114};
     114 -> {115};
     115 -> {116};
@@ -336,5 +381,23 @@ digraph exhaustiveWhenAndDNNType_kt {
     119 -> {120};
     120 -> {121};
     121 -> {122};
+    122 -> {123};
+    123 -> {124};
+    124 -> {125};
+    125 -> {133};
+    126 -> {127};
+    127 -> {128};
+    128 -> {129};
+    129 -> {130};
+    130 -> {131};
+    131 -> {132};
+    132 -> {133};
+    133 -> {134};
+    134 -> {135};
+    135 -> {136};
+    136 -> {137};
+    137 -> {138};
+    138 -> {139};
+    139 -> {140};
 
 }

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

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

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

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

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

@@ -61,20 +61,30 @@ digraph boundSmartcasts_kt {
                 subgraph cluster_9 {
                     color=blue
                     21 [label="Enter block"];
-                    22 [label="Access variable R|<local>/x|"];
-                    23 [label="Smart cast: R|<local>/x|"];
-                    24 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    25 [label="Access variable R|<local>/y|"];
-                    26 [label="Smart cast: R|<local>/y|"];
-                    27 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    28 [label="Exit block"];
+                    subgraph cluster_10 {
+                        color=blue
+                        22 [label="Function call arguments enter"];
+                        23 [label="Access variable R|<local>/x|"];
+                        24 [label="Smart cast: R|<local>/x|"];
+                        25 [label="Function call arguments exit"];
+                    }
+                    26 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    subgraph cluster_11 {
+                        color=blue
+                        27 [label="Function call arguments enter"];
+                        28 [label="Access variable R|<local>/y|"];
+                        29 [label="Smart cast: R|<local>/y|"];
+                        30 [label="Function call arguments exit"];
+                    }
+                    31 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    32 [label="Exit block"];
                 }
-                29 [label="Exit when branch result"];
-                30 [label="Exit when"];
+                33 [label="Exit when branch result"];
+                34 [label="Exit when"];
             }
-            31 [label="Exit block"];
+            35 [label="Exit block"];
         }
-        32 [label="Exit function test_1" style="filled" fillcolor=red];
+        36 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     10 -> {11};
     11 -> {12};
@@ -85,7 +95,7 @@ digraph boundSmartcasts_kt {
     16 -> {17};
     17 -> {18};
     18 -> {19 20};
-    19 -> {30};
+    19 -> {34};
     20 -> {21};
     21 -> {22};
     22 -> {23};
@@ -98,59 +108,69 @@ digraph boundSmartcasts_kt {
     29 -> {30};
     30 -> {31};
     31 -> {32};
-
-    subgraph cluster_10 {
-        color=red
-        33 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_11 {
-            color=blue
-            34 [label="Enter block"];
-            35 [label="Access variable R|<local>/x|"];
-            36 [label="Variable declaration: lval y: R|kotlin/Any|"];
-            subgraph cluster_12 {
-                color=blue
-                37 [label="Enter when"];
-                subgraph cluster_13 {
-                    color=blue
-                    38 [label="Enter when branch condition "];
-                    39 [label="Access variable R|<local>/y|"];
-                    40 [label="Type operator: (R|<local>/y| is R|A|)"];
-                    41 [label="Exit when branch condition"];
-                }
-                42 [label="Synthetic else branch"];
-                43 [label="Enter when branch result"];
-                subgraph cluster_14 {
-                    color=blue
-                    44 [label="Enter block"];
-                    45 [label="Access variable R|<local>/x|"];
-                    46 [label="Smart cast: R|<local>/x|"];
-                    47 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    48 [label="Access variable R|<local>/y|"];
-                    49 [label="Smart cast: R|<local>/y|"];
-                    50 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    51 [label="Exit block"];
-                }
-                52 [label="Exit when branch result"];
-                53 [label="Exit when"];
-            }
-            54 [label="Exit block"];
-        }
-        55 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
+    32 -> {33};
     33 -> {34};
     34 -> {35};
     35 -> {36};
-    36 -> {37};
+
+    subgraph cluster_12 {
+        color=red
+        37 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_13 {
+            color=blue
+            38 [label="Enter block"];
+            39 [label="Access variable R|<local>/x|"];
+            40 [label="Variable declaration: lval y: R|kotlin/Any|"];
+            subgraph cluster_14 {
+                color=blue
+                41 [label="Enter when"];
+                subgraph cluster_15 {
+                    color=blue
+                    42 [label="Enter when branch condition "];
+                    43 [label="Access variable R|<local>/y|"];
+                    44 [label="Type operator: (R|<local>/y| is R|A|)"];
+                    45 [label="Exit when branch condition"];
+                }
+                46 [label="Synthetic else branch"];
+                47 [label="Enter when branch result"];
+                subgraph cluster_16 {
+                    color=blue
+                    48 [label="Enter block"];
+                    subgraph cluster_17 {
+                        color=blue
+                        49 [label="Function call arguments enter"];
+                        50 [label="Access variable R|<local>/x|"];
+                        51 [label="Smart cast: R|<local>/x|"];
+                        52 [label="Function call arguments exit"];
+                    }
+                    53 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    subgraph cluster_18 {
+                        color=blue
+                        54 [label="Function call arguments enter"];
+                        55 [label="Access variable R|<local>/y|"];
+                        56 [label="Smart cast: R|<local>/y|"];
+                        57 [label="Function call arguments exit"];
+                    }
+                    58 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    59 [label="Exit block"];
+                }
+                60 [label="Exit when branch result"];
+                61 [label="Exit when"];
+            }
+            62 [label="Exit block"];
+        }
+        63 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
     37 -> {38};
     38 -> {39};
     39 -> {40};
     40 -> {41};
-    41 -> {42 43};
-    42 -> {53};
+    41 -> {42};
+    42 -> {43};
     43 -> {44};
     44 -> {45};
-    45 -> {46};
-    46 -> {47};
+    45 -> {46 47};
+    46 -> {61};
     47 -> {48};
     48 -> {49};
     49 -> {50};
@@ -159,70 +179,7 @@ digraph boundSmartcasts_kt {
     52 -> {53};
     53 -> {54};
     54 -> {55};
-
-    subgraph cluster_15 {
-        color=red
-        56 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_16 {
-            color=blue
-            57 [label="Enter block"];
-            58 [label="Access variable R|<local>/x|"];
-            59 [label="Variable declaration: lvar z: R|kotlin/Any|"];
-            subgraph cluster_17 {
-                color=blue
-                60 [label="Enter when"];
-                subgraph cluster_18 {
-                    color=blue
-                    61 [label="Enter when branch condition "];
-                    62 [label="Access variable R|<local>/x|"];
-                    63 [label="Type operator: (R|<local>/x| is R|A|)"];
-                    64 [label="Exit when branch condition"];
-                }
-                65 [label="Synthetic else branch"];
-                66 [label="Enter when branch result"];
-                subgraph cluster_19 {
-                    color=blue
-                    67 [label="Enter block"];
-                    68 [label="Access variable R|<local>/z|"];
-                    69 [label="Smart cast: R|<local>/z|"];
-                    70 [label="Function call: R|<local>/z|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    71 [label="Exit block"];
-                }
-                72 [label="Exit when branch result"];
-                73 [label="Exit when"];
-            }
-            74 [label="Access variable R|<local>/y|"];
-            75 [label="Assignment: R|<local>/z|"];
-            subgraph cluster_20 {
-                color=blue
-                76 [label="Enter when"];
-                subgraph cluster_21 {
-                    color=blue
-                    77 [label="Enter when branch condition "];
-                    78 [label="Access variable R|<local>/y|"];
-                    79 [label="Type operator: (R|<local>/y| is R|B|)"];
-                    80 [label="Exit when branch condition"];
-                }
-                81 [label="Synthetic else branch"];
-                82 [label="Enter when branch result"];
-                subgraph cluster_22 {
-                    color=blue
-                    83 [label="Enter block"];
-                    84 [label="Access variable R|<local>/z|"];
-                    85 [label="Smart cast: R|<local>/z|"];
-                    86 [label="Function call: R|<local>/z|.<Unresolved name: foo>#()" style="filled" fillcolor=yellow];
-                    87 [label="Access variable R|<local>/z|"];
-                    88 [label="Smart cast: R|<local>/z|"];
-                    89 [label="Function call: R|<local>/z|.R|/B.bar|()" style="filled" fillcolor=yellow];
-                    90 [label="Exit block"];
-                }
-                91 [label="Exit when branch result"];
-                92 [label="Exit when"];
-            }
-            93 [label="Exit block"];
-        }
-        94 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
+    55 -> {56};
     56 -> {57};
     57 -> {58};
     58 -> {59};
@@ -230,25 +187,103 @@ digraph boundSmartcasts_kt {
     60 -> {61};
     61 -> {62};
     62 -> {63};
-    63 -> {64};
-    64 -> {65 66};
-    65 -> {73};
+
+    subgraph cluster_19 {
+        color=red
+        64 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_20 {
+            color=blue
+            65 [label="Enter block"];
+            66 [label="Access variable R|<local>/x|"];
+            67 [label="Variable declaration: lvar z: R|kotlin/Any|"];
+            subgraph cluster_21 {
+                color=blue
+                68 [label="Enter when"];
+                subgraph cluster_22 {
+                    color=blue
+                    69 [label="Enter when branch condition "];
+                    70 [label="Access variable R|<local>/x|"];
+                    71 [label="Type operator: (R|<local>/x| is R|A|)"];
+                    72 [label="Exit when branch condition"];
+                }
+                73 [label="Synthetic else branch"];
+                74 [label="Enter when branch result"];
+                subgraph cluster_23 {
+                    color=blue
+                    75 [label="Enter block"];
+                    subgraph cluster_24 {
+                        color=blue
+                        76 [label="Function call arguments enter"];
+                        77 [label="Access variable R|<local>/z|"];
+                        78 [label="Smart cast: R|<local>/z|"];
+                        79 [label="Function call arguments exit"];
+                    }
+                    80 [label="Function call: R|<local>/z|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    81 [label="Exit block"];
+                }
+                82 [label="Exit when branch result"];
+                83 [label="Exit when"];
+            }
+            84 [label="Access variable R|<local>/y|"];
+            85 [label="Assignment: R|<local>/z|"];
+            subgraph cluster_25 {
+                color=blue
+                86 [label="Enter when"];
+                subgraph cluster_26 {
+                    color=blue
+                    87 [label="Enter when branch condition "];
+                    88 [label="Access variable R|<local>/y|"];
+                    89 [label="Type operator: (R|<local>/y| is R|B|)"];
+                    90 [label="Exit when branch condition"];
+                }
+                91 [label="Synthetic else branch"];
+                92 [label="Enter when branch result"];
+                subgraph cluster_27 {
+                    color=blue
+                    93 [label="Enter block"];
+                    subgraph cluster_28 {
+                        color=blue
+                        94 [label="Function call arguments enter"];
+                        95 [label="Access variable R|<local>/z|"];
+                        96 [label="Smart cast: R|<local>/z|"];
+                        97 [label="Function call arguments exit"];
+                    }
+                    98 [label="Function call: R|<local>/z|.<Unresolved name: foo>#()" style="filled" fillcolor=yellow];
+                    subgraph cluster_29 {
+                        color=blue
+                        99 [label="Function call arguments enter"];
+                        100 [label="Access variable R|<local>/z|"];
+                        101 [label="Smart cast: R|<local>/z|"];
+                        102 [label="Function call arguments exit"];
+                    }
+                    103 [label="Function call: R|<local>/z|.R|/B.bar|()" style="filled" fillcolor=yellow];
+                    104 [label="Exit block"];
+                }
+                105 [label="Exit when branch result"];
+                106 [label="Exit when"];
+            }
+            107 [label="Exit block"];
+        }
+        108 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
+    64 -> {65};
+    65 -> {66};
     66 -> {67};
     67 -> {68};
     68 -> {69};
     69 -> {70};
     70 -> {71};
     71 -> {72};
-    72 -> {73};
-    73 -> {74};
+    72 -> {73 74};
+    73 -> {83};
     74 -> {75};
     75 -> {76};
     76 -> {77};
     77 -> {78};
     78 -> {79};
     79 -> {80};
-    80 -> {81 82};
-    81 -> {92};
+    80 -> {81};
+    81 -> {82};
     82 -> {83};
     83 -> {84};
     84 -> {85};
@@ -257,58 +292,11 @@ digraph boundSmartcasts_kt {
     87 -> {88};
     88 -> {89};
     89 -> {90};
-    90 -> {91};
-    91 -> {92};
+    90 -> {91 92};
+    91 -> {106};
     92 -> {93};
     93 -> {94};
-
-    subgraph cluster_23 {
-        color=red
-        95 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_24 {
-            color=blue
-            96 [label="Enter block"];
-            97 [label="Const: Int(1)"];
-            98 [label="Variable declaration: lvar x: R|kotlin/Any|"];
-            99 [label="Access variable R|<local>/x|"];
-            100 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
-            101 [label="Access variable R|<local>/x|"];
-            102 [label="Smart cast: R|<local>/x|"];
-            103 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
-            104 [label="Access variable R|<local>/y|"];
-            105 [label="Assignment: R|<local>/x|"];
-            106 [label="Access variable R|<local>/x|"];
-            107 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()" style="filled" fillcolor=yellow];
-            subgraph cluster_25 {
-                color=blue
-                108 [label="Enter when"];
-                subgraph cluster_26 {
-                    color=blue
-                    109 [label="Enter when branch condition "];
-                    110 [label="Access variable R|<local>/y|"];
-                    111 [label="Type operator: (R|<local>/y| is R|A|)"];
-                    112 [label="Exit when branch condition"];
-                }
-                113 [label="Synthetic else branch"];
-                114 [label="Enter when branch result"];
-                subgraph cluster_27 {
-                    color=blue
-                    115 [label="Enter block"];
-                    116 [label="Access variable R|<local>/x|"];
-                    117 [label="Smart cast: R|<local>/x|"];
-                    118 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    119 [label="Access variable R|<local>/y|"];
-                    120 [label="Smart cast: R|<local>/y|"];
-                    121 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    122 [label="Exit block"];
-                }
-                123 [label="Exit when branch result"];
-                124 [label="Exit when"];
-            }
-            125 [label="Exit block"];
-        }
-        126 [label="Exit function test_4" style="filled" fillcolor=red];
-    }
+    94 -> {95};
     95 -> {96};
     96 -> {97};
     97 -> {98};
@@ -322,12 +310,79 @@ digraph boundSmartcasts_kt {
     105 -> {106};
     106 -> {107};
     107 -> {108};
-    108 -> {109};
+
+    subgraph cluster_30 {
+        color=red
+        109 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_31 {
+            color=blue
+            110 [label="Enter block"];
+            111 [label="Const: Int(1)"];
+            112 [label="Variable declaration: lvar x: R|kotlin/Any|"];
+            113 [label="Access variable R|<local>/x|"];
+            114 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
+            subgraph cluster_32 {
+                color=blue
+                115 [label="Function call arguments enter"];
+                116 [label="Access variable R|<local>/x|"];
+                117 [label="Smart cast: R|<local>/x|"];
+                118 [label="Function call arguments exit"];
+            }
+            119 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
+            120 [label="Access variable R|<local>/y|"];
+            121 [label="Assignment: R|<local>/x|"];
+            subgraph cluster_33 {
+                color=blue
+                122 [label="Function call arguments enter"];
+                123 [label="Access variable R|<local>/x|"];
+                124 [label="Function call arguments exit"];
+            }
+            125 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()" style="filled" fillcolor=yellow];
+            subgraph cluster_34 {
+                color=blue
+                126 [label="Enter when"];
+                subgraph cluster_35 {
+                    color=blue
+                    127 [label="Enter when branch condition "];
+                    128 [label="Access variable R|<local>/y|"];
+                    129 [label="Type operator: (R|<local>/y| is R|A|)"];
+                    130 [label="Exit when branch condition"];
+                }
+                131 [label="Synthetic else branch"];
+                132 [label="Enter when branch result"];
+                subgraph cluster_36 {
+                    color=blue
+                    133 [label="Enter block"];
+                    subgraph cluster_37 {
+                        color=blue
+                        134 [label="Function call arguments enter"];
+                        135 [label="Access variable R|<local>/x|"];
+                        136 [label="Smart cast: R|<local>/x|"];
+                        137 [label="Function call arguments exit"];
+                    }
+                    138 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    subgraph cluster_38 {
+                        color=blue
+                        139 [label="Function call arguments enter"];
+                        140 [label="Access variable R|<local>/y|"];
+                        141 [label="Smart cast: R|<local>/y|"];
+                        142 [label="Function call arguments exit"];
+                    }
+                    143 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    144 [label="Exit block"];
+                }
+                145 [label="Exit when branch result"];
+                146 [label="Exit when"];
+            }
+            147 [label="Exit block"];
+        }
+        148 [label="Exit function test_4" style="filled" fillcolor=red];
+    }
     109 -> {110};
     110 -> {111};
     111 -> {112};
-    112 -> {113 114};
-    113 -> {124};
+    112 -> {113};
+    113 -> {114};
     114 -> {115};
     115 -> {116};
     116 -> {117};
@@ -340,135 +395,124 @@ digraph boundSmartcasts_kt {
     123 -> {124};
     124 -> {125};
     125 -> {126};
-
-    subgraph cluster_28 {
-        color=red
-        127 [label="Enter class D" style="filled" fillcolor=red];
-        subgraph cluster_29 {
-            color=blue
-            128 [label="Enter property" style="filled" fillcolor=red];
-            129 [label="Access variable R|<local>/any|"];
-            130 [label="Exit property" style="filled" fillcolor=red];
-        }
-        subgraph cluster_30 {
-            color=blue
-            131 [label="Enter function <init>" style="filled" fillcolor=red];
-            132 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
-            133 [label="Exit function <init>" style="filled" fillcolor=red];
-        }
-        134 [label="Exit class D" style="filled" fillcolor=red];
-    }
-    127 -> {128} [color=green];
-    127 -> {134} [style=dotted];
-    127 -> {128 131} [style=dashed];
+    126 -> {127};
+    127 -> {128};
     128 -> {129};
     129 -> {130};
-    130 -> {131} [color=green];
-    131 -> {132};
+    130 -> {131 132};
+    131 -> {146};
     132 -> {133};
-    133 -> {134} [color=green];
-
-    subgraph cluster_31 {
-        color=red
-        135 [label="Enter function baz" style="filled" fillcolor=red];
-        subgraph cluster_32 {
-            color=blue
-            136 [label="Enter block"];
-            137 [label="Exit block"];
-        }
-        138 [label="Exit function baz" style="filled" fillcolor=red];
-    }
+    133 -> {134};
+    134 -> {135};
     135 -> {136};
     136 -> {137};
     137 -> {138};
-
-    subgraph cluster_33 {
-        color=red
-        139 [label="Enter function test_5" style="filled" fillcolor=red];
-        subgraph cluster_34 {
-            color=blue
-            140 [label="Enter block"];
-            141 [label="Access variable R|<local>/d|"];
-            142 [label="Access variable R|/D.any|"];
-            143 [label="Exit lhs of ?:"];
-            144 [label="Enter rhs of ?:"];
-            145 [label="Jump: ^test_5 Unit"];
-            146 [label="Stub" style="filled" fillcolor=gray];
-            147 [label="Lhs of ?: is not null"];
-            148 [label="Exit ?:"];
-            149 [label="Variable declaration: lval a: R|kotlin/Any|"];
-            150 [label="Access variable R|<local>/a|"];
-            151 [label="Function call: R|<local>/a|.R|/baz|()" style="filled" fillcolor=yellow];
-            152 [label="Access variable R|<local>/d|"];
-            153 [label="Access variable R|/D.any|"];
-            154 [label="Smart cast: R|<local>/d|.R|/D.any|"];
-            155 [label="Function call: R|<local>/d|.R|/D.any|.R|/baz|()" style="filled" fillcolor=yellow];
-            156 [label="Access variable R|<local>/a|"];
-            157 [label="Type operator: (R|<local>/a| as R|A|)"];
-            158 [label="Access variable R|<local>/a|"];
-            159 [label="Smart cast: R|<local>/a|"];
-            160 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
-            161 [label="Exit block"];
-        }
-        162 [label="Exit function test_5" style="filled" fillcolor=red];
-    }
+    138 -> {139};
     139 -> {140};
     140 -> {141};
     141 -> {142};
     142 -> {143};
-    143 -> {144 147};
+    143 -> {144};
     144 -> {145};
-    145 -> {162};
-    145 -> {146} [style=dotted];
-    146 -> {148} [style=dotted];
+    145 -> {146};
+    146 -> {147};
     147 -> {148};
-    148 -> {149};
-    149 -> {150};
+
+    subgraph cluster_39 {
+        color=red
+        149 [label="Enter class D" style="filled" fillcolor=red];
+        subgraph cluster_40 {
+            color=blue
+            150 [label="Enter property" style="filled" fillcolor=red];
+            151 [label="Access variable R|<local>/any|"];
+            152 [label="Exit property" style="filled" fillcolor=red];
+        }
+        subgraph cluster_41 {
+            color=blue
+            153 [label="Enter function <init>" style="filled" fillcolor=red];
+            154 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
+            155 [label="Exit function <init>" style="filled" fillcolor=red];
+        }
+        156 [label="Exit class D" style="filled" fillcolor=red];
+    }
+    149 -> {150} [color=green];
+    149 -> {156} [style=dotted];
+    149 -> {150 153} [style=dashed];
     150 -> {151};
     151 -> {152};
-    152 -> {153};
+    152 -> {153} [color=green];
     153 -> {154};
     154 -> {155};
-    155 -> {156};
-    156 -> {157};
+    155 -> {156} [color=green];
+
+    subgraph cluster_42 {
+        color=red
+        157 [label="Enter function baz" style="filled" fillcolor=red];
+        subgraph cluster_43 {
+            color=blue
+            158 [label="Enter block"];
+            159 [label="Exit block"];
+        }
+        160 [label="Exit function baz" style="filled" fillcolor=red];
+    }
     157 -> {158};
     158 -> {159};
     159 -> {160};
-    160 -> {161};
-    161 -> {162};
 
-    subgraph cluster_35 {
+    subgraph cluster_44 {
         color=red
-        163 [label="Enter function test_6" style="filled" fillcolor=red];
-        subgraph cluster_36 {
+        161 [label="Enter function test_5" style="filled" fillcolor=red];
+        subgraph cluster_45 {
             color=blue
-            164 [label="Enter block"];
-            165 [label="Access variable R|<local>/d1|"];
-            166 [label="Access variable R|/D.any|"];
-            167 [label="Variable declaration: lval a: R|kotlin/Any?|"];
-            168 [label="Access variable R|<local>/a|"];
-            169 [label="Type operator: (R|<local>/a| as R|A|)"];
-            170 [label="Access variable R|<local>/a|"];
-            171 [label="Smart cast: R|<local>/a|"];
-            172 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
-            173 [label="Access variable R|<local>/d1|"];
-            174 [label="Access variable R|/D.any|"];
-            175 [label="Smart cast: R|<local>/d1|.R|/D.any|"];
-            176 [label="Function call: R|<local>/d1|.R|/D.any|.R|/A.foo|()" style="filled" fillcolor=yellow];
-            177 [label="Access variable R|<local>/d1|"];
-            178 [label="Access variable R|/D.any|"];
-            179 [label="Smart cast: R|<local>/d1|.R|/D.any|"];
-            180 [label="Function call: R|<local>/d1|.R|/D.any|.R|/baz|()" style="filled" fillcolor=yellow];
-            181 [label="Exit block"];
+            162 [label="Enter block"];
+            163 [label="Access variable R|<local>/d|"];
+            164 [label="Access variable R|/D.any|"];
+            165 [label="Exit lhs of ?:"];
+            166 [label="Enter rhs of ?:"];
+            167 [label="Jump: ^test_5 Unit"];
+            168 [label="Stub" style="filled" fillcolor=gray];
+            169 [label="Lhs of ?: is not null"];
+            170 [label="Exit ?:"];
+            171 [label="Variable declaration: lval a: R|kotlin/Any|"];
+            subgraph cluster_46 {
+                color=blue
+                172 [label="Function call arguments enter"];
+                173 [label="Access variable R|<local>/a|"];
+                174 [label="Function call arguments exit"];
+            }
+            175 [label="Function call: R|<local>/a|.R|/baz|()" style="filled" fillcolor=yellow];
+            subgraph cluster_47 {
+                color=blue
+                176 [label="Function call arguments enter"];
+                177 [label="Access variable R|<local>/d|"];
+                178 [label="Access variable R|/D.any|"];
+                179 [label="Smart cast: R|<local>/d|.R|/D.any|"];
+                180 [label="Function call arguments exit"];
+            }
+            181 [label="Function call: R|<local>/d|.R|/D.any|.R|/baz|()" style="filled" fillcolor=yellow];
+            182 [label="Access variable R|<local>/a|"];
+            183 [label="Type operator: (R|<local>/a| as R|A|)"];
+            subgraph cluster_48 {
+                color=blue
+                184 [label="Function call arguments enter"];
+                185 [label="Access variable R|<local>/a|"];
+                186 [label="Smart cast: R|<local>/a|"];
+                187 [label="Function call arguments exit"];
+            }
+            188 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
+            189 [label="Exit block"];
         }
-        182 [label="Exit function test_6" style="filled" fillcolor=red];
+        190 [label="Exit function test_5" style="filled" fillcolor=red];
     }
+    161 -> {162};
+    162 -> {163};
     163 -> {164};
     164 -> {165};
-    165 -> {166};
+    165 -> {166 169};
     166 -> {167};
-    167 -> {168};
-    168 -> {169};
+    167 -> {190};
+    167 -> {168} [style=dotted];
+    168 -> {170} [style=dotted];
     169 -> {170};
     170 -> {171};
     171 -> {172};
@@ -482,45 +526,56 @@ digraph boundSmartcasts_kt {
     179 -> {180};
     180 -> {181};
     181 -> {182};
-
-    subgraph cluster_37 {
-        color=red
-        183 [label="Enter function test_7" style="filled" fillcolor=red];
-        subgraph cluster_38 {
-            color=blue
-            184 [label="Enter block"];
-            185 [label="Access variable R|<local>/d1|"];
-            186 [label="Enter safe call"];
-            187 [label="Access variable R|/D.any|"];
-            188 [label="Exit safe call"];
-            189 [label="Variable declaration: lval a: R|kotlin/Any?|"];
-            190 [label="Access variable R|<local>/d2|"];
-            191 [label="Enter safe call"];
-            192 [label="Access variable R|/D.any|"];
-            193 [label="Exit safe call"];
-            194 [label="Variable declaration: lval b: R|kotlin/Any?|"];
-            195 [label="Access variable R|<local>/a|"];
-            196 [label="Type operator: (R|<local>/a| as R|A|)"];
-            197 [label="Access variable R|<local>/a|"];
-            198 [label="Smart cast: R|<local>/a|"];
-            199 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
-            200 [label="Access variable R|<local>/b|"];
-            201 [label="Type operator: (R|<local>/b| as R|B|)"];
-            202 [label="Access variable R|<local>/b|"];
-            203 [label="Smart cast: R|<local>/b|"];
-            204 [label="Function call: R|<local>/b|.R|/B.bar|()" style="filled" fillcolor=yellow];
-            205 [label="Exit block"];
-        }
-        206 [label="Exit function test_7" style="filled" fillcolor=red];
-    }
+    182 -> {183};
     183 -> {184};
     184 -> {185};
-    185 -> {186 188};
+    185 -> {186};
     186 -> {187};
     187 -> {188};
     188 -> {189};
     189 -> {190};
-    190 -> {191 193};
+
+    subgraph cluster_49 {
+        color=red
+        191 [label="Enter function test_6" style="filled" fillcolor=red];
+        subgraph cluster_50 {
+            color=blue
+            192 [label="Enter block"];
+            193 [label="Access variable R|<local>/d1|"];
+            194 [label="Access variable R|/D.any|"];
+            195 [label="Variable declaration: lval a: R|kotlin/Any?|"];
+            196 [label="Access variable R|<local>/a|"];
+            197 [label="Type operator: (R|<local>/a| as R|A|)"];
+            subgraph cluster_51 {
+                color=blue
+                198 [label="Function call arguments enter"];
+                199 [label="Access variable R|<local>/a|"];
+                200 [label="Smart cast: R|<local>/a|"];
+                201 [label="Function call arguments exit"];
+            }
+            202 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
+            subgraph cluster_52 {
+                color=blue
+                203 [label="Function call arguments enter"];
+                204 [label="Access variable R|<local>/d1|"];
+                205 [label="Access variable R|/D.any|"];
+                206 [label="Smart cast: R|<local>/d1|.R|/D.any|"];
+                207 [label="Function call arguments exit"];
+            }
+            208 [label="Function call: R|<local>/d1|.R|/D.any|.R|/A.foo|()" style="filled" fillcolor=yellow];
+            subgraph cluster_53 {
+                color=blue
+                209 [label="Function call arguments enter"];
+                210 [label="Access variable R|<local>/d1|"];
+                211 [label="Access variable R|/D.any|"];
+                212 [label="Smart cast: R|<local>/d1|.R|/D.any|"];
+                213 [label="Function call arguments exit"];
+            }
+            214 [label="Function call: R|<local>/d1|.R|/D.any|.R|/baz|()" style="filled" fillcolor=yellow];
+            215 [label="Exit block"];
+        }
+        216 [label="Exit function test_6" style="filled" fillcolor=red];
+    }
     191 -> {192};
     192 -> {193};
     193 -> {194};
@@ -536,5 +591,83 @@ digraph boundSmartcasts_kt {
     203 -> {204};
     204 -> {205};
     205 -> {206};
+    206 -> {207};
+    207 -> {208};
+    208 -> {209};
+    209 -> {210};
+    210 -> {211};
+    211 -> {212};
+    212 -> {213};
+    213 -> {214};
+    214 -> {215};
+    215 -> {216};
+
+    subgraph cluster_54 {
+        color=red
+        217 [label="Enter function test_7" style="filled" fillcolor=red];
+        subgraph cluster_55 {
+            color=blue
+            218 [label="Enter block"];
+            219 [label="Access variable R|<local>/d1|"];
+            220 [label="Enter safe call"];
+            221 [label="Access variable R|/D.any|"];
+            222 [label="Exit safe call"];
+            223 [label="Variable declaration: lval a: R|kotlin/Any?|"];
+            224 [label="Access variable R|<local>/d2|"];
+            225 [label="Enter safe call"];
+            226 [label="Access variable R|/D.any|"];
+            227 [label="Exit safe call"];
+            228 [label="Variable declaration: lval b: R|kotlin/Any?|"];
+            229 [label="Access variable R|<local>/a|"];
+            230 [label="Type operator: (R|<local>/a| as R|A|)"];
+            subgraph cluster_56 {
+                color=blue
+                231 [label="Function call arguments enter"];
+                232 [label="Access variable R|<local>/a|"];
+                233 [label="Smart cast: R|<local>/a|"];
+                234 [label="Function call arguments exit"];
+            }
+            235 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
+            236 [label="Access variable R|<local>/b|"];
+            237 [label="Type operator: (R|<local>/b| as R|B|)"];
+            subgraph cluster_57 {
+                color=blue
+                238 [label="Function call arguments enter"];
+                239 [label="Access variable R|<local>/b|"];
+                240 [label="Smart cast: R|<local>/b|"];
+                241 [label="Function call arguments exit"];
+            }
+            242 [label="Function call: R|<local>/b|.R|/B.bar|()" style="filled" fillcolor=yellow];
+            243 [label="Exit block"];
+        }
+        244 [label="Exit function test_7" style="filled" fillcolor=red];
+    }
+    217 -> {218};
+    218 -> {219};
+    219 -> {220 222};
+    220 -> {221};
+    221 -> {222};
+    222 -> {223};
+    223 -> {224};
+    224 -> {225 227};
+    225 -> {226};
+    226 -> {227};
+    227 -> {228};
+    228 -> {229};
+    229 -> {230};
+    230 -> {231};
+    231 -> {232};
+    232 -> {233};
+    233 -> {234};
+    234 -> {235};
+    235 -> {236};
+    236 -> {237};
+    237 -> {238};
+    238 -> {239};
+    239 -> {240};
+    240 -> {241};
+    241 -> {242};
+    242 -> {243};
+    243 -> {244};
 
 }

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

@@ -91,38 +91,43 @@ digraph functionCallBound_kt {
                     26 [label="Access variable R|<local>/base|"];
                     27 [label="Type operator: (R|<local>/base| as? R|Sub|)"];
                     28 [label="Enter safe call"];
-                    29 [label="Function call: $subj$.R|/isOk|()" style="filled" fillcolor=yellow];
-                    30 [label="Exit safe call"];
-                    31 [label="Const: Boolean(true)"];
-                    32 [label="Equality operator =="];
-                    33 [label="Exit when branch condition"];
-                }
-                subgraph cluster_12 {
-                    color=blue
-                    34 [label="Enter when branch condition else"];
+                    subgraph cluster_12 {
+                        color=blue
+                        29 [label="Function call arguments enter"];
+                        30 [label="Function call arguments exit"];
+                    }
+                    31 [label="Function call: $subj$.R|/isOk|()" style="filled" fillcolor=yellow];
+                    32 [label="Exit safe call"];
+                    33 [label="Const: Boolean(true)"];
+                    34 [label="Equality operator =="];
                     35 [label="Exit when branch condition"];
                 }
-                36 [label="Enter when branch result"];
                 subgraph cluster_13 {
                     color=blue
-                    37 [label="Enter block"];
-                    38 [label="Access variable R|<local>/base|"];
-                    39 [label="Exit block"];
+                    36 [label="Enter when branch condition else"];
+                    37 [label="Exit when branch condition"];
                 }
-                40 [label="Exit when branch result"];
-                41 [label="Enter when branch result"];
+                38 [label="Enter when branch result"];
                 subgraph cluster_14 {
                     color=blue
-                    42 [label="Enter block"];
-                    43 [label="Access variable R|<local>/base|"];
-                    44 [label="Smart cast: R|<local>/base|"];
-                    45 [label="Access variable R|/Sub.data|"];
-                    46 [label="Exit block"];
+                    39 [label="Enter block"];
+                    40 [label="Access variable R|<local>/base|"];
+                    41 [label="Exit block"];
                 }
-                47 [label="Exit when branch result"];
-                48 [label="Exit when"];
+                42 [label="Exit when branch result"];
+                43 [label="Enter when branch result"];
+                subgraph cluster_15 {
+                    color=blue
+                    44 [label="Enter block"];
+                    45 [label="Access variable R|<local>/base|"];
+                    46 [label="Smart cast: R|<local>/base|"];
+                    47 [label="Access variable R|/Sub.data|"];
+                    48 [label="Exit block"];
+                }
+                49 [label="Exit when branch result"];
+                50 [label="Exit when"];
             }
-            49 [label="Jump: ^check when () {
+            51 [label="Jump: ^check when () {
     ==((R|<local>/base| as? R|Sub|)?.{ $subj$.R|/isOk|() }, Boolean(true)) ->  {
         R|<local>/base|.R|/Sub.data|
     }
@@ -131,41 +136,43 @@ digraph functionCallBound_kt {
     }
 }
 "];
-            50 [label="Stub" style="filled" fillcolor=gray];
-            51 [label="Exit block" style="filled" fillcolor=gray];
+            52 [label="Stub" style="filled" fillcolor=gray];
+            53 [label="Exit block" style="filled" fillcolor=gray];
         }
-        52 [label="Exit function check" style="filled" fillcolor=red];
+        54 [label="Exit function check" style="filled" fillcolor=red];
     }
     22 -> {23};
     23 -> {24};
     24 -> {25};
     25 -> {26};
     26 -> {27};
-    27 -> {28 30};
+    27 -> {28 32};
     28 -> {29};
     29 -> {30};
     30 -> {31};
     31 -> {32};
     32 -> {33};
-    33 -> {34 41};
+    33 -> {34};
     34 -> {35};
-    35 -> {36};
+    35 -> {36 43};
     36 -> {37};
     37 -> {38};
     38 -> {39};
     39 -> {40};
-    40 -> {48};
+    40 -> {41};
     41 -> {42};
-    42 -> {43};
+    42 -> {50};
     43 -> {44};
     44 -> {45};
     45 -> {46};
     46 -> {47};
     47 -> {48};
     48 -> {49};
-    49 -> {52};
-    49 -> {50} [style=dotted];
-    50 -> {51} [style=dotted];
+    49 -> {50};
+    50 -> {51};
+    51 -> {54};
     51 -> {52} [style=dotted];
+    52 -> {53} [style=dotted];
+    53 -> {54} [style=dotted];
 
 }

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

@@ -55,20 +55,30 @@ digraph casts_kt {
                 subgraph cluster_7 {
                     color=blue
                     20 [label="Enter block"];
-                    21 [label="Access variable R|<local>/x|"];
-                    22 [label="Smart cast: R|<local>/x|"];
-                    23 [label="Function call: R|<local>/x|.R|kotlin/Boolean.not|()" style="filled" fillcolor=yellow];
-                    24 [label="Exit block"];
+                    subgraph cluster_8 {
+                        color=blue
+                        21 [label="Function call arguments enter"];
+                        22 [label="Access variable R|<local>/x|"];
+                        23 [label="Smart cast: R|<local>/x|"];
+                        24 [label="Function call arguments exit"];
+                    }
+                    25 [label="Function call: R|<local>/x|.R|kotlin/Boolean.not|()" style="filled" fillcolor=yellow];
+                    26 [label="Exit block"];
                 }
-                25 [label="Exit when branch result"];
-                26 [label="Exit when"];
+                27 [label="Exit when branch result"];
+                28 [label="Exit when"];
             }
-            27 [label="Access variable R|<local>/x|"];
-            28 [label="Smart cast: R|<local>/x|"];
-            29 [label="Function call: R|<local>/x|.R|kotlin/Boolean.not|()" style="filled" fillcolor=yellow];
-            30 [label="Exit block"];
+            subgraph cluster_9 {
+                color=blue
+                29 [label="Function call arguments enter"];
+                30 [label="Access variable R|<local>/x|"];
+                31 [label="Smart cast: R|<local>/x|"];
+                32 [label="Function call arguments exit"];
+            }
+            33 [label="Function call: R|<local>/x|.R|kotlin/Boolean.not|()" style="filled" fillcolor=yellow];
+            34 [label="Exit block"];
         }
-        31 [label="Exit function test_2" style="filled" fillcolor=red];
+        35 [label="Exit function test_2" style="filled" fillcolor=red];
     }
     11 -> {12};
     12 -> {13};
@@ -77,7 +87,7 @@ digraph casts_kt {
     15 -> {16};
     16 -> {17};
     17 -> {18 19};
-    18 -> {26};
+    18 -> {28};
     19 -> {20};
     20 -> {21};
     21 -> {22};
@@ -90,134 +100,164 @@ digraph casts_kt {
     28 -> {29};
     29 -> {30};
     30 -> {31};
-
-    subgraph cluster_8 {
-        color=red
-        32 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_9 {
-            color=blue
-            33 [label="Enter block"];
-            subgraph cluster_10 {
-                color=blue
-                34 [label="Enter when"];
-                subgraph cluster_11 {
-                    color=blue
-                    35 [label="Enter when branch condition "];
-                    subgraph cluster_12 {
-                        color=blue
-                        36 [label="Enter &&"];
-                        37 [label="Access variable R|<local>/b|"];
-                        38 [label="Exit left part of &&"];
-                        39 [label="Enter right part of &&"];
-                        40 [label="Access variable R|<local>/x|"];
-                        41 [label="Type operator: (R|<local>/x| as R|kotlin/Boolean|)"];
-                        42 [label="Exit &&"];
-                    }
-                    43 [label="Exit when branch condition"];
-                }
-                44 [label="Synthetic else branch"];
-                45 [label="Enter when branch result"];
-                subgraph cluster_13 {
-                    color=blue
-                    46 [label="Enter block"];
-                    47 [label="Access variable R|<local>/x|"];
-                    48 [label="Smart cast: R|<local>/x|"];
-                    49 [label="Function call: R|<local>/x|.R|kotlin/Boolean.not|()" style="filled" fillcolor=yellow];
-                    50 [label="Exit block"];
-                }
-                51 [label="Exit when branch result"];
-                52 [label="Exit when"];
-            }
-            53 [label="Access variable R|<local>/x|"];
-            54 [label="Function call: R|<local>/x|.<Unresolved name: not>#()" style="filled" fillcolor=yellow];
-            subgraph cluster_14 {
-                color=blue
-                55 [label="Enter when"];
-                subgraph cluster_15 {
-                    color=blue
-                    56 [label="Enter when branch condition "];
-                    subgraph cluster_16 {
-                        color=blue
-                        57 [label="Enter &&"];
-                        58 [label="Access variable R|<local>/b|"];
-                        59 [label="Exit left part of &&"];
-                        60 [label="Enter right part of &&"];
-                        61 [label="Access variable R|<local>/x|"];
-                        62 [label="Type operator: (R|<local>/x| as R|kotlin/Boolean|)"];
-                        63 [label="Const: Boolean(true)"];
-                        64 [label="Equality operator =="];
-                        65 [label="Exit &&"];
-                    }
-                    66 [label="Exit when branch condition"];
-                }
-                67 [label="Synthetic else branch"];
-                68 [label="Enter when branch result"];
-                subgraph cluster_17 {
-                    color=blue
-                    69 [label="Enter block"];
-                    70 [label="Access variable R|<local>/x|"];
-                    71 [label="Smart cast: R|<local>/x|"];
-                    72 [label="Function call: R|<local>/x|.R|kotlin/Boolean.not|()" style="filled" fillcolor=yellow];
-                    73 [label="Exit block"];
-                }
-                74 [label="Exit when branch result"];
-                75 [label="Exit when"];
-            }
-            76 [label="Access variable R|<local>/x|"];
-            77 [label="Function call: R|<local>/x|.<Unresolved name: not>#()" style="filled" fillcolor=yellow];
-            subgraph cluster_18 {
-                color=blue
-                78 [label="Enter when"];
-                subgraph cluster_19 {
-                    color=blue
-                    79 [label="Enter when branch condition "];
-                    subgraph cluster_20 {
-                        color=blue
-                        80 [label="Enter ||"];
-                        81 [label="Access variable R|<local>/b|"];
-                        82 [label="Exit left part of ||"];
-                        83 [label="Enter right part of ||"];
-                        84 [label="Access variable R|<local>/x|"];
-                        85 [label="Type operator: (R|<local>/x| as R|kotlin/Boolean|)"];
-                        86 [label="Exit ||"];
-                    }
-                    87 [label="Exit when branch condition"];
-                }
-                88 [label="Synthetic else branch"];
-                89 [label="Enter when branch result"];
-                subgraph cluster_21 {
-                    color=blue
-                    90 [label="Enter block"];
-                    91 [label="Access variable R|<local>/x|"];
-                    92 [label="Function call: R|<local>/x|.<Unresolved name: not>#()" style="filled" fillcolor=yellow];
-                    93 [label="Exit block"];
-                }
-                94 [label="Exit when branch result"];
-                95 [label="Exit when"];
-            }
-            96 [label="Access variable R|<local>/x|"];
-            97 [label="Function call: R|<local>/x|.<Unresolved name: not>#()" style="filled" fillcolor=yellow];
-            98 [label="Exit block"];
-        }
-        99 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
+    31 -> {32};
     32 -> {33};
     33 -> {34};
     34 -> {35};
-    35 -> {36};
+
+    subgraph cluster_10 {
+        color=red
+        36 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_11 {
+            color=blue
+            37 [label="Enter block"];
+            subgraph cluster_12 {
+                color=blue
+                38 [label="Enter when"];
+                subgraph cluster_13 {
+                    color=blue
+                    39 [label="Enter when branch condition "];
+                    subgraph cluster_14 {
+                        color=blue
+                        40 [label="Enter &&"];
+                        41 [label="Access variable R|<local>/b|"];
+                        42 [label="Exit left part of &&"];
+                        43 [label="Enter right part of &&"];
+                        44 [label="Access variable R|<local>/x|"];
+                        45 [label="Type operator: (R|<local>/x| as R|kotlin/Boolean|)"];
+                        46 [label="Exit &&"];
+                    }
+                    47 [label="Exit when branch condition"];
+                }
+                48 [label="Synthetic else branch"];
+                49 [label="Enter when branch result"];
+                subgraph cluster_15 {
+                    color=blue
+                    50 [label="Enter block"];
+                    subgraph cluster_16 {
+                        color=blue
+                        51 [label="Function call arguments enter"];
+                        52 [label="Access variable R|<local>/x|"];
+                        53 [label="Smart cast: R|<local>/x|"];
+                        54 [label="Function call arguments exit"];
+                    }
+                    55 [label="Function call: R|<local>/x|.R|kotlin/Boolean.not|()" style="filled" fillcolor=yellow];
+                    56 [label="Exit block"];
+                }
+                57 [label="Exit when branch result"];
+                58 [label="Exit when"];
+            }
+            subgraph cluster_17 {
+                color=blue
+                59 [label="Function call arguments enter"];
+                60 [label="Access variable R|<local>/x|"];
+                61 [label="Function call arguments exit"];
+            }
+            62 [label="Function call: R|<local>/x|.<Unresolved name: not>#()" style="filled" fillcolor=yellow];
+            subgraph cluster_18 {
+                color=blue
+                63 [label="Enter when"];
+                subgraph cluster_19 {
+                    color=blue
+                    64 [label="Enter when branch condition "];
+                    subgraph cluster_20 {
+                        color=blue
+                        65 [label="Enter &&"];
+                        66 [label="Access variable R|<local>/b|"];
+                        67 [label="Exit left part of &&"];
+                        68 [label="Enter right part of &&"];
+                        69 [label="Access variable R|<local>/x|"];
+                        70 [label="Type operator: (R|<local>/x| as R|kotlin/Boolean|)"];
+                        71 [label="Const: Boolean(true)"];
+                        72 [label="Equality operator =="];
+                        73 [label="Exit &&"];
+                    }
+                    74 [label="Exit when branch condition"];
+                }
+                75 [label="Synthetic else branch"];
+                76 [label="Enter when branch result"];
+                subgraph cluster_21 {
+                    color=blue
+                    77 [label="Enter block"];
+                    subgraph cluster_22 {
+                        color=blue
+                        78 [label="Function call arguments enter"];
+                        79 [label="Access variable R|<local>/x|"];
+                        80 [label="Smart cast: R|<local>/x|"];
+                        81 [label="Function call arguments exit"];
+                    }
+                    82 [label="Function call: R|<local>/x|.R|kotlin/Boolean.not|()" style="filled" fillcolor=yellow];
+                    83 [label="Exit block"];
+                }
+                84 [label="Exit when branch result"];
+                85 [label="Exit when"];
+            }
+            subgraph cluster_23 {
+                color=blue
+                86 [label="Function call arguments enter"];
+                87 [label="Access variable R|<local>/x|"];
+                88 [label="Function call arguments exit"];
+            }
+            89 [label="Function call: R|<local>/x|.<Unresolved name: not>#()" style="filled" fillcolor=yellow];
+            subgraph cluster_24 {
+                color=blue
+                90 [label="Enter when"];
+                subgraph cluster_25 {
+                    color=blue
+                    91 [label="Enter when branch condition "];
+                    subgraph cluster_26 {
+                        color=blue
+                        92 [label="Enter ||"];
+                        93 [label="Access variable R|<local>/b|"];
+                        94 [label="Exit left part of ||"];
+                        95 [label="Enter right part of ||"];
+                        96 [label="Access variable R|<local>/x|"];
+                        97 [label="Type operator: (R|<local>/x| as R|kotlin/Boolean|)"];
+                        98 [label="Exit ||"];
+                    }
+                    99 [label="Exit when branch condition"];
+                }
+                100 [label="Synthetic else branch"];
+                101 [label="Enter when branch result"];
+                subgraph cluster_27 {
+                    color=blue
+                    102 [label="Enter block"];
+                    subgraph cluster_28 {
+                        color=blue
+                        103 [label="Function call arguments enter"];
+                        104 [label="Access variable R|<local>/x|"];
+                        105 [label="Function call arguments exit"];
+                    }
+                    106 [label="Function call: R|<local>/x|.<Unresolved name: not>#()" style="filled" fillcolor=yellow];
+                    107 [label="Exit block"];
+                }
+                108 [label="Exit when branch result"];
+                109 [label="Exit when"];
+            }
+            subgraph cluster_29 {
+                color=blue
+                110 [label="Function call arguments enter"];
+                111 [label="Access variable R|<local>/x|"];
+                112 [label="Function call arguments exit"];
+            }
+            113 [label="Function call: R|<local>/x|.<Unresolved name: not>#()" style="filled" fillcolor=yellow];
+            114 [label="Exit block"];
+        }
+        115 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
     36 -> {37};
     37 -> {38};
-    38 -> {39 42};
+    38 -> {39};
     39 -> {40};
     40 -> {41};
     41 -> {42};
-    42 -> {43};
-    43 -> {44 45};
-    44 -> {52};
+    42 -> {43 46};
+    43 -> {44};
+    44 -> {45};
     45 -> {46};
     46 -> {47};
-    47 -> {48};
-    48 -> {49};
+    47 -> {48 49};
+    48 -> {58};
     49 -> {50};
     50 -> {51};
     51 -> {52};
@@ -228,138 +268,48 @@ digraph casts_kt {
     56 -> {57};
     57 -> {58};
     58 -> {59};
-    59 -> {60 65};
+    59 -> {60};
     60 -> {61};
     61 -> {62};
     62 -> {63};
     63 -> {64};
     64 -> {65};
     65 -> {66};
-    66 -> {67 68};
-    67 -> {75};
+    66 -> {67};
+    67 -> {68 73};
     68 -> {69};
     69 -> {70};
     70 -> {71};
     71 -> {72};
     72 -> {73};
     73 -> {74};
-    74 -> {75};
-    75 -> {76};
+    74 -> {75 76};
+    75 -> {85};
     76 -> {77};
     77 -> {78};
     78 -> {79};
     79 -> {80};
     80 -> {81};
     81 -> {82};
-    82 -> {83 86};
+    82 -> {83};
     83 -> {84};
     84 -> {85};
     85 -> {86};
     86 -> {87};
-    87 -> {88 89};
-    88 -> {95};
+    87 -> {88};
+    88 -> {89};
     89 -> {90};
     90 -> {91};
     91 -> {92};
     92 -> {93};
     93 -> {94};
-    94 -> {95};
+    94 -> {95 98};
     95 -> {96};
     96 -> {97};
     97 -> {98};
     98 -> {99};
-
-    subgraph cluster_22 {
-        color=red
-        100 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_23 {
-            color=blue
-            101 [label="Enter block"];
-            subgraph cluster_24 {
-                color=blue
-                102 [label="Enter when"];
-                subgraph cluster_25 {
-                    color=blue
-                    103 [label="Enter when branch condition "];
-                    104 [label="Access variable R|<local>/b|"];
-                    105 [label="Type operator: (R|<local>/b| as? R|kotlin/Boolean|)"];
-                    106 [label="Const: Null(null)"];
-                    107 [label="Equality operator !="];
-                    108 [label="Exit when branch condition"];
-                }
-                subgraph cluster_26 {
-                    color=blue
-                    109 [label="Enter when branch condition else"];
-                    110 [label="Exit when branch condition"];
-                }
-                111 [label="Enter when branch result"];
-                subgraph cluster_27 {
-                    color=blue
-                    112 [label="Enter block"];
-                    113 [label="Access variable R|<local>/b|"];
-                    114 [label="Function call: R|<local>/b|.<Unresolved name: not>#()" style="filled" fillcolor=yellow];
-                    115 [label="Exit block"];
-                }
-                116 [label="Exit when branch result"];
-                117 [label="Enter when branch result"];
-                subgraph cluster_28 {
-                    color=blue
-                    118 [label="Enter block"];
-                    119 [label="Access variable R|<local>/b|"];
-                    120 [label="Smart cast: R|<local>/b|"];
-                    121 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()" style="filled" fillcolor=yellow];
-                    122 [label="Exit block"];
-                }
-                123 [label="Exit when branch result"];
-                124 [label="Exit when"];
-            }
-            125 [label="Access variable R|<local>/b|"];
-            126 [label="Function call: R|<local>/b|.<Unresolved name: not>#()" style="filled" fillcolor=yellow];
-            subgraph cluster_29 {
-                color=blue
-                127 [label="Enter when"];
-                subgraph cluster_30 {
-                    color=blue
-                    128 [label="Enter when branch condition "];
-                    129 [label="Access variable R|<local>/b|"];
-                    130 [label="Type operator: (R|<local>/b| as? R|kotlin/Boolean|)"];
-                    131 [label="Const: Null(null)"];
-                    132 [label="Equality operator =="];
-                    133 [label="Exit when branch condition"];
-                }
-                subgraph cluster_31 {
-                    color=blue
-                    134 [label="Enter when branch condition else"];
-                    135 [label="Exit when branch condition"];
-                }
-                136 [label="Enter when branch result"];
-                subgraph cluster_32 {
-                    color=blue
-                    137 [label="Enter block"];
-                    138 [label="Access variable R|<local>/b|"];
-                    139 [label="Smart cast: R|<local>/b|"];
-                    140 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()" style="filled" fillcolor=yellow];
-                    141 [label="Exit block"];
-                }
-                142 [label="Exit when branch result"];
-                143 [label="Enter when branch result"];
-                subgraph cluster_33 {
-                    color=blue
-                    144 [label="Enter block"];
-                    145 [label="Access variable R|<local>/b|"];
-                    146 [label="Function call: R|<local>/b|.<Unresolved name: not>#()" style="filled" fillcolor=yellow];
-                    147 [label="Exit block"];
-                }
-                148 [label="Exit when branch result"];
-                149 [label="Exit when"];
-            }
-            150 [label="Access variable R|<local>/b|"];
-            151 [label="Function call: R|<local>/b|.<Unresolved name: not>#()" style="filled" fillcolor=yellow];
-            152 [label="Exit block"];
-        }
-        153 [label="Exit function test_4" style="filled" fillcolor=red];
-    }
-    100 -> {101};
+    99 -> {100 101};
+    100 -> {109};
     101 -> {102};
     102 -> {103};
     103 -> {104};
@@ -367,15 +317,135 @@ digraph casts_kt {
     105 -> {106};
     106 -> {107};
     107 -> {108};
-    108 -> {109 117};
+    108 -> {109};
     109 -> {110};
     110 -> {111};
     111 -> {112};
     112 -> {113};
     113 -> {114};
     114 -> {115};
-    115 -> {116};
-    116 -> {124};
+
+    subgraph cluster_30 {
+        color=red
+        116 [label="Enter function test_4" 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="Type operator: (R|<local>/b| as? R|kotlin/Boolean|)"];
+                    122 [label="Const: Null(null)"];
+                    123 [label="Equality operator !="];
+                    124 [label="Exit when branch condition"];
+                }
+                subgraph cluster_34 {
+                    color=blue
+                    125 [label="Enter when branch condition else"];
+                    126 [label="Exit when branch condition"];
+                }
+                127 [label="Enter when branch result"];
+                subgraph cluster_35 {
+                    color=blue
+                    128 [label="Enter block"];
+                    subgraph cluster_36 {
+                        color=blue
+                        129 [label="Function call arguments enter"];
+                        130 [label="Access variable R|<local>/b|"];
+                        131 [label="Function call arguments exit"];
+                    }
+                    132 [label="Function call: R|<local>/b|.<Unresolved name: not>#()" style="filled" fillcolor=yellow];
+                    133 [label="Exit block"];
+                }
+                134 [label="Exit when branch result"];
+                135 [label="Enter when branch result"];
+                subgraph cluster_37 {
+                    color=blue
+                    136 [label="Enter block"];
+                    subgraph cluster_38 {
+                        color=blue
+                        137 [label="Function call arguments enter"];
+                        138 [label="Access variable R|<local>/b|"];
+                        139 [label="Smart cast: R|<local>/b|"];
+                        140 [label="Function call arguments exit"];
+                    }
+                    141 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()" style="filled" fillcolor=yellow];
+                    142 [label="Exit block"];
+                }
+                143 [label="Exit when branch result"];
+                144 [label="Exit when"];
+            }
+            subgraph cluster_39 {
+                color=blue
+                145 [label="Function call arguments enter"];
+                146 [label="Access variable R|<local>/b|"];
+                147 [label="Function call arguments exit"];
+            }
+            148 [label="Function call: R|<local>/b|.<Unresolved name: not>#()" style="filled" fillcolor=yellow];
+            subgraph cluster_40 {
+                color=blue
+                149 [label="Enter when"];
+                subgraph cluster_41 {
+                    color=blue
+                    150 [label="Enter when branch condition "];
+                    151 [label="Access variable R|<local>/b|"];
+                    152 [label="Type operator: (R|<local>/b| as? R|kotlin/Boolean|)"];
+                    153 [label="Const: Null(null)"];
+                    154 [label="Equality operator =="];
+                    155 [label="Exit when branch condition"];
+                }
+                subgraph cluster_42 {
+                    color=blue
+                    156 [label="Enter when branch condition else"];
+                    157 [label="Exit when branch condition"];
+                }
+                158 [label="Enter when branch result"];
+                subgraph cluster_43 {
+                    color=blue
+                    159 [label="Enter block"];
+                    subgraph cluster_44 {
+                        color=blue
+                        160 [label="Function call arguments enter"];
+                        161 [label="Access variable R|<local>/b|"];
+                        162 [label="Smart cast: R|<local>/b|"];
+                        163 [label="Function call arguments exit"];
+                    }
+                    164 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()" style="filled" fillcolor=yellow];
+                    165 [label="Exit block"];
+                }
+                166 [label="Exit when branch result"];
+                167 [label="Enter when branch result"];
+                subgraph cluster_45 {
+                    color=blue
+                    168 [label="Enter block"];
+                    subgraph cluster_46 {
+                        color=blue
+                        169 [label="Function call arguments enter"];
+                        170 [label="Access variable R|<local>/b|"];
+                        171 [label="Function call arguments exit"];
+                    }
+                    172 [label="Function call: R|<local>/b|.<Unresolved name: not>#()" style="filled" fillcolor=yellow];
+                    173 [label="Exit block"];
+                }
+                174 [label="Exit when branch result"];
+                175 [label="Exit when"];
+            }
+            subgraph cluster_47 {
+                color=blue
+                176 [label="Function call arguments enter"];
+                177 [label="Access variable R|<local>/b|"];
+                178 [label="Function call arguments exit"];
+            }
+            179 [label="Function call: R|<local>/b|.<Unresolved name: not>#()" style="filled" fillcolor=yellow];
+            180 [label="Exit block"];
+        }
+        181 [label="Exit function test_4" style="filled" fillcolor=red];
+    }
+    116 -> {117};
     117 -> {118};
     118 -> {119};
     119 -> {120};
@@ -383,7 +453,7 @@ digraph casts_kt {
     121 -> {122};
     122 -> {123};
     123 -> {124};
-    124 -> {125};
+    124 -> {125 135};
     125 -> {126};
     126 -> {127};
     127 -> {128};
@@ -392,8 +462,8 @@ digraph casts_kt {
     130 -> {131};
     131 -> {132};
     132 -> {133};
-    133 -> {134 143};
-    134 -> {135};
+    133 -> {134};
+    134 -> {144};
     135 -> {136};
     136 -> {137};
     137 -> {138};
@@ -401,7 +471,7 @@ digraph casts_kt {
     139 -> {140};
     140 -> {141};
     141 -> {142};
-    142 -> {149};
+    142 -> {143};
     143 -> {144};
     144 -> {145};
     145 -> {146};
@@ -412,5 +482,33 @@ digraph casts_kt {
     150 -> {151};
     151 -> {152};
     152 -> {153};
+    153 -> {154};
+    154 -> {155};
+    155 -> {156 167};
+    156 -> {157};
+    157 -> {158};
+    158 -> {159};
+    159 -> {160};
+    160 -> {161};
+    161 -> {162};
+    162 -> {163};
+    163 -> {164};
+    164 -> {165};
+    165 -> {166};
+    166 -> {175};
+    167 -> {168};
+    168 -> {169};
+    169 -> {170};
+    170 -> {171};
+    171 -> {172};
+    172 -> {173};
+    173 -> {174};
+    174 -> {175};
+    175 -> {176};
+    176 -> {177};
+    177 -> {178};
+    178 -> {179};
+    179 -> {180};
+    180 -> {181};
 
 }

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

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

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

@@ -242,36 +242,61 @@ digraph returns_kt {
                 subgraph cluster_28 {
                     color=blue
                     87 [label="Enter block"];
-                    88 [label="Access variable R|<local>/x|"];
-                    89 [label="Smart cast: R|<local>/x|"];
-                    90 [label="Function call: R|<local>/x|.R|/C.baz|()" style="filled" fillcolor=yellow];
-                    91 [label="Exit block"];
+                    subgraph cluster_29 {
+                        color=blue
+                        88 [label="Function call arguments enter"];
+                        89 [label="Access variable R|<local>/x|"];
+                        90 [label="Smart cast: R|<local>/x|"];
+                        91 [label="Function call arguments exit"];
+                    }
+                    92 [label="Function call: R|<local>/x|.R|/C.baz|()" style="filled" fillcolor=yellow];
+                    93 [label="Exit block"];
                 }
-                92 [label="Exit when branch result"];
-                93 [label="Enter when branch result"];
-                subgraph cluster_29 {
+                94 [label="Exit when branch result"];
+                95 [label="Enter when branch result"];
+                subgraph cluster_30 {
                     color=blue
-                    94 [label="Enter block"];
-                    95 [label="Access variable R|<local>/x|"];
-                    96 [label="Smart cast: R|<local>/x|"];
-                    97 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
-                    98 [label="Exit block"];
+                    96 [label="Enter block"];
+                    subgraph cluster_31 {
+                        color=blue
+                        97 [label="Function call arguments enter"];
+                        98 [label="Access variable R|<local>/x|"];
+                        99 [label="Smart cast: R|<local>/x|"];
+                        100 [label="Function call arguments exit"];
+                    }
+                    101 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
+                    102 [label="Exit block"];
                 }
-                99 [label="Exit when branch result"];
-                100 [label="Exit when"];
+                103 [label="Exit when branch result"];
+                104 [label="Exit when"];
             }
-            101 [label="Access variable R|<local>/x|"];
-            102 [label="Smart cast: R|<local>/x|"];
-            103 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
-            104 [label="Access variable R|<local>/x|"];
-            105 [label="Smart cast: R|<local>/x|"];
-            106 [label="Function call: R|<local>/x|.<Unresolved name: bar>#()" style="filled" fillcolor=yellow];
-            107 [label="Access variable R|<local>/x|"];
-            108 [label="Smart cast: R|<local>/x|"];
-            109 [label="Function call: R|<local>/x|.<Unresolved name: baz>#()" style="filled" fillcolor=yellow];
-            110 [label="Exit block"];
+            subgraph cluster_32 {
+                color=blue
+                105 [label="Function call arguments enter"];
+                106 [label="Access variable R|<local>/x|"];
+                107 [label="Smart cast: R|<local>/x|"];
+                108 [label="Function call arguments exit"];
+            }
+            109 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
+            subgraph cluster_33 {
+                color=blue
+                110 [label="Function call arguments enter"];
+                111 [label="Access variable R|<local>/x|"];
+                112 [label="Smart cast: R|<local>/x|"];
+                113 [label="Function call arguments exit"];
+            }
+            114 [label="Function call: R|<local>/x|.<Unresolved name: bar>#()" style="filled" fillcolor=yellow];
+            subgraph cluster_34 {
+                color=blue
+                115 [label="Function call arguments enter"];
+                116 [label="Access variable R|<local>/x|"];
+                117 [label="Smart cast: R|<local>/x|"];
+                118 [label="Function call arguments exit"];
+            }
+            119 [label="Function call: R|<local>/x|.<Unresolved name: baz>#()" style="filled" fillcolor=yellow];
+            120 [label="Exit block"];
         }
-        111 [label="Exit function test_2" style="filled" fillcolor=red];
+        121 [label="Exit function test_2" style="filled" fillcolor=red];
     }
     67 -> {68};
     68 -> {69};
@@ -279,7 +304,7 @@ digraph returns_kt {
     70 -> {71};
     71 -> {72};
     72 -> {73};
-    73 -> {74 93};
+    73 -> {74 95};
     74 -> {75};
     75 -> {76};
     76 -> {77};
@@ -288,20 +313,20 @@ digraph returns_kt {
     79 -> {80};
     80 -> {81};
     81 -> {82};
-    82 -> {111};
+    82 -> {121};
     82 -> {83} [style=dotted];
     83 -> {84} [style=dotted];
     84 -> {85} [style=dotted];
-    85 -> {100} [style=dotted];
+    85 -> {104} [style=dotted];
     86 -> {87};
     87 -> {88};
     88 -> {89};
     89 -> {90};
     90 -> {91};
     91 -> {92};
-    92 -> {100};
+    92 -> {93};
     93 -> {94};
-    94 -> {95};
+    94 -> {104};
     95 -> {96};
     96 -> {97};
     97 -> {98};
@@ -318,85 +343,110 @@ digraph returns_kt {
     108 -> {109};
     109 -> {110};
     110 -> {111};
-
-    subgraph cluster_30 {
-        color=red
-        112 [label="Enter function test_3" 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>/x|"];
-                    117 [label="Type operator: (R|<local>/x| is R|B|)"];
-                    118 [label="Exit when branch condition"];
-                }
-                subgraph cluster_34 {
-                    color=blue
-                    119 [label="Enter when branch condition "];
-                    120 [label="Access variable R|<local>/x|"];
-                    121 [label="Type operator: (R|<local>/x| is R|C|)"];
-                    122 [label="Exit when branch condition"];
-                }
-                123 [label="Synthetic else branch"];
-                124 [label="Enter when branch result"];
-                subgraph cluster_35 {
-                    color=blue
-                    125 [label="Enter block"];
-                    126 [label="Access variable R|<local>/x|"];
-                    127 [label="Smart cast: R|<local>/x|"];
-                    128 [label="Function call: R|<local>/x|.R|/C.baz|()" style="filled" fillcolor=yellow];
-                    129 [label="Exit block"];
-                }
-                130 [label="Exit when branch result"];
-                131 [label="Enter when branch result"];
-                subgraph cluster_36 {
-                    color=blue
-                    132 [label="Enter block"];
-                    133 [label="Access variable R|<local>/x|"];
-                    134 [label="Smart cast: R|<local>/x|"];
-                    135 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
-                    136 [label="Exit block"];
-                }
-                137 [label="Exit when branch result"];
-                138 [label="Exit when"];
-            }
-            139 [label="Access variable R|<local>/x|"];
-            140 [label="Function call: R|<local>/x|.<Unresolved name: foo>#()" style="filled" fillcolor=yellow];
-            141 [label="Access variable R|<local>/x|"];
-            142 [label="Function call: R|<local>/x|.<Unresolved name: bar>#()" style="filled" fillcolor=yellow];
-            143 [label="Access variable R|<local>/x|"];
-            144 [label="Function call: R|<local>/x|.<Unresolved name: baz>#()" style="filled" fillcolor=yellow];
-            145 [label="Exit block"];
-        }
-        146 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
+    111 -> {112};
     112 -> {113};
     113 -> {114};
     114 -> {115};
     115 -> {116};
     116 -> {117};
     117 -> {118};
-    118 -> {119 131};
+    118 -> {119};
     119 -> {120};
     120 -> {121};
-    121 -> {122};
-    122 -> {123 124};
-    123 -> {138};
+
+    subgraph cluster_35 {
+        color=red
+        122 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_36 {
+            color=blue
+            123 [label="Enter block"];
+            subgraph cluster_37 {
+                color=blue
+                124 [label="Enter when"];
+                subgraph cluster_38 {
+                    color=blue
+                    125 [label="Enter when branch condition "];
+                    126 [label="Access variable R|<local>/x|"];
+                    127 [label="Type operator: (R|<local>/x| is R|B|)"];
+                    128 [label="Exit when branch condition"];
+                }
+                subgraph cluster_39 {
+                    color=blue
+                    129 [label="Enter when branch condition "];
+                    130 [label="Access variable R|<local>/x|"];
+                    131 [label="Type operator: (R|<local>/x| is R|C|)"];
+                    132 [label="Exit when branch condition"];
+                }
+                133 [label="Synthetic else branch"];
+                134 [label="Enter when branch result"];
+                subgraph cluster_40 {
+                    color=blue
+                    135 [label="Enter block"];
+                    subgraph cluster_41 {
+                        color=blue
+                        136 [label="Function call arguments enter"];
+                        137 [label="Access variable R|<local>/x|"];
+                        138 [label="Smart cast: R|<local>/x|"];
+                        139 [label="Function call arguments exit"];
+                    }
+                    140 [label="Function call: R|<local>/x|.R|/C.baz|()" style="filled" fillcolor=yellow];
+                    141 [label="Exit block"];
+                }
+                142 [label="Exit when branch result"];
+                143 [label="Enter when branch result"];
+                subgraph cluster_42 {
+                    color=blue
+                    144 [label="Enter block"];
+                    subgraph cluster_43 {
+                        color=blue
+                        145 [label="Function call arguments enter"];
+                        146 [label="Access variable R|<local>/x|"];
+                        147 [label="Smart cast: R|<local>/x|"];
+                        148 [label="Function call arguments exit"];
+                    }
+                    149 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
+                    150 [label="Exit block"];
+                }
+                151 [label="Exit when branch result"];
+                152 [label="Exit when"];
+            }
+            subgraph cluster_44 {
+                color=blue
+                153 [label="Function call arguments enter"];
+                154 [label="Access variable R|<local>/x|"];
+                155 [label="Function call arguments exit"];
+            }
+            156 [label="Function call: R|<local>/x|.<Unresolved name: foo>#()" style="filled" fillcolor=yellow];
+            subgraph cluster_45 {
+                color=blue
+                157 [label="Function call arguments enter"];
+                158 [label="Access variable R|<local>/x|"];
+                159 [label="Function call arguments exit"];
+            }
+            160 [label="Function call: R|<local>/x|.<Unresolved name: bar>#()" style="filled" fillcolor=yellow];
+            subgraph cluster_46 {
+                color=blue
+                161 [label="Function call arguments enter"];
+                162 [label="Access variable R|<local>/x|"];
+                163 [label="Function call arguments exit"];
+            }
+            164 [label="Function call: R|<local>/x|.<Unresolved name: baz>#()" style="filled" fillcolor=yellow];
+            165 [label="Exit block"];
+        }
+        166 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
+    122 -> {123};
+    123 -> {124};
     124 -> {125};
     125 -> {126};
     126 -> {127};
     127 -> {128};
-    128 -> {129};
+    128 -> {129 143};
     129 -> {130};
-    130 -> {138};
+    130 -> {131};
     131 -> {132};
-    132 -> {133};
-    133 -> {134};
+    132 -> {133 134};
+    133 -> {152};
     134 -> {135};
     135 -> {136};
     136 -> {137};
@@ -405,120 +455,154 @@ digraph returns_kt {
     139 -> {140};
     140 -> {141};
     141 -> {142};
-    142 -> {143};
+    142 -> {152};
     143 -> {144};
     144 -> {145};
     145 -> {146};
-
-    subgraph cluster_37 {
-        color=red
-        147 [label="Enter function runHigherOrder" style="filled" fillcolor=red];
-        subgraph cluster_38 {
-            color=blue
-            148 [label="Enter block"];
-            149 [label="Function call: R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()" style="filled" fillcolor=yellow];
-            150 [label="Jump: ^runHigherOrder R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
-            151 [label="Stub" style="filled" fillcolor=gray];
-            152 [label="Exit block" style="filled" fillcolor=gray];
-        }
-        153 [label="Exit function runHigherOrder" style="filled" fillcolor=red];
-    }
+    146 -> {147};
     147 -> {148};
     148 -> {149};
     149 -> {150};
-    150 -> {153};
-    150 -> {151} [style=dotted];
-    151 -> {152} [style=dotted];
-    152 -> {153} [style=dotted];
-
-    subgraph cluster_39 {
-        color=red
-        154 [label="Enter function <getter>" style="filled" fillcolor=red];
-        subgraph cluster_40 {
-            color=blue
-            155 [label="Enter block"];
-            156 [label="Access variable R|kotlin/String.length|"];
-            157 [label="Jump: ^ this@R|/ext|.R|kotlin/String.length|"];
-            158 [label="Stub" style="filled" fillcolor=gray];
-            159 [label="Exit block" style="filled" fillcolor=gray];
-        }
-        160 [label="Exit function <getter>" style="filled" fillcolor=red];
-    }
+    150 -> {151};
+    151 -> {152};
+    152 -> {153};
+    153 -> {154};
     154 -> {155};
     155 -> {156};
     156 -> {157};
-    157 -> {160};
-    157 -> {158} [style=dotted];
-    158 -> {159} [style=dotted];
-    159 -> {160} [style=dotted];
-
-    subgraph cluster_41 {
-        color=red
-        161 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_42 {
-            color=blue
-            162 [label="Enter block"];
-            163 [label="Access variable R|<local>/a|"];
-            164 [label="Type operator: (R|<local>/a| as? R|kotlin/String|)"];
-            165 [label="Variable declaration: lval s: R|kotlin/String?|"];
-            166 [label="Access variable R|<local>/s|"];
-            167 [label="Enter safe call"];
-            168 [label="Access variable R|/ext|"];
-            169 [label="Exit safe call"];
-            170 [label="Exit lhs of ?:"];
-            171 [label="Enter rhs of ?:"];
-            172 [label="Jump: ^test_4 Unit"];
-            173 [label="Stub" style="filled" fillcolor=gray];
-            174 [label="Lhs of ?: is not null"];
-            175 [label="Exit ?:"];
-            176 [label="Variable declaration: lval length: R|kotlin/Int|"];
-            177 [label="Postponed enter to lambda"];
-            subgraph cluster_43 {
-                color=blue
-                178 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_44 {
-                    color=blue
-                    179 [label="Enter block"];
-                    180 [label="Access variable R|<local>/s|"];
-                    181 [label="Smart cast: R|<local>/s|"];
-                    182 [label="Access variable R|kotlin/String.length|"];
-                    183 [label="Exit block"];
-                }
-                184 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            185 [label="Postponed exit from lambda"];
-            186 [label="Function call: R|/runHigherOrder|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
-            187 [label="Exit block"];
-        }
-        188 [label="Exit function test_4" style="filled" fillcolor=red];
-    }
+    157 -> {158};
+    158 -> {159};
+    159 -> {160};
+    160 -> {161};
     161 -> {162};
     162 -> {163};
     163 -> {164};
     164 -> {165};
     165 -> {166};
-    166 -> {167 171};
+
+    subgraph cluster_47 {
+        color=red
+        167 [label="Enter function runHigherOrder" style="filled" fillcolor=red];
+        subgraph cluster_48 {
+            color=blue
+            168 [label="Enter block"];
+            subgraph cluster_49 {
+                color=blue
+                169 [label="Function call arguments enter"];
+                170 [label="Function call arguments exit"];
+            }
+            171 [label="Function call: R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()" style="filled" fillcolor=yellow];
+            172 [label="Jump: ^runHigherOrder R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
+            173 [label="Stub" style="filled" fillcolor=gray];
+            174 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        175 [label="Exit function runHigherOrder" style="filled" fillcolor=red];
+    }
     167 -> {168};
     168 -> {169};
     169 -> {170};
-    170 -> {171 174};
+    170 -> {171};
     171 -> {172};
-    172 -> {188};
+    172 -> {175};
     172 -> {173} [style=dotted];
-    173 -> {175} [style=dotted];
-    174 -> {175};
-    175 -> {176};
+    173 -> {174} [style=dotted];
+    174 -> {175} [style=dotted];
+
+    subgraph cluster_50 {
+        color=red
+        176 [label="Enter function <getter>" style="filled" fillcolor=red];
+        subgraph cluster_51 {
+            color=blue
+            177 [label="Enter block"];
+            178 [label="Access variable R|kotlin/String.length|"];
+            179 [label="Jump: ^ this@R|/ext|.R|kotlin/String.length|"];
+            180 [label="Stub" style="filled" fillcolor=gray];
+            181 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        182 [label="Exit function <getter>" style="filled" fillcolor=red];
+    }
     176 -> {177};
-    177 -> {178 185 186};
-    177 -> {178} [style=dashed];
+    177 -> {178};
     178 -> {179};
-    179 -> {180};
-    180 -> {181};
-    181 -> {182};
-    182 -> {183};
+    179 -> {182};
+    179 -> {180} [style=dotted];
+    180 -> {181} [style=dotted];
+    181 -> {182} [style=dotted];
+
+    subgraph cluster_52 {
+        color=red
+        183 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_53 {
+            color=blue
+            184 [label="Enter block"];
+            185 [label="Access variable R|<local>/a|"];
+            186 [label="Type operator: (R|<local>/a| as? R|kotlin/String|)"];
+            187 [label="Variable declaration: lval s: R|kotlin/String?|"];
+            188 [label="Access variable R|<local>/s|"];
+            189 [label="Enter safe call"];
+            190 [label="Access variable R|/ext|"];
+            191 [label="Exit safe call"];
+            192 [label="Exit lhs of ?:"];
+            193 [label="Enter rhs of ?:"];
+            194 [label="Jump: ^test_4 Unit"];
+            195 [label="Stub" style="filled" fillcolor=gray];
+            196 [label="Lhs of ?: is not null"];
+            197 [label="Exit ?:"];
+            198 [label="Variable declaration: lval length: R|kotlin/Int|"];
+            subgraph cluster_54 {
+                color=blue
+                199 [label="Function call arguments enter"];
+                200 [label="Postponed enter to lambda"];
+                subgraph cluster_55 {
+                    color=blue
+                    201 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_56 {
+                        color=blue
+                        202 [label="Enter block"];
+                        203 [label="Access variable R|<local>/s|"];
+                        204 [label="Smart cast: R|<local>/s|"];
+                        205 [label="Access variable R|kotlin/String.length|"];
+                        206 [label="Exit block"];
+                    }
+                    207 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                208 [label="Function call arguments exit"];
+            }
+            209 [label="Postponed exit from lambda"];
+            210 [label="Function call: R|/runHigherOrder|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
+            211 [label="Exit block"];
+        }
+        212 [label="Exit function test_4" style="filled" fillcolor=red];
+    }
     183 -> {184};
+    184 -> {185};
     185 -> {186};
     186 -> {187};
     187 -> {188};
+    188 -> {189 193};
+    189 -> {190};
+    190 -> {191};
+    191 -> {192};
+    192 -> {193 196};
+    193 -> {194};
+    194 -> {212};
+    194 -> {195} [style=dotted];
+    195 -> {197} [style=dotted];
+    196 -> {197};
+    197 -> {198};
+    198 -> {199};
+    199 -> {200};
+    200 -> {201 208 209};
+    200 -> {201} [style=dashed];
+    201 -> {202};
+    202 -> {203};
+    203 -> {204};
+    204 -> {205};
+    205 -> {206};
+    206 -> {207};
+    208 -> {210};
+    209 -> {210};
+    210 -> {211};
+    211 -> {212};
 
 }

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

@@ -160,31 +160,36 @@ digraph simpleIf_kt {
                     60 [label="Access variable R|<local>/x|"];
                     61 [label="Smart cast: R|<local>/x|"];
                     62 [label="Access variable R|kotlin/String.length|"];
-                    63 [label="Access variable R|<local>/x|"];
-                    64 [label="Smart cast: R|<local>/x|"];
-                    65 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
-                    66 [label="Exit block"];
+                    subgraph cluster_18 {
+                        color=blue
+                        63 [label="Function call arguments enter"];
+                        64 [label="Access variable R|<local>/x|"];
+                        65 [label="Smart cast: R|<local>/x|"];
+                        66 [label="Function call arguments exit"];
+                    }
+                    67 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
+                    68 [label="Exit block"];
                 }
-                67 [label="Exit when branch result"];
-                68 [label="Enter when branch result"];
-                subgraph cluster_18 {
-                    color=blue
-                    69 [label="Enter block"];
-                    70 [label="Exit block"];
-                }
-                71 [label="Exit when branch result"];
-                72 [label="Enter when branch result"];
+                69 [label="Exit when branch result"];
+                70 [label="Enter when branch result"];
                 subgraph cluster_19 {
                     color=blue
-                    73 [label="Enter block"];
-                    74 [label="Exit block"];
+                    71 [label="Enter block"];
+                    72 [label="Exit block"];
                 }
-                75 [label="Exit when branch result"];
-                76 [label="Exit when"];
+                73 [label="Exit when branch result"];
+                74 [label="Enter when branch result"];
+                subgraph cluster_20 {
+                    color=blue
+                    75 [label="Enter block"];
+                    76 [label="Exit block"];
+                }
+                77 [label="Exit when branch result"];
+                78 [label="Exit when"];
             }
-            77 [label="Exit block"];
+            79 [label="Exit block"];
         }
-        78 [label="Exit function test_3" style="filled" fillcolor=red];
+        80 [label="Exit function test_3" style="filled" fillcolor=red];
     }
     44 -> {45};
     45 -> {46};
@@ -192,12 +197,12 @@ digraph simpleIf_kt {
     47 -> {48};
     48 -> {49};
     49 -> {50};
-    50 -> {51 72};
+    50 -> {51 74};
     51 -> {52};
     52 -> {53};
     53 -> {54};
     54 -> {55};
-    55 -> {56 68};
+    55 -> {56 70};
     56 -> {57};
     57 -> {58};
     58 -> {59};
@@ -209,16 +214,18 @@ digraph simpleIf_kt {
     64 -> {65};
     65 -> {66};
     66 -> {67};
-    67 -> {76};
+    67 -> {68};
     68 -> {69};
-    69 -> {70};
+    69 -> {78};
     70 -> {71};
-    71 -> {76};
+    71 -> {72};
     72 -> {73};
-    73 -> {74};
+    73 -> {78};
     74 -> {75};
     75 -> {76};
     76 -> {77};
     77 -> {78};
+    78 -> {79};
+    79 -> {80};
 
 }

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

@@ -57,33 +57,43 @@ digraph smartcastFromArgument_kt {
                 subgraph cluster_8 {
                     color=blue
                     16 [label="Enter when branch condition "];
-                    17 [label="Access variable R|<local>/a|"];
-                    18 [label="Type operator: (R|<local>/a| as? R|A|)"];
-                    19 [label="Exit lhs of ?:"];
-                    20 [label="Enter rhs of ?:"];
-                    21 [label="Jump: ^test Unit"];
-                    22 [label="Stub" style="filled" fillcolor=gray];
-                    23 [label="Lhs of ?: is not null"];
-                    24 [label="Exit ?:"];
-                    25 [label="Function call: R|/takeA|(...)" style="filled" fillcolor=yellow];
-                    26 [label="Exit when branch condition"];
+                    subgraph cluster_9 {
+                        color=blue
+                        17 [label="Function call arguments enter"];
+                        18 [label="Access variable R|<local>/a|"];
+                        19 [label="Type operator: (R|<local>/a| as? R|A|)"];
+                        20 [label="Exit lhs of ?:"];
+                        21 [label="Enter rhs of ?:"];
+                        22 [label="Jump: ^test Unit"];
+                        23 [label="Stub" style="filled" fillcolor=gray];
+                        24 [label="Lhs of ?: is not null"];
+                        25 [label="Exit ?:"];
+                        26 [label="Function call arguments exit"];
+                    }
+                    27 [label="Function call: R|/takeA|(...)" style="filled" fillcolor=yellow];
+                    28 [label="Exit when branch condition"];
                 }
-                27 [label="Synthetic else branch"];
-                28 [label="Enter when branch result"];
-                subgraph cluster_9 {
+                29 [label="Synthetic else branch"];
+                30 [label="Enter when branch result"];
+                subgraph cluster_10 {
                     color=blue
-                    29 [label="Enter block"];
-                    30 [label="Access variable R|<local>/a|"];
-                    31 [label="Smart cast: R|<local>/a|"];
-                    32 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    33 [label="Exit block"];
+                    31 [label="Enter block"];
+                    subgraph cluster_11 {
+                        color=blue
+                        32 [label="Function call arguments enter"];
+                        33 [label="Access variable R|<local>/a|"];
+                        34 [label="Smart cast: R|<local>/a|"];
+                        35 [label="Function call arguments exit"];
+                    }
+                    36 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    37 [label="Exit block"];
                 }
-                34 [label="Exit when branch result"];
-                35 [label="Exit when"];
+                38 [label="Exit when branch result"];
+                39 [label="Exit when"];
             }
-            36 [label="Exit block"];
+            40 [label="Exit block"];
         }
-        37 [label="Exit function test" style="filled" fillcolor=red];
+        41 [label="Exit function test" style="filled" fillcolor=red];
     }
     13 -> {14};
     14 -> {15};
@@ -91,18 +101,18 @@ digraph smartcastFromArgument_kt {
     16 -> {17};
     17 -> {18};
     18 -> {19};
-    19 -> {20 23};
-    20 -> {21};
-    21 -> {37};
-    21 -> {22} [style=dotted];
-    22 -> {24} [style=dotted];
-    23 -> {24};
+    19 -> {20};
+    20 -> {21 24};
+    21 -> {22};
+    22 -> {41};
+    22 -> {23} [style=dotted];
+    23 -> {25} [style=dotted];
     24 -> {25};
     25 -> {26};
-    26 -> {27 28};
-    27 -> {35};
-    28 -> {29};
-    29 -> {30};
+    26 -> {27};
+    27 -> {28};
+    28 -> {29 30};
+    29 -> {39};
     30 -> {31};
     31 -> {32};
     32 -> {33};
@@ -110,5 +120,9 @@ digraph smartcastFromArgument_kt {
     34 -> {35};
     35 -> {36};
     36 -> {37};
+    37 -> {38};
+    38 -> {39};
+    39 -> {40};
+    40 -> {41};
 
 }

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

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

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

@@ -46,45 +46,65 @@ digraph equalsAndIdentity_kt {
                 subgraph cluster_7 {
                     color=blue
                     16 [label="Enter block"];
-                    17 [label="Access variable R|<local>/x|"];
-                    18 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    19 [label="Access variable R|<local>/y|"];
-                    20 [label="Smart cast: R|<local>/y|"];
-                    21 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    22 [label="Exit block"];
+                    subgraph cluster_8 {
+                        color=blue
+                        17 [label="Function call arguments enter"];
+                        18 [label="Access variable R|<local>/x|"];
+                        19 [label="Function call arguments exit"];
+                    }
+                    20 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    subgraph cluster_9 {
+                        color=blue
+                        21 [label="Function call arguments enter"];
+                        22 [label="Access variable R|<local>/y|"];
+                        23 [label="Smart cast: R|<local>/y|"];
+                        24 [label="Function call arguments exit"];
+                    }
+                    25 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    26 [label="Exit block"];
                 }
-                23 [label="Exit when branch result"];
-                24 [label="Exit when"];
+                27 [label="Exit when branch result"];
+                28 [label="Exit when"];
             }
-            subgraph cluster_8 {
+            subgraph cluster_10 {
                 color=blue
-                25 [label="Enter when"];
-                subgraph cluster_9 {
+                29 [label="Enter when"];
+                subgraph cluster_11 {
                     color=blue
-                    26 [label="Enter when branch condition "];
-                    27 [label="Access variable R|<local>/x|"];
-                    28 [label="Access variable R|<local>/y|"];
-                    29 [label="Equality operator ==="];
-                    30 [label="Exit when branch condition"];
+                    30 [label="Enter when branch condition "];
+                    31 [label="Access variable R|<local>/x|"];
+                    32 [label="Access variable R|<local>/y|"];
+                    33 [label="Equality operator ==="];
+                    34 [label="Exit when branch condition"];
                 }
-                31 [label="Synthetic else branch"];
-                32 [label="Enter when branch result"];
-                subgraph cluster_10 {
+                35 [label="Synthetic else branch"];
+                36 [label="Enter when branch result"];
+                subgraph cluster_12 {
                     color=blue
-                    33 [label="Enter block"];
-                    34 [label="Access variable R|<local>/x|"];
-                    35 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    36 [label="Access variable R|<local>/y|"];
-                    37 [label="Smart cast: R|<local>/y|"];
-                    38 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    39 [label="Exit block"];
+                    37 [label="Enter block"];
+                    subgraph cluster_13 {
+                        color=blue
+                        38 [label="Function call arguments enter"];
+                        39 [label="Access variable R|<local>/x|"];
+                        40 [label="Function call arguments exit"];
+                    }
+                    41 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    subgraph cluster_14 {
+                        color=blue
+                        42 [label="Function call arguments enter"];
+                        43 [label="Access variable R|<local>/y|"];
+                        44 [label="Smart cast: R|<local>/y|"];
+                        45 [label="Function call arguments exit"];
+                    }
+                    46 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    47 [label="Exit block"];
                 }
-                40 [label="Exit when branch result"];
-                41 [label="Exit when"];
+                48 [label="Exit when branch result"];
+                49 [label="Exit when"];
             }
-            42 [label="Exit block"];
+            50 [label="Exit block"];
         }
-        43 [label="Exit function test_1" style="filled" fillcolor=red];
+        51 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     6 -> {7};
     7 -> {8};
@@ -94,7 +114,7 @@ digraph equalsAndIdentity_kt {
     11 -> {12};
     12 -> {13};
     13 -> {14 15};
-    14 -> {24};
+    14 -> {28};
     15 -> {16};
     16 -> {17};
     17 -> {18};
@@ -110,12 +130,12 @@ digraph equalsAndIdentity_kt {
     27 -> {28};
     28 -> {29};
     29 -> {30};
-    30 -> {31 32};
-    31 -> {41};
+    30 -> {31};
+    31 -> {32};
     32 -> {33};
     33 -> {34};
-    34 -> {35};
-    35 -> {36};
+    34 -> {35 36};
+    35 -> {49};
     36 -> {37};
     37 -> {38};
     38 -> {39};
@@ -123,67 +143,7 @@ digraph equalsAndIdentity_kt {
     40 -> {41};
     41 -> {42};
     42 -> {43};
-
-    subgraph cluster_11 {
-        color=red
-        44 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_12 {
-            color=blue
-            45 [label="Enter block"];
-            subgraph cluster_13 {
-                color=blue
-                46 [label="Enter when"];
-                subgraph cluster_14 {
-                    color=blue
-                    47 [label="Enter when branch condition "];
-                    48 [label="Access variable R|<local>/x|"];
-                    49 [label="Access variable R|<local>/y|"];
-                    50 [label="Equality operator =="];
-                    51 [label="Exit when branch condition"];
-                }
-                52 [label="Synthetic else branch"];
-                53 [label="Enter when branch result"];
-                subgraph cluster_15 {
-                    color=blue
-                    54 [label="Enter block"];
-                    55 [label="Access variable R|<local>/x|"];
-                    56 [label="Function call: R|<local>/x|.R|/A.foo<Inapplicable(UNSAFE_CALL): /A.foo>#|()" style="filled" fillcolor=yellow];
-                    57 [label="Access variable R|<local>/y|"];
-                    58 [label="Function call: R|<local>/y|.R|/A.foo<Inapplicable(UNSAFE_CALL): /A.foo>#|()" style="filled" fillcolor=yellow];
-                    59 [label="Exit block"];
-                }
-                60 [label="Exit when branch result"];
-                61 [label="Exit when"];
-            }
-            subgraph cluster_16 {
-                color=blue
-                62 [label="Enter when"];
-                subgraph cluster_17 {
-                    color=blue
-                    63 [label="Enter when branch condition "];
-                    64 [label="Access variable R|<local>/x|"];
-                    65 [label="Access variable R|<local>/y|"];
-                    66 [label="Equality operator ==="];
-                    67 [label="Exit when branch condition"];
-                }
-                68 [label="Synthetic else branch"];
-                69 [label="Enter when branch result"];
-                subgraph cluster_18 {
-                    color=blue
-                    70 [label="Enter block"];
-                    71 [label="Access variable R|<local>/x|"];
-                    72 [label="Function call: R|<local>/x|.R|/A.foo<Inapplicable(UNSAFE_CALL): /A.foo>#|()" style="filled" fillcolor=yellow];
-                    73 [label="Access variable R|<local>/y|"];
-                    74 [label="Function call: R|<local>/y|.R|/A.foo<Inapplicable(UNSAFE_CALL): /A.foo>#|()" style="filled" fillcolor=yellow];
-                    75 [label="Exit block"];
-                }
-                76 [label="Exit when branch result"];
-                77 [label="Exit when"];
-            }
-            78 [label="Exit block"];
-        }
-        79 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
+    43 -> {44};
     44 -> {45};
     45 -> {46};
     46 -> {47};
@@ -191,24 +151,104 @@ digraph equalsAndIdentity_kt {
     48 -> {49};
     49 -> {50};
     50 -> {51};
-    51 -> {52 53};
-    52 -> {61};
+
+    subgraph cluster_15 {
+        color=red
+        52 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_16 {
+            color=blue
+            53 [label="Enter block"];
+            subgraph cluster_17 {
+                color=blue
+                54 [label="Enter when"];
+                subgraph cluster_18 {
+                    color=blue
+                    55 [label="Enter when branch condition "];
+                    56 [label="Access variable R|<local>/x|"];
+                    57 [label="Access variable R|<local>/y|"];
+                    58 [label="Equality operator =="];
+                    59 [label="Exit when branch condition"];
+                }
+                60 [label="Synthetic else branch"];
+                61 [label="Enter when branch result"];
+                subgraph cluster_19 {
+                    color=blue
+                    62 [label="Enter block"];
+                    subgraph cluster_20 {
+                        color=blue
+                        63 [label="Function call arguments enter"];
+                        64 [label="Access variable R|<local>/x|"];
+                        65 [label="Function call arguments exit"];
+                    }
+                    66 [label="Function call: R|<local>/x|.R|/A.foo<Inapplicable(UNSAFE_CALL): /A.foo>#|()" style="filled" fillcolor=yellow];
+                    subgraph cluster_21 {
+                        color=blue
+                        67 [label="Function call arguments enter"];
+                        68 [label="Access variable R|<local>/y|"];
+                        69 [label="Function call arguments exit"];
+                    }
+                    70 [label="Function call: R|<local>/y|.R|/A.foo<Inapplicable(UNSAFE_CALL): /A.foo>#|()" style="filled" fillcolor=yellow];
+                    71 [label="Exit block"];
+                }
+                72 [label="Exit when branch result"];
+                73 [label="Exit when"];
+            }
+            subgraph cluster_22 {
+                color=blue
+                74 [label="Enter when"];
+                subgraph cluster_23 {
+                    color=blue
+                    75 [label="Enter when branch condition "];
+                    76 [label="Access variable R|<local>/x|"];
+                    77 [label="Access variable R|<local>/y|"];
+                    78 [label="Equality operator ==="];
+                    79 [label="Exit when branch condition"];
+                }
+                80 [label="Synthetic else branch"];
+                81 [label="Enter when branch result"];
+                subgraph cluster_24 {
+                    color=blue
+                    82 [label="Enter block"];
+                    subgraph cluster_25 {
+                        color=blue
+                        83 [label="Function call arguments enter"];
+                        84 [label="Access variable R|<local>/x|"];
+                        85 [label="Function call arguments exit"];
+                    }
+                    86 [label="Function call: R|<local>/x|.R|/A.foo<Inapplicable(UNSAFE_CALL): /A.foo>#|()" style="filled" fillcolor=yellow];
+                    subgraph cluster_26 {
+                        color=blue
+                        87 [label="Function call arguments enter"];
+                        88 [label="Access variable R|<local>/y|"];
+                        89 [label="Function call arguments exit"];
+                    }
+                    90 [label="Function call: R|<local>/y|.R|/A.foo<Inapplicable(UNSAFE_CALL): /A.foo>#|()" style="filled" fillcolor=yellow];
+                    91 [label="Exit block"];
+                }
+                92 [label="Exit when branch result"];
+                93 [label="Exit when"];
+            }
+            94 [label="Exit block"];
+        }
+        95 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
+    52 -> {53};
     53 -> {54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
     57 -> {58};
     58 -> {59};
-    59 -> {60};
-    60 -> {61};
+    59 -> {60 61};
+    60 -> {73};
     61 -> {62};
     62 -> {63};
     63 -> {64};
     64 -> {65};
     65 -> {66};
     66 -> {67};
-    67 -> {68 69};
-    68 -> {77};
+    67 -> {68};
+    68 -> {69};
     69 -> {70};
     70 -> {71};
     71 -> {72};
@@ -219,128 +259,148 @@ digraph equalsAndIdentity_kt {
     76 -> {77};
     77 -> {78};
     78 -> {79};
-
-    subgraph cluster_19 {
-        color=red
-        80 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_20 {
-            color=blue
-            81 [label="Enter block"];
-            subgraph cluster_21 {
-                color=blue
-                82 [label="Enter when"];
-                subgraph cluster_22 {
-                    color=blue
-                    83 [label="Enter when branch condition "];
-                    84 [label="Access variable R|<local>/y|"];
-                    85 [label="Const: Null(null)"];
-                    86 [label="Equality operator =="];
-                    87 [label="Exit when branch condition"];
-                }
-                88 [label="Synthetic else branch"];
-                89 [label="Enter when branch result"];
-                subgraph cluster_23 {
-                    color=blue
-                    90 [label="Enter block"];
-                    91 [label="Jump: ^test_3 Unit"];
-                    92 [label="Stub" style="filled" fillcolor=gray];
-                    93 [label="Exit block" style="filled" fillcolor=gray];
-                }
-                94 [label="Exit when branch result" style="filled" fillcolor=gray];
-                95 [label="Exit when"];
-            }
-            subgraph cluster_24 {
-                color=blue
-                96 [label="Enter when"];
-                subgraph cluster_25 {
-                    color=blue
-                    97 [label="Enter when branch condition "];
-                    98 [label="Access variable R|<local>/x|"];
-                    99 [label="Access variable R|<local>/y|"];
-                    100 [label="Smart cast: R|<local>/y|"];
-                    101 [label="Equality operator =="];
-                    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="Smart cast: R|<local>/x|"];
-                    108 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    109 [label="Access variable R|<local>/y|"];
-                    110 [label="Smart cast: R|<local>/y|"];
-                    111 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    112 [label="Exit block"];
-                }
-                113 [label="Exit when branch result"];
-                114 [label="Exit when"];
-            }
-            subgraph cluster_27 {
-                color=blue
-                115 [label="Enter when"];
-                subgraph cluster_28 {
-                    color=blue
-                    116 [label="Enter when branch condition "];
-                    117 [label="Access variable R|<local>/x|"];
-                    118 [label="Access variable R|<local>/y|"];
-                    119 [label="Smart cast: R|<local>/y|"];
-                    120 [label="Equality operator ==="];
-                    121 [label="Exit when branch condition"];
-                }
-                122 [label="Synthetic else branch"];
-                123 [label="Enter when branch result"];
-                subgraph cluster_29 {
-                    color=blue
-                    124 [label="Enter block"];
-                    125 [label="Access variable R|<local>/x|"];
-                    126 [label="Smart cast: R|<local>/x|"];
-                    127 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    128 [label="Access variable R|<local>/y|"];
-                    129 [label="Smart cast: R|<local>/y|"];
-                    130 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    131 [label="Exit block"];
-                }
-                132 [label="Exit when branch result"];
-                133 [label="Exit when"];
-            }
-            134 [label="Exit block"];
-        }
-        135 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
-    80 -> {81};
+    79 -> {80 81};
+    80 -> {93};
     81 -> {82};
     82 -> {83};
     83 -> {84};
     84 -> {85};
     85 -> {86};
     86 -> {87};
-    87 -> {88 89};
-    88 -> {95};
+    87 -> {88};
+    88 -> {89};
     89 -> {90};
     90 -> {91};
-    91 -> {135};
-    91 -> {92} [style=dotted];
-    92 -> {93} [style=dotted];
-    93 -> {94} [style=dotted];
-    94 -> {95} [style=dotted];
-    95 -> {96};
+    91 -> {92};
+    92 -> {93};
+    93 -> {94};
+    94 -> {95};
+
+    subgraph cluster_27 {
+        color=red
+        96 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_28 {
+            color=blue
+            97 [label="Enter block"];
+            subgraph cluster_29 {
+                color=blue
+                98 [label="Enter when"];
+                subgraph cluster_30 {
+                    color=blue
+                    99 [label="Enter when branch condition "];
+                    100 [label="Access variable R|<local>/y|"];
+                    101 [label="Const: Null(null)"];
+                    102 [label="Equality operator =="];
+                    103 [label="Exit when branch condition"];
+                }
+                104 [label="Synthetic else branch"];
+                105 [label="Enter when branch result"];
+                subgraph cluster_31 {
+                    color=blue
+                    106 [label="Enter block"];
+                    107 [label="Jump: ^test_3 Unit"];
+                    108 [label="Stub" style="filled" fillcolor=gray];
+                    109 [label="Exit block" style="filled" fillcolor=gray];
+                }
+                110 [label="Exit when branch result" style="filled" fillcolor=gray];
+                111 [label="Exit when"];
+            }
+            subgraph cluster_32 {
+                color=blue
+                112 [label="Enter when"];
+                subgraph cluster_33 {
+                    color=blue
+                    113 [label="Enter when branch condition "];
+                    114 [label="Access variable R|<local>/x|"];
+                    115 [label="Access variable R|<local>/y|"];
+                    116 [label="Smart cast: R|<local>/y|"];
+                    117 [label="Equality operator =="];
+                    118 [label="Exit when branch condition"];
+                }
+                119 [label="Synthetic else branch"];
+                120 [label="Enter when branch result"];
+                subgraph cluster_34 {
+                    color=blue
+                    121 [label="Enter block"];
+                    subgraph cluster_35 {
+                        color=blue
+                        122 [label="Function call arguments enter"];
+                        123 [label="Access variable R|<local>/x|"];
+                        124 [label="Smart cast: R|<local>/x|"];
+                        125 [label="Function call arguments exit"];
+                    }
+                    126 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    subgraph cluster_36 {
+                        color=blue
+                        127 [label="Function call arguments enter"];
+                        128 [label="Access variable R|<local>/y|"];
+                        129 [label="Smart cast: R|<local>/y|"];
+                        130 [label="Function call arguments exit"];
+                    }
+                    131 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    132 [label="Exit block"];
+                }
+                133 [label="Exit when branch result"];
+                134 [label="Exit when"];
+            }
+            subgraph cluster_37 {
+                color=blue
+                135 [label="Enter when"];
+                subgraph cluster_38 {
+                    color=blue
+                    136 [label="Enter when branch condition "];
+                    137 [label="Access variable R|<local>/x|"];
+                    138 [label="Access variable R|<local>/y|"];
+                    139 [label="Smart cast: R|<local>/y|"];
+                    140 [label="Equality operator ==="];
+                    141 [label="Exit when branch condition"];
+                }
+                142 [label="Synthetic else branch"];
+                143 [label="Enter when branch result"];
+                subgraph cluster_39 {
+                    color=blue
+                    144 [label="Enter block"];
+                    subgraph cluster_40 {
+                        color=blue
+                        145 [label="Function call arguments enter"];
+                        146 [label="Access variable R|<local>/x|"];
+                        147 [label="Smart cast: R|<local>/x|"];
+                        148 [label="Function call arguments exit"];
+                    }
+                    149 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    subgraph cluster_41 {
+                        color=blue
+                        150 [label="Function call arguments enter"];
+                        151 [label="Access variable R|<local>/y|"];
+                        152 [label="Smart cast: R|<local>/y|"];
+                        153 [label="Function call arguments exit"];
+                    }
+                    154 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    155 [label="Exit block"];
+                }
+                156 [label="Exit when branch result"];
+                157 [label="Exit when"];
+            }
+            158 [label="Exit block"];
+        }
+        159 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
     96 -> {97};
     97 -> {98};
     98 -> {99};
     99 -> {100};
     100 -> {101};
     101 -> {102};
-    102 -> {103 104};
-    103 -> {114};
-    104 -> {105};
+    102 -> {103};
+    103 -> {104 105};
+    104 -> {111};
     105 -> {106};
     106 -> {107};
-    107 -> {108};
-    108 -> {109};
-    109 -> {110};
-    110 -> {111};
+    107 -> {159};
+    107 -> {108} [style=dotted];
+    108 -> {109} [style=dotted];
+    109 -> {110} [style=dotted];
+    110 -> {111} [style=dotted];
     111 -> {112};
     112 -> {113};
     113 -> {114};
@@ -348,11 +408,11 @@ digraph equalsAndIdentity_kt {
     115 -> {116};
     116 -> {117};
     117 -> {118};
-    118 -> {119};
-    119 -> {120};
+    118 -> {119 120};
+    119 -> {134};
     120 -> {121};
-    121 -> {122 123};
-    122 -> {133};
+    121 -> {122};
+    122 -> {123};
     123 -> {124};
     124 -> {125};
     125 -> {126};
@@ -365,5 +425,29 @@ digraph equalsAndIdentity_kt {
     132 -> {133};
     133 -> {134};
     134 -> {135};
+    135 -> {136};
+    136 -> {137};
+    137 -> {138};
+    138 -> {139};
+    139 -> {140};
+    140 -> {141};
+    141 -> {142 143};
+    142 -> {157};
+    143 -> {144};
+    144 -> {145};
+    145 -> {146};
+    146 -> {147};
+    147 -> {148};
+    148 -> {149};
+    149 -> {150};
+    150 -> {151};
+    151 -> {152};
+    152 -> {153};
+    153 -> {154};
+    154 -> {155};
+    155 -> {156};
+    156 -> {157};
+    157 -> {158};
+    158 -> {159};
 
 }

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

@@ -9,152 +9,187 @@ digraph incorrectSmartcastToNothing_kt {
         subgraph cluster_1 {
             color=blue
             1 [label="Enter property" style="filled" fillcolor=red];
-            2 [label="Const: String(foo)"];
-            3 [label="Function call: R|java/io/File.File|(...)" style="filled" fillcolor=yellow];
-            4 [label="Exit property" style="filled" fillcolor=red];
+            subgraph cluster_2 {
+                color=blue
+                2 [label="Function call arguments enter"];
+                3 [label="Const: String(foo)"];
+                4 [label="Function call arguments exit"];
+            }
+            5 [label="Function call: R|java/io/File.File|(...)" style="filled" fillcolor=yellow];
+            6 [label="Exit property" style="filled" fillcolor=red];
         }
-        5 [label="Exit file incorrectSmartcastToNothing.kt" style="filled" fillcolor=red];
+        7 [label="Exit file incorrectSmartcastToNothing.kt" style="filled" fillcolor=red];
     }
     0 -> {1} [color=green];
-    0 -> {5} [style=dotted];
+    0 -> {7} [style=dotted];
     0 -> {1} [style=dashed];
     1 -> {2};
     2 -> {3};
     3 -> {4};
-    4 -> {5} [color=green];
+    4 -> {5};
+    5 -> {6};
+    6 -> {7} [color=green];
 
-    subgraph cluster_2 {
+    subgraph cluster_3 {
         color=red
-        6 [label="Enter function test" style="filled" fillcolor=red];
-        subgraph cluster_3 {
+        8 [label="Enter function test" style="filled" fillcolor=red];
+        subgraph cluster_4 {
             color=blue
-            7 [label="Enter block"];
-            subgraph cluster_4 {
+            9 [label="Enter block"];
+            subgraph cluster_5 {
                 color=blue
-                8 [label="Enter when"];
-                subgraph cluster_5 {
-                    color=blue
-                    9 [label="Enter when branch condition "];
-                    10 [label="Access variable R|<local>/cacheExtSetting|"];
-                    11 [label="Const: Null(null)"];
-                    12 [label="Equality operator =="];
-                    13 [label="Exit when branch condition"];
-                }
+                10 [label="Enter when"];
                 subgraph cluster_6 {
                     color=blue
-                    14 [label="Enter when branch condition "];
-                    15 [label="Access variable R|<local>/cacheExtSetting|"];
-                    16 [label="Smart cast: R|<local>/cacheExtSetting|"];
-                    17 [label="Function call: R|<local>/cacheExtSetting|.R|kotlin/text/isBlank|()" style="filled" fillcolor=yellow];
-                    18 [label="Exit when branch condition"];
+                    11 [label="Enter when branch condition "];
+                    12 [label="Access variable R|<local>/cacheExtSetting|"];
+                    13 [label="Const: Null(null)"];
+                    14 [label="Equality operator =="];
+                    15 [label="Exit when branch condition"];
                 }
                 subgraph cluster_7 {
                     color=blue
-                    19 [label="Enter when branch condition else"];
-                    20 [label="Exit when branch condition"];
+                    16 [label="Enter when branch condition "];
+                    subgraph cluster_8 {
+                        color=blue
+                        17 [label="Function call arguments enter"];
+                        18 [label="Access variable R|<local>/cacheExtSetting|"];
+                        19 [label="Smart cast: R|<local>/cacheExtSetting|"];
+                        20 [label="Function call arguments exit"];
+                    }
+                    21 [label="Function call: R|<local>/cacheExtSetting|.R|kotlin/text/isBlank|()" style="filled" fillcolor=yellow];
+                    22 [label="Exit when branch condition"];
                 }
-                21 [label="Enter when branch result"];
-                subgraph cluster_8 {
-                    color=blue
-                    22 [label="Enter block"];
-                    23 [label="Access variable R|<local>/cacheExtSetting|"];
-                    24 [label="Smart cast: R|<local>/cacheExtSetting|"];
-                    25 [label="Function call: R|java/io/File.File|(...)" style="filled" fillcolor=yellow];
-                    26 [label="Exit block"];
-                }
-                27 [label="Exit when branch result"];
-                28 [label="Enter when branch result"];
                 subgraph cluster_9 {
                     color=blue
-                    29 [label="Enter block"];
-                    30 [label="Const: Null(null)"];
-                    31 [label="Exit block"];
+                    23 [label="Enter when branch condition else"];
+                    24 [label="Exit when branch condition"];
                 }
-                32 [label="Exit when branch result"];
-                33 [label="Enter when branch result"];
+                25 [label="Enter when branch result"];
                 subgraph cluster_10 {
                     color=blue
-                    34 [label="Enter block"];
-                    35 [label="Access variable R|/cache|"];
-                    36 [label="Enter safe call"];
-                    37 [label="Postponed enter to lambda"];
+                    26 [label="Enter block"];
                     subgraph cluster_11 {
                         color=blue
-                        38 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                        subgraph cluster_12 {
-                            color=blue
-                            39 [label="Enter block"];
-                            40 [label="Access variable R|<local>/it|"];
-                            41 [label="Const: String(main.kts.compiled.cache)"];
-                            42 [label="Function call: R|java/io/File.File|(...)" style="filled" fillcolor=yellow];
-                            43 [label="Exit block"];
-                        }
-                        44 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                        27 [label="Function call arguments enter"];
+                        28 [label="Access variable R|<local>/cacheExtSetting|"];
+                        29 [label="Smart cast: R|<local>/cacheExtSetting|"];
+                        30 [label="Function call arguments exit"];
                     }
-                    45 [label="Postponed exit from lambda"];
-                    46 [label="Function call: $subj$.R|kotlin/let|<R|java/io/File|, R|java/io/File|>(...)" style="filled" fillcolor=yellow];
-                    47 [label="Exit safe call"];
-                    48 [label="Exit block"];
+                    31 [label="Function call: R|java/io/File.File|(...)" style="filled" fillcolor=yellow];
+                    32 [label="Exit block"];
                 }
-                49 [label="Exit when branch result"];
-                50 [label="Merge postponed lambda exits"];
-                51 [label="Exit when"];
+                33 [label="Exit when branch result"];
+                34 [label="Enter when branch result"];
+                subgraph cluster_12 {
+                    color=blue
+                    35 [label="Enter block"];
+                    36 [label="Const: Null(null)"];
+                    37 [label="Exit block"];
+                }
+                38 [label="Exit when branch result"];
+                39 [label="Enter when branch result"];
+                subgraph cluster_13 {
+                    color=blue
+                    40 [label="Enter block"];
+                    41 [label="Access variable R|/cache|"];
+                    42 [label="Enter safe call"];
+                    subgraph cluster_14 {
+                        color=blue
+                        43 [label="Function call arguments enter"];
+                        44 [label="Postponed enter to lambda"];
+                        subgraph cluster_15 {
+                            color=blue
+                            45 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                            subgraph cluster_16 {
+                                color=blue
+                                46 [label="Enter block"];
+                                subgraph cluster_17 {
+                                    color=blue
+                                    47 [label="Function call arguments enter"];
+                                    48 [label="Access variable R|<local>/it|"];
+                                    49 [label="Const: String(main.kts.compiled.cache)"];
+                                    50 [label="Function call arguments exit"];
+                                }
+                                51 [label="Function call: R|java/io/File.File|(...)" style="filled" fillcolor=yellow];
+                                52 [label="Exit block"];
+                            }
+                            53 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                        }
+                        54 [label="Function call arguments exit"];
+                    }
+                    55 [label="Postponed exit from lambda"];
+                    56 [label="Function call: $subj$.R|kotlin/let|<R|java/io/File|, R|java/io/File|>(...)" style="filled" fillcolor=yellow];
+                    57 [label="Exit safe call"];
+                    58 [label="Exit block"];
+                }
+                59 [label="Exit when branch result"];
+                60 [label="Merge postponed lambda exits"];
+                61 [label="Exit when"];
             }
-            52 [label="Variable declaration: lval cacheBaseDir: R|java/io/File?|"];
-            53 [label="Exit block"];
+            62 [label="Variable declaration: lval cacheBaseDir: R|java/io/File?|"];
+            63 [label="Exit block"];
         }
-        54 [label="Exit function test" style="filled" fillcolor=red];
+        64 [label="Exit function test" style="filled" fillcolor=red];
     }
-    6 -> {7};
-    7 -> {8};
     8 -> {9};
     9 -> {10};
     10 -> {11};
     11 -> {12};
     12 -> {13};
-    13 -> {14 33};
+    13 -> {14};
     14 -> {15};
-    15 -> {16};
+    15 -> {16 39};
     16 -> {17};
     17 -> {18};
-    18 -> {19 28};
+    18 -> {19};
     19 -> {20};
     20 -> {21};
     21 -> {22};
-    22 -> {23};
+    22 -> {23 34};
     23 -> {24};
     24 -> {25};
     25 -> {26};
     26 -> {27};
-    27 -> {51};
+    27 -> {28};
     28 -> {29};
     29 -> {30};
     30 -> {31};
     31 -> {32};
-    32 -> {51};
-    33 -> {34};
+    32 -> {33};
+    33 -> {61};
     34 -> {35};
-    35 -> {36 47};
+    35 -> {36};
     36 -> {37};
-    37 -> {38 46};
-    37 -> {45} [style=dotted];
-    37 -> {38} [style=dashed];
-    38 -> {39};
+    37 -> {38};
+    38 -> {61};
     39 -> {40};
     40 -> {41};
-    41 -> {42};
+    41 -> {42 57};
     42 -> {43};
     43 -> {44};
-    44 -> {45};
-    45 -> {46} [color=green];
-    45 -> {50} [color=red];
+    44 -> {45 54};
+    44 -> {55} [style=dotted];
+    44 -> {45} [style=dashed];
+    45 -> {46};
     46 -> {47};
-    47 -> {48 50};
+    47 -> {48};
     48 -> {49};
-    49 -> {51};
-    50 -> {51} [color=red];
+    49 -> {50};
+    50 -> {51};
     51 -> {52};
     52 -> {53};
-    53 -> {54};
+    53 -> {55};
+    54 -> {56};
+    55 -> {56} [color=green];
+    55 -> {60} [color=red];
+    56 -> {57};
+    57 -> {58 60};
+    58 -> {59};
+    59 -> {61};
+    60 -> {61} [color=red];
+    61 -> {62};
+    62 -> {63};
+    63 -> {64};
 
 }

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

@@ -59,30 +59,40 @@ digraph inPlaceLambdas_kt {
                 subgraph cluster_9 {
                     color=blue
                     19 [label="Enter block"];
-                    20 [label="Postponed enter to lambda"];
                     subgraph cluster_10 {
                         color=blue
-                        21 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                        20 [label="Function call arguments enter"];
+                        21 [label="Postponed enter to lambda"];
                         subgraph cluster_11 {
                             color=blue
-                            22 [label="Enter block"];
-                            23 [label="Access variable R|<local>/x|"];
-                            24 [label="Smart cast: R|<local>/x|"];
-                            25 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                            26 [label="Exit block"];
+                            22 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                            subgraph cluster_12 {
+                                color=blue
+                                23 [label="Enter block"];
+                                subgraph cluster_13 {
+                                    color=blue
+                                    24 [label="Function call arguments enter"];
+                                    25 [label="Access variable R|<local>/x|"];
+                                    26 [label="Smart cast: R|<local>/x|"];
+                                    27 [label="Function call arguments exit"];
+                                }
+                                28 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                                29 [label="Exit block"];
+                            }
+                            30 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                         }
-                        27 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                        31 [label="Function call arguments exit"];
                     }
-                    28 [label="Postponed exit from lambda"];
-                    29 [label="Function call: R|kotlin/run|<R|kotlin/Unit|>(...)" style="filled" fillcolor=yellow];
-                    30 [label="Exit block"];
+                    32 [label="Postponed exit from lambda"];
+                    33 [label="Function call: R|kotlin/run|<R|kotlin/Unit|>(...)" style="filled" fillcolor=yellow];
+                    34 [label="Exit block"];
                 }
-                31 [label="Exit when branch result"];
-                32 [label="Exit when"];
+                35 [label="Exit when branch result"];
+                36 [label="Exit when"];
             }
-            33 [label="Exit block"];
+            37 [label="Exit block"];
         }
-        34 [label="Exit function test_1" style="filled" fillcolor=red];
+        38 [label="Exit function test_1" style="filled" fillcolor=red];
     }
     10 -> {11};
     11 -> {12};
@@ -91,13 +101,13 @@ digraph inPlaceLambdas_kt {
     14 -> {15};
     15 -> {16};
     16 -> {17 18};
-    17 -> {32};
+    17 -> {36};
     18 -> {19};
     19 -> {20};
-    20 -> {21 29};
-    20 -> {28} [style=dotted];
-    20 -> {21} [style=dashed];
-    21 -> {22};
+    20 -> {21};
+    21 -> {22 31};
+    21 -> {32} [style=dotted];
+    21 -> {22} [style=dashed];
     22 -> {23};
     23 -> {24};
     24 -> {25};
@@ -106,131 +116,156 @@ digraph inPlaceLambdas_kt {
     27 -> {28};
     28 -> {29};
     29 -> {30};
-    30 -> {31};
-    31 -> {32};
+    30 -> {32};
+    31 -> {33};
     32 -> {33};
     33 -> {34};
-
-    subgraph cluster_12 {
-        color=red
-        35 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_13 {
-            color=blue
-            36 [label="Enter block"];
-            37 [label="Postponed enter to lambda"];
-            subgraph cluster_14 {
-                color=blue
-                38 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_15 {
-                    color=blue
-                    39 [label="Enter block"];
-                    40 [label="Access variable R|<local>/x|"];
-                    41 [label="Type operator: (R|<local>/x| as R|B|)"];
-                    42 [label="Exit block"];
-                }
-                43 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            44 [label="Postponed exit from lambda"];
-            45 [label="Function call: R|kotlin/run|<R|B|>(...)" style="filled" fillcolor=yellow];
-            46 [label="Access variable R|<local>/x|"];
-            47 [label="Smart cast: R|<local>/x|"];
-            48 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
-            49 [label="Exit block"];
-        }
-        50 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
+    34 -> {35};
     35 -> {36};
     36 -> {37};
-    37 -> {38 45};
-    37 -> {44} [style=dotted];
-    37 -> {38} [style=dashed];
-    38 -> {39};
+    37 -> {38};
+
+    subgraph cluster_14 {
+        color=red
+        39 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_15 {
+            color=blue
+            40 [label="Enter block"];
+            subgraph cluster_16 {
+                color=blue
+                41 [label="Function call arguments enter"];
+                42 [label="Postponed enter to lambda"];
+                subgraph cluster_17 {
+                    color=blue
+                    43 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_18 {
+                        color=blue
+                        44 [label="Enter block"];
+                        45 [label="Access variable R|<local>/x|"];
+                        46 [label="Type operator: (R|<local>/x| as R|B|)"];
+                        47 [label="Exit block"];
+                    }
+                    48 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                49 [label="Function call arguments exit"];
+            }
+            50 [label="Postponed exit from lambda"];
+            51 [label="Function call: R|kotlin/run|<R|B|>(...)" style="filled" fillcolor=yellow];
+            subgraph cluster_19 {
+                color=blue
+                52 [label="Function call arguments enter"];
+                53 [label="Access variable R|<local>/x|"];
+                54 [label="Smart cast: R|<local>/x|"];
+                55 [label="Function call arguments exit"];
+            }
+            56 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
+            57 [label="Exit block"];
+        }
+        58 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
     39 -> {40};
     40 -> {41};
     41 -> {42};
-    42 -> {43};
+    42 -> {43 49};
+    42 -> {50} [style=dotted];
+    42 -> {43} [style=dashed];
     43 -> {44};
     44 -> {45};
     45 -> {46};
     46 -> {47};
     47 -> {48};
-    48 -> {49};
-    49 -> {50};
-
-    subgraph cluster_16 {
-        color=red
-        51 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_17 {
-            color=blue
-            52 [label="Enter block"];
-            subgraph cluster_18 {
-                color=blue
-                53 [label="Enter when"];
-                subgraph cluster_19 {
-                    color=blue
-                    54 [label="Enter when branch condition "];
-                    55 [label="Access variable R|<local>/x|"];
-                    56 [label="Type operator: (R|<local>/x| is R|A|)"];
-                    57 [label="Exit when branch condition"];
-                }
-                58 [label="Synthetic else branch"];
-                59 [label="Enter when branch result"];
-                subgraph cluster_20 {
-                    color=blue
-                    60 [label="Enter block"];
-                    61 [label="Postponed enter to lambda"];
-                    subgraph cluster_21 {
-                        color=blue
-                        62 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                        subgraph cluster_22 {
-                            color=blue
-                            63 [label="Enter block"];
-                            64 [label="Access variable R|<local>/x|"];
-                            65 [label="Smart cast: R|<local>/x|"];
-                            66 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                            67 [label="Access variable R|<local>/x|"];
-                            68 [label="Smart cast: R|<local>/x|"];
-                            69 [label="Type operator: (R|<local>/x| as R|B|)"];
-                            70 [label="Exit block"];
-                        }
-                        71 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-                    }
-                    72 [label="Postponed exit from lambda"];
-                    73 [label="Function call: R|kotlin/run|<R|B|>(...)" style="filled" fillcolor=yellow];
-                    74 [label="Access variable R|<local>/x|"];
-                    75 [label="Smart cast: R|<local>/x|"];
-                    76 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
-                    77 [label="Exit block"];
-                }
-                78 [label="Exit when branch result"];
-                79 [label="Exit when"];
-            }
-            80 [label="Exit block"];
-        }
-        81 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
+    48 -> {50};
+    49 -> {51};
+    50 -> {51};
     51 -> {52};
     52 -> {53};
     53 -> {54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
-    57 -> {58 59};
-    58 -> {79};
+    57 -> {58};
+
+    subgraph cluster_20 {
+        color=red
+        59 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_21 {
+            color=blue
+            60 [label="Enter block"];
+            subgraph cluster_22 {
+                color=blue
+                61 [label="Enter when"];
+                subgraph cluster_23 {
+                    color=blue
+                    62 [label="Enter when branch condition "];
+                    63 [label="Access variable R|<local>/x|"];
+                    64 [label="Type operator: (R|<local>/x| is R|A|)"];
+                    65 [label="Exit when branch condition"];
+                }
+                66 [label="Synthetic else branch"];
+                67 [label="Enter when branch result"];
+                subgraph cluster_24 {
+                    color=blue
+                    68 [label="Enter block"];
+                    subgraph cluster_25 {
+                        color=blue
+                        69 [label="Function call arguments enter"];
+                        70 [label="Postponed enter to lambda"];
+                        subgraph cluster_26 {
+                            color=blue
+                            71 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                            subgraph cluster_27 {
+                                color=blue
+                                72 [label="Enter block"];
+                                subgraph cluster_28 {
+                                    color=blue
+                                    73 [label="Function call arguments enter"];
+                                    74 [label="Access variable R|<local>/x|"];
+                                    75 [label="Smart cast: R|<local>/x|"];
+                                    76 [label="Function call arguments exit"];
+                                }
+                                77 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                                78 [label="Access variable R|<local>/x|"];
+                                79 [label="Smart cast: R|<local>/x|"];
+                                80 [label="Type operator: (R|<local>/x| as R|B|)"];
+                                81 [label="Exit block"];
+                            }
+                            82 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                        }
+                        83 [label="Function call arguments exit"];
+                    }
+                    84 [label="Postponed exit from lambda"];
+                    85 [label="Function call: R|kotlin/run|<R|B|>(...)" style="filled" fillcolor=yellow];
+                    subgraph cluster_29 {
+                        color=blue
+                        86 [label="Function call arguments enter"];
+                        87 [label="Access variable R|<local>/x|"];
+                        88 [label="Smart cast: R|<local>/x|"];
+                        89 [label="Function call arguments exit"];
+                    }
+                    90 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
+                    91 [label="Exit block"];
+                }
+                92 [label="Exit when branch result"];
+                93 [label="Exit when"];
+            }
+            94 [label="Exit block"];
+        }
+        95 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
     59 -> {60};
     60 -> {61};
-    61 -> {62 73};
-    61 -> {72} [style=dotted];
-    61 -> {62} [style=dashed];
+    61 -> {62};
     62 -> {63};
     63 -> {64};
     64 -> {65};
-    65 -> {66};
-    66 -> {67};
+    65 -> {66 67};
+    66 -> {93};
     67 -> {68};
     68 -> {69};
     69 -> {70};
-    70 -> {71};
+    70 -> {71 83};
+    70 -> {84} [style=dotted];
+    70 -> {71} [style=dashed];
     71 -> {72};
     72 -> {73};
     73 -> {74};
@@ -241,5 +276,19 @@ digraph inPlaceLambdas_kt {
     78 -> {79};
     79 -> {80};
     80 -> {81};
+    81 -> {82};
+    82 -> {84};
+    83 -> {85};
+    84 -> {85};
+    85 -> {86};
+    86 -> {87};
+    87 -> {88};
+    88 -> {89};
+    89 -> {90};
+    90 -> {91};
+    91 -> {92};
+    92 -> {93};
+    93 -> {94};
+    94 -> {95};
 
 }

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

@@ -144,70 +144,75 @@ digraph lambdaInWhenBranch_kt {
                 subgraph cluster_18 {
                     color=blue
                     49 [label="Enter block"];
-                    50 [label="Const: String()"];
-                    51 [label="Postponed enter to lambda"];
                     subgraph cluster_19 {
                         color=blue
-                        52 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                        50 [label="Function call arguments enter"];
+                        51 [label="Const: String()"];
+                        52 [label="Postponed enter to lambda"];
                         subgraph cluster_20 {
                             color=blue
-                            53 [label="Enter block"];
-                            54 [label="Access variable R|<local>/it|"];
-                            55 [label="Exit block"];
+                            53 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                            subgraph cluster_21 {
+                                color=blue
+                                54 [label="Enter block"];
+                                55 [label="Access variable R|<local>/it|"];
+                                56 [label="Exit block"];
+                            }
+                            57 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                         }
-                        56 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                        58 [label="Function call arguments exit"];
                     }
-                    57 [label="Postponed exit from lambda"];
-                    58 [label="Function call: String().R|kotlin/let|<R|kotlin/String|, R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
-                    59 [label="Exit block"];
+                    59 [label="Postponed exit from lambda"];
+                    60 [label="Function call: String().R|kotlin/let|<R|kotlin/String|, R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
+                    61 [label="Exit block"];
                 }
-                60 [label="Exit when branch result"];
-                61 [label="Exit when"];
+                62 [label="Exit when branch result"];
+                63 [label="Exit when"];
             }
-            62 [label="Access variable R|<local>/p|"];
-            63 [label="Access variable <Unresolved name: t>#"];
-            subgraph cluster_21 {
+            64 [label="Access variable R|<local>/p|"];
+            65 [label="Access variable <Unresolved name: t>#"];
+            subgraph cluster_22 {
                 color=blue
-                64 [label="Enter when"];
-                65 [label="Access variable R|<local>/p|"];
-                subgraph cluster_22 {
-                    color=blue
-                    66 [label="Enter when branch condition "];
-                    67 [label="Exit $subj"];
-                    68 [label="Type operator: ($subj$ is R|SubClass1|)"];
-                    69 [label="Exit when branch condition"];
-                }
+                66 [label="Enter when"];
+                67 [label="Access variable R|<local>/p|"];
                 subgraph cluster_23 {
                     color=blue
-                    70 [label="Enter when branch condition "];
-                    71 [label="Exit $subj"];
-                    72 [label="Type operator: ($subj$ is R|SubClass2|)"];
-                    73 [label="Exit when branch condition"];
+                    68 [label="Enter when branch condition "];
+                    69 [label="Exit $subj"];
+                    70 [label="Type operator: ($subj$ is R|SubClass1|)"];
+                    71 [label="Exit when branch condition"];
                 }
-                74 [label="Enter when branch result"];
                 subgraph cluster_24 {
                     color=blue
-                    75 [label="Enter block"];
-                    76 [label="Const: String(2)"];
-                    77 [label="Exit block"];
+                    72 [label="Enter when branch condition "];
+                    73 [label="Exit $subj"];
+                    74 [label="Type operator: ($subj$ is R|SubClass2|)"];
+                    75 [label="Exit when branch condition"];
                 }
-                78 [label="Exit when branch result"];
-                79 [label="Enter when branch result"];
+                76 [label="Enter when branch result"];
                 subgraph cluster_25 {
                     color=blue
-                    80 [label="Enter block"];
-                    81 [label="Access variable R|<local>/p|"];
-                    82 [label="Smart cast: R|<local>/p|"];
-                    83 [label="Access variable R|/SubClass1.t|"];
-                    84 [label="Exit block"];
+                    77 [label="Enter block"];
+                    78 [label="Const: String(2)"];
+                    79 [label="Exit block"];
                 }
-                85 [label="Exit when branch result"];
-                86 [label="Exit when"];
+                80 [label="Exit when branch result"];
+                81 [label="Enter when branch result"];
+                subgraph cluster_26 {
+                    color=blue
+                    82 [label="Enter block"];
+                    83 [label="Access variable R|<local>/p|"];
+                    84 [label="Smart cast: R|<local>/p|"];
+                    85 [label="Access variable R|/SubClass1.t|"];
+                    86 [label="Exit block"];
+                }
+                87 [label="Exit when branch result"];
+                88 [label="Exit when"];
             }
-            87 [label="Access variable R|kotlin/String.length|"];
-            88 [label="Exit block"];
+            89 [label="Access variable R|kotlin/String.length|"];
+            90 [label="Exit block"];
         }
-        89 [label="Exit function foo" style="filled" fillcolor=red];
+        91 [label="Exit function foo" style="filled" fillcolor=red];
     }
     31 -> {32};
     32 -> {33};
@@ -225,22 +230,22 @@ digraph lambdaInWhenBranch_kt {
     44 -> {45};
     45 -> {46};
     46 -> {47};
-    47 -> {61};
+    47 -> {63};
     48 -> {49};
     49 -> {50};
     50 -> {51};
-    51 -> {52 58};
-    51 -> {57} [style=dotted];
-    51 -> {52} [style=dashed];
-    52 -> {53};
+    51 -> {52};
+    52 -> {53 58};
+    52 -> {59} [style=dotted];
+    52 -> {53} [style=dashed];
     53 -> {54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
-    57 -> {58} [color=green];
-    57 -> {61} [color=red];
-    58 -> {59};
-    59 -> {60};
+    57 -> {59};
+    58 -> {60};
+    59 -> {60} [color=green];
+    59 -> {63} [color=red];
     60 -> {61};
     61 -> {62};
     62 -> {63};
@@ -250,18 +255,18 @@ digraph lambdaInWhenBranch_kt {
     66 -> {67};
     67 -> {68};
     68 -> {69};
-    69 -> {70 79};
+    69 -> {70};
     70 -> {71};
-    71 -> {72};
+    71 -> {72 81};
     72 -> {73};
     73 -> {74};
     74 -> {75};
     75 -> {76};
     76 -> {77};
     77 -> {78};
-    78 -> {86};
+    78 -> {79};
     79 -> {80};
-    80 -> {81};
+    80 -> {88};
     81 -> {82};
     82 -> {83};
     83 -> {84};
@@ -270,5 +275,7 @@ digraph lambdaInWhenBranch_kt {
     86 -> {87};
     87 -> {88};
     88 -> {89};
+    89 -> {90};
+    90 -> {91};
 
 }

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

@@ -32,15 +32,20 @@ digraph smartcastOnLambda_kt {
                 subgraph cluster_5 {
                     color=blue
                     12 [label="Enter block"];
-                    13 [label="Function call: R|<local>/func|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-                    14 [label="Exit block"];
+                    subgraph cluster_6 {
+                        color=blue
+                        13 [label="Function call arguments enter"];
+                        14 [label="Function call arguments exit"];
+                    }
+                    15 [label="Function call: R|<local>/func|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+                    16 [label="Exit block"];
                 }
-                15 [label="Exit when branch result"];
-                16 [label="Exit when"];
+                17 [label="Exit when branch result"];
+                18 [label="Exit when"];
             }
-            17 [label="Exit block"];
+            19 [label="Exit block"];
         }
-        18 [label="Exit function test" style="filled" fillcolor=red];
+        20 [label="Exit function test" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
@@ -50,7 +55,7 @@ digraph smartcastOnLambda_kt {
     7 -> {8};
     8 -> {9};
     9 -> {10 11};
-    10 -> {16};
+    10 -> {18};
     11 -> {12};
     12 -> {13};
     13 -> {14};
@@ -58,5 +63,7 @@ digraph smartcastOnLambda_kt {
     15 -> {16};
     16 -> {17};
     17 -> {18};
+    18 -> {19};
+    19 -> {20};
 
 }

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

@@ -71,18 +71,23 @@ digraph dataFlowInfoFromWhileCondition_kt {
                     subgraph cluster_11 {
                         color=blue
                         26 [label="Enter block"];
-                        27 [label="Access variable R|<local>/a|"];
-                        28 [label="Smart cast: R|<local>/a|"];
-                        29 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                        30 [label="Exit block"];
+                        subgraph cluster_12 {
+                            color=blue
+                            27 [label="Function call arguments enter"];
+                            28 [label="Access variable R|<local>/a|"];
+                            29 [label="Smart cast: R|<local>/a|"];
+                            30 [label="Function call arguments exit"];
+                        }
+                        31 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                        32 [label="Exit block"];
                     }
-                    31 [label="Exit loop block"];
+                    33 [label="Exit loop block"];
                 }
-                32 [label="Exit while loop"];
+                34 [label="Exit while loop"];
             }
-            33 [label="Exit block"];
+            35 [label="Exit block"];
         }
-        34 [label="Exit function test" style="filled" fillcolor=red];
+        36 [label="Exit function test" style="filled" fillcolor=red];
     }
     10 -> {11};
     11 -> {12};
@@ -98,15 +103,17 @@ digraph dataFlowInfoFromWhileCondition_kt {
     21 -> {22};
     22 -> {23};
     23 -> {24};
-    24 -> {25 32};
+    24 -> {25 34};
     25 -> {26};
     26 -> {27};
     27 -> {28};
     28 -> {29};
     29 -> {30};
     30 -> {31};
-    31 -> {15} [color=green style=dashed];
+    31 -> {32};
     32 -> {33};
-    33 -> {34};
+    33 -> {15} [color=green style=dashed];
+    34 -> {35};
+    35 -> {36};
 
 }

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

@@ -65,23 +65,43 @@ digraph multipleCasts_kt {
         subgraph cluster_8 {
             color=blue
             18 [label="Enter block"];
-            19 [label="Function call: R|/getAny|()" style="filled" fillcolor=yellow];
-            20 [label="Variable declaration: lval a: R|kotlin/Any?|"];
+            subgraph cluster_9 {
+                color=blue
+                19 [label="Function call arguments enter"];
+                20 [label="Function call arguments exit"];
+            }
             21 [label="Function call: R|/getAny|()" style="filled" fillcolor=yellow];
-            22 [label="Variable declaration: lval b: R|kotlin/Any?|"];
-            23 [label="Access variable R|<local>/a|"];
-            24 [label="Type operator: (R|<local>/a| as R|A|)"];
-            25 [label="Access variable R|<local>/a|"];
-            26 [label="Smart cast: R|<local>/a|"];
-            27 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
-            28 [label="Access variable R|<local>/b|"];
-            29 [label="Type operator: (R|<local>/b| as R|B|)"];
-            30 [label="Access variable R|<local>/b|"];
-            31 [label="Smart cast: R|<local>/b|"];
-            32 [label="Function call: R|<local>/b|.R|/B.foo|()" style="filled" fillcolor=yellow];
-            33 [label="Exit block"];
+            22 [label="Variable declaration: lval a: R|kotlin/Any?|"];
+            subgraph cluster_10 {
+                color=blue
+                23 [label="Function call arguments enter"];
+                24 [label="Function call arguments exit"];
+            }
+            25 [label="Function call: R|/getAny|()" style="filled" fillcolor=yellow];
+            26 [label="Variable declaration: lval b: R|kotlin/Any?|"];
+            27 [label="Access variable R|<local>/a|"];
+            28 [label="Type operator: (R|<local>/a| as R|A|)"];
+            subgraph cluster_11 {
+                color=blue
+                29 [label="Function call arguments enter"];
+                30 [label="Access variable R|<local>/a|"];
+                31 [label="Smart cast: R|<local>/a|"];
+                32 [label="Function call arguments exit"];
+            }
+            33 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
+            34 [label="Access variable R|<local>/b|"];
+            35 [label="Type operator: (R|<local>/b| as R|B|)"];
+            subgraph cluster_12 {
+                color=blue
+                36 [label="Function call arguments enter"];
+                37 [label="Access variable R|<local>/b|"];
+                38 [label="Smart cast: R|<local>/b|"];
+                39 [label="Function call arguments exit"];
+            }
+            40 [label="Function call: R|<local>/b|.R|/B.foo|()" style="filled" fillcolor=yellow];
+            41 [label="Exit block"];
         }
-        34 [label="Exit function test_0" style="filled" fillcolor=red];
+        42 [label="Exit function test_0" style="filled" fillcolor=red];
     }
     17 -> {18};
     18 -> {19};
@@ -100,56 +120,7 @@ digraph multipleCasts_kt {
     31 -> {32};
     32 -> {33};
     33 -> {34};
-
-    subgraph cluster_9 {
-        color=red
-        35 [label="Enter function test_1" style="filled" fillcolor=red];
-        subgraph cluster_10 {
-            color=blue
-            36 [label="Enter block"];
-            37 [label="Function call: R|/getAny|()" style="filled" fillcolor=yellow];
-            38 [label="Variable declaration: lval a: R|kotlin/Any?|"];
-            39 [label="Function call: R|/getAny|()" style="filled" fillcolor=yellow];
-            40 [label="Variable declaration: lval b: R|kotlin/Any?|"];
-            subgraph cluster_11 {
-                color=blue
-                41 [label="Enter when"];
-                subgraph cluster_12 {
-                    color=blue
-                    42 [label="Enter when branch condition "];
-                    subgraph cluster_13 {
-                        color=blue
-                        43 [label="Enter &&"];
-                        44 [label="Access variable R|<local>/a|"];
-                        45 [label="Type operator: (R|<local>/a| is R|A|)"];
-                        46 [label="Exit left part of &&"];
-                        47 [label="Enter right part of &&"];
-                        48 [label="Access variable R|<local>/b|"];
-                        49 [label="Type operator: (R|<local>/b| is R|B|)"];
-                        50 [label="Exit &&"];
-                    }
-                    51 [label="Exit when branch condition"];
-                }
-                52 [label="Synthetic else branch"];
-                53 [label="Enter when branch result"];
-                subgraph cluster_14 {
-                    color=blue
-                    54 [label="Enter block"];
-                    55 [label="Access variable R|<local>/a|"];
-                    56 [label="Smart cast: R|<local>/a|"];
-                    57 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    58 [label="Access variable R|<local>/b|"];
-                    59 [label="Smart cast: R|<local>/b|"];
-                    60 [label="Function call: R|<local>/b|.R|/B.foo|()" style="filled" fillcolor=yellow];
-                    61 [label="Exit block"];
-                }
-                62 [label="Exit when branch result"];
-                63 [label="Exit when"];
-            }
-            64 [label="Exit block"];
-        }
-        65 [label="Exit function test_1" style="filled" fillcolor=red];
-    }
+    34 -> {35};
     35 -> {36};
     36 -> {37};
     37 -> {38};
@@ -157,28 +128,113 @@ digraph multipleCasts_kt {
     39 -> {40};
     40 -> {41};
     41 -> {42};
-    42 -> {43};
+
+    subgraph cluster_13 {
+        color=red
+        43 [label="Enter function test_1" style="filled" fillcolor=red];
+        subgraph cluster_14 {
+            color=blue
+            44 [label="Enter block"];
+            subgraph cluster_15 {
+                color=blue
+                45 [label="Function call arguments enter"];
+                46 [label="Function call arguments exit"];
+            }
+            47 [label="Function call: R|/getAny|()" style="filled" fillcolor=yellow];
+            48 [label="Variable declaration: lval a: R|kotlin/Any?|"];
+            subgraph cluster_16 {
+                color=blue
+                49 [label="Function call arguments enter"];
+                50 [label="Function call arguments exit"];
+            }
+            51 [label="Function call: R|/getAny|()" style="filled" fillcolor=yellow];
+            52 [label="Variable declaration: lval b: R|kotlin/Any?|"];
+            subgraph cluster_17 {
+                color=blue
+                53 [label="Enter when"];
+                subgraph cluster_18 {
+                    color=blue
+                    54 [label="Enter when branch condition "];
+                    subgraph cluster_19 {
+                        color=blue
+                        55 [label="Enter &&"];
+                        56 [label="Access variable R|<local>/a|"];
+                        57 [label="Type operator: (R|<local>/a| is R|A|)"];
+                        58 [label="Exit left part of &&"];
+                        59 [label="Enter right part of &&"];
+                        60 [label="Access variable R|<local>/b|"];
+                        61 [label="Type operator: (R|<local>/b| is R|B|)"];
+                        62 [label="Exit &&"];
+                    }
+                    63 [label="Exit when branch condition"];
+                }
+                64 [label="Synthetic else branch"];
+                65 [label="Enter when branch result"];
+                subgraph cluster_20 {
+                    color=blue
+                    66 [label="Enter block"];
+                    subgraph cluster_21 {
+                        color=blue
+                        67 [label="Function call arguments enter"];
+                        68 [label="Access variable R|<local>/a|"];
+                        69 [label="Smart cast: R|<local>/a|"];
+                        70 [label="Function call arguments exit"];
+                    }
+                    71 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    subgraph cluster_22 {
+                        color=blue
+                        72 [label="Function call arguments enter"];
+                        73 [label="Access variable R|<local>/b|"];
+                        74 [label="Smart cast: R|<local>/b|"];
+                        75 [label="Function call arguments exit"];
+                    }
+                    76 [label="Function call: R|<local>/b|.R|/B.foo|()" style="filled" fillcolor=yellow];
+                    77 [label="Exit block"];
+                }
+                78 [label="Exit when branch result"];
+                79 [label="Exit when"];
+            }
+            80 [label="Exit block"];
+        }
+        81 [label="Exit function test_1" style="filled" fillcolor=red];
+    }
     43 -> {44};
     44 -> {45};
     45 -> {46};
-    46 -> {47 50};
+    46 -> {47};
     47 -> {48};
     48 -> {49};
     49 -> {50};
     50 -> {51};
-    51 -> {52 53};
-    52 -> {63};
+    51 -> {52};
+    52 -> {53};
     53 -> {54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
     57 -> {58};
-    58 -> {59};
+    58 -> {59 62};
     59 -> {60};
     60 -> {61};
     61 -> {62};
     62 -> {63};
-    63 -> {64};
-    64 -> {65};
+    63 -> {64 65};
+    64 -> {79};
+    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 -> {78};
+    78 -> {79};
+    79 -> {80};
+    80 -> {81};
 
 }

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

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

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

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

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

@@ -53,22 +53,27 @@ digraph safeCalls_kt {
             14 [label="Enter block"];
             15 [label="Access variable R|<local>/x|"];
             16 [label="Enter safe call"];
-            17 [label="Access variable R|<local>/x|"];
-            18 [label="Smart cast: R|<local>/x|"];
-            19 [label="Access variable R|kotlin/String.length|"];
-            20 [label="Const: Int(1)"];
-            21 [label="Equality operator =="];
-            22 [label="Function call: $subj$.R|/foo|(...)" style="filled" fillcolor=yellow];
-            23 [label="Exit safe call"];
-            24 [label="Access variable R|<local>/x|"];
-            25 [label="Access variable R|kotlin/String.length<Inapplicable(UNSAFE_CALL): kotlin/String.length>#|"];
-            26 [label="Exit block"];
+            subgraph cluster_7 {
+                color=blue
+                17 [label="Function call arguments enter"];
+                18 [label="Access variable R|<local>/x|"];
+                19 [label="Smart cast: R|<local>/x|"];
+                20 [label="Access variable R|kotlin/String.length|"];
+                21 [label="Const: Int(1)"];
+                22 [label="Equality operator =="];
+                23 [label="Function call arguments exit"];
+            }
+            24 [label="Function call: $subj$.R|/foo|(...)" style="filled" fillcolor=yellow];
+            25 [label="Exit safe call"];
+            26 [label="Access variable R|<local>/x|"];
+            27 [label="Access variable R|kotlin/String.length<Inapplicable(UNSAFE_CALL): kotlin/String.length>#|"];
+            28 [label="Exit block"];
         }
-        27 [label="Exit function test" style="filled" fillcolor=red];
+        29 [label="Exit function test" style="filled" fillcolor=red];
     }
     13 -> {14};
     14 -> {15};
-    15 -> {16 23};
+    15 -> {16 25};
     16 -> {17};
     17 -> {18};
     18 -> {19};
@@ -80,246 +85,346 @@ digraph safeCalls_kt {
     24 -> {25};
     25 -> {26};
     26 -> {27};
-
-    subgraph cluster_7 {
-        color=red
-        28 [label="Enter class A" style="filled" fillcolor=red];
-        29 [label="Exit class A" style="filled" fillcolor=red];
-    }
-    28 -> {29} [color=green];
+    27 -> {28};
+    28 -> {29};
 
     subgraph cluster_8 {
         color=red
-        30 [label="Enter function bar" style="filled" fillcolor=red];
-        31 [label="Exit function bar" style="filled" fillcolor=red];
+        30 [label="Enter class A" style="filled" fillcolor=red];
+        31 [label="Exit class A" style="filled" fillcolor=red];
     }
-    30 -> {31};
+    30 -> {31} [color=green];
 
     subgraph cluster_9 {
         color=red
-        32 [label="Enter function bool" style="filled" fillcolor=red];
-        33 [label="Exit function bool" style="filled" fillcolor=red];
+        32 [label="Enter function bar" style="filled" fillcolor=red];
+        33 [label="Exit function bar" style="filled" fillcolor=red];
     }
     32 -> {33};
 
     subgraph cluster_10 {
         color=red
-        34 [label="Enter function id" style="filled" fillcolor=red];
-        35 [label="Exit function id" style="filled" fillcolor=red];
+        34 [label="Enter function bool" style="filled" fillcolor=red];
+        35 [label="Exit function bool" style="filled" fillcolor=red];
     }
     34 -> {35};
 
     subgraph cluster_11 {
         color=red
-        36 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_12 {
-            color=blue
-            37 [label="Enter block"];
-            38 [label="Access variable R|<local>/x|"];
-            39 [label="Type operator: (R|<local>/x| as? R|A|)"];
-            40 [label="Enter safe call"];
-            41 [label="Access variable R|<local>/x|"];
-            42 [label="Smart cast: R|<local>/x|"];
-            43 [label="Function call: $subj$.R|/A.bar|(...)" style="filled" fillcolor=yellow];
-            44 [label="Exit safe call"];
-            45 [label="Exit block"];
-        }
-        46 [label="Exit function test_2" style="filled" fillcolor=red];
+        36 [label="Enter function id" style="filled" fillcolor=red];
+        37 [label="Exit function id" style="filled" fillcolor=red];
     }
     36 -> {37};
-    37 -> {38};
+
+    subgraph cluster_12 {
+        color=red
+        38 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_13 {
+            color=blue
+            39 [label="Enter block"];
+            40 [label="Access variable R|<local>/x|"];
+            41 [label="Type operator: (R|<local>/x| as? R|A|)"];
+            42 [label="Enter safe call"];
+            subgraph cluster_14 {
+                color=blue
+                43 [label="Function call arguments enter"];
+                44 [label="Access variable R|<local>/x|"];
+                45 [label="Smart cast: R|<local>/x|"];
+                46 [label="Function call arguments exit"];
+            }
+            47 [label="Function call: $subj$.R|/A.bar|(...)" style="filled" fillcolor=yellow];
+            48 [label="Exit safe call"];
+            49 [label="Exit block"];
+        }
+        50 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
     38 -> {39};
-    39 -> {40 44};
+    39 -> {40};
     40 -> {41};
-    41 -> {42};
+    41 -> {42 48};
     42 -> {43};
     43 -> {44};
     44 -> {45};
     45 -> {46};
-
-    subgraph cluster_13 {
-        color=red
-        47 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_14 {
-            color=blue
-            48 [label="Enter block"];
-            49 [label="Access variable R|<local>/x|"];
-            50 [label="Type operator: (R|<local>/x| as? R|A|)"];
-            51 [label="Enter safe call"];
-            52 [label="Access variable R|<local>/x|"];
-            53 [label="Smart cast: R|<local>/x|"];
-            54 [label="Function call: $subj$.R|/A.bar|(...)" style="filled" fillcolor=yellow];
-            55 [label="Enter safe call"];
-            56 [label="Access variable R|<local>/x|"];
-            57 [label="Smart cast: R|<local>/x|"];
-            58 [label="Function call: R|<local>/x|.R|/A.bool|()" style="filled" fillcolor=yellow];
-            59 [label="Function call: $subj$.R|/foo|(...)" style="filled" fillcolor=yellow];
-            60 [label="Enter safe call"];
-            61 [label="Postponed enter to lambda"];
-            subgraph cluster_15 {
-                color=blue
-                62 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_16 {
-                    color=blue
-                    63 [label="Enter block"];
-                    64 [label="Access variable R|<local>/x|"];
-                    65 [label="Smart cast: R|<local>/x|"];
-                    66 [label="Function call: R|<local>/x|.R|/A.bool|()" style="filled" fillcolor=yellow];
-                    67 [label="Exit block"];
-                }
-                68 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            69 [label="Postponed exit from lambda"];
-            70 [label="Function call: $subj$.R|/let|(...)" style="filled" fillcolor=yellow];
-            71 [label="Exit safe call"];
-            72 [label="Exit safe call"];
-            73 [label="Exit safe call"];
-            74 [label="Access variable R|<local>/x|"];
-            75 [label="Function call: R|<local>/x|.<Unresolved name: bool>#()" style="filled" fillcolor=yellow];
-            76 [label="Exit block"];
-        }
-        77 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
+    46 -> {47};
     47 -> {48};
     48 -> {49};
     49 -> {50};
-    50 -> {51 71};
+
+    subgraph cluster_15 {
+        color=red
+        51 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_16 {
+            color=blue
+            52 [label="Enter block"];
+            53 [label="Access variable R|<local>/x|"];
+            54 [label="Type operator: (R|<local>/x| as? R|A|)"];
+            55 [label="Enter safe call"];
+            subgraph cluster_17 {
+                color=blue
+                56 [label="Function call arguments enter"];
+                57 [label="Access variable R|<local>/x|"];
+                58 [label="Smart cast: R|<local>/x|"];
+                59 [label="Function call arguments exit"];
+            }
+            60 [label="Function call: $subj$.R|/A.bar|(...)" style="filled" fillcolor=yellow];
+            61 [label="Enter safe call"];
+            subgraph cluster_18 {
+                color=blue
+                62 [label="Function call arguments enter"];
+                subgraph cluster_19 {
+                    color=blue
+                    63 [label="Function call arguments enter"];
+                    64 [label="Access variable R|<local>/x|"];
+                    65 [label="Smart cast: R|<local>/x|"];
+                    66 [label="Function call arguments exit"];
+                }
+                67 [label="Function call: R|<local>/x|.R|/A.bool|()" style="filled" fillcolor=yellow];
+                68 [label="Function call arguments exit"];
+            }
+            69 [label="Function call: $subj$.R|/foo|(...)" style="filled" fillcolor=yellow];
+            70 [label="Enter safe call"];
+            subgraph cluster_20 {
+                color=blue
+                71 [label="Function call arguments enter"];
+                72 [label="Postponed enter to lambda"];
+                subgraph cluster_21 {
+                    color=blue
+                    73 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_22 {
+                        color=blue
+                        74 [label="Enter block"];
+                        subgraph cluster_23 {
+                            color=blue
+                            75 [label="Function call arguments enter"];
+                            76 [label="Access variable R|<local>/x|"];
+                            77 [label="Smart cast: R|<local>/x|"];
+                            78 [label="Function call arguments exit"];
+                        }
+                        79 [label="Function call: R|<local>/x|.R|/A.bool|()" style="filled" fillcolor=yellow];
+                        80 [label="Exit block"];
+                    }
+                    81 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                82 [label="Function call arguments exit"];
+            }
+            83 [label="Postponed exit from lambda"];
+            84 [label="Function call: $subj$.R|/let|(...)" style="filled" fillcolor=yellow];
+            85 [label="Exit safe call"];
+            86 [label="Exit safe call"];
+            87 [label="Exit safe call"];
+            subgraph cluster_24 {
+                color=blue
+                88 [label="Function call arguments enter"];
+                89 [label="Access variable R|<local>/x|"];
+                90 [label="Function call arguments exit"];
+            }
+            91 [label="Function call: R|<local>/x|.<Unresolved name: bool>#()" style="filled" fillcolor=yellow];
+            92 [label="Exit block"];
+        }
+        93 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
     51 -> {52};
     52 -> {53};
     53 -> {54};
-    54 -> {55 71};
+    54 -> {55 85};
     55 -> {56};
     56 -> {57};
     57 -> {58};
     58 -> {59};
-    59 -> {60 72};
-    60 -> {61};
-    61 -> {62 69 70};
-    61 -> {62} [style=dashed];
+    59 -> {60};
+    60 -> {61 85};
+    61 -> {62};
     62 -> {63};
     63 -> {64};
     64 -> {65};
     65 -> {66};
     66 -> {67};
     67 -> {68};
-    69 -> {70};
-    70 -> {73};
+    68 -> {69};
+    69 -> {70 86};
+    70 -> {71};
     71 -> {72};
-    72 -> {73};
+    72 -> {73 82 83};
+    72 -> {73} [style=dashed];
     73 -> {74};
     74 -> {75};
     75 -> {76};
     76 -> {77};
-
-    subgraph cluster_17 {
-        color=red
-        78 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_18 {
-            color=blue
-            79 [label="Enter block"];
-            80 [label="Access variable R|<local>/x|"];
-            81 [label="Enter safe call"];
-            82 [label="Function call: $subj$.R|/A.id|()" style="filled" fillcolor=yellow];
-            83 [label="Enter safe call"];
-            84 [label="Function call: $subj$.R|/A.bool|()" style="filled" fillcolor=yellow];
-            85 [label="Exit safe call"];
-            86 [label="Exit safe call"];
-            87 [label="Access variable R|<local>/x|"];
-            88 [label="Function call: R|<local>/x|.R|/A.id<Inapplicable(UNSAFE_CALL): /A.id>#|()" style="filled" fillcolor=yellow];
-            89 [label="Exit block"];
-        }
-        90 [label="Exit function test_4" style="filled" fillcolor=red];
-    }
+    77 -> {78};
     78 -> {79};
     79 -> {80};
-    80 -> {81 85};
-    81 -> {82};
-    82 -> {83 85};
+    80 -> {81};
+    82 -> {84};
     83 -> {84};
-    84 -> {86};
+    84 -> {87};
     85 -> {86};
     86 -> {87};
     87 -> {88};
     88 -> {89};
     89 -> {90};
-
-    subgraph cluster_19 {
-        color=red
-        91 [label="Enter function boo" style="filled" fillcolor=red];
-        subgraph cluster_20 {
-            color=blue
-            92 [label="Enter block"];
-            93 [label="Exit block"];
-        }
-        94 [label="Exit function boo" style="filled" fillcolor=red];
-    }
+    90 -> {91};
     91 -> {92};
     92 -> {93};
-    93 -> {94};
 
-    subgraph cluster_21 {
+    subgraph cluster_25 {
         color=red
-        95 [label="Enter function test_5" style="filled" fillcolor=red];
-        subgraph cluster_22 {
+        94 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_26 {
             color=blue
-            96 [label="Enter block"];
-            97 [label="Access variable R|<local>/x|"];
-            98 [label="Enter safe call"];
-            99 [label="Postponed enter to lambda"];
-            subgraph cluster_23 {
+            95 [label="Enter block"];
+            96 [label="Access variable R|<local>/x|"];
+            97 [label="Enter safe call"];
+            subgraph cluster_27 {
                 color=blue
-                100 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_24 {
-                    color=blue
-                    101 [label="Enter block"];
-                    102 [label="Jump: ^test_5 Unit"];
-                    103 [label="Stub" style="filled" fillcolor=gray];
-                    104 [label="Exit block" style="filled" fillcolor=gray];
-                }
-                105 [label="Exit function <anonymous>" style="filled" fillcolor=gray];
+                98 [label="Function call arguments enter"];
+                99 [label="Function call arguments exit"];
             }
-            106 [label="Postponed exit from lambda" style="filled" fillcolor=gray];
-            107 [label="Function call: $subj$.R|kotlin/let|<R|A|, R|kotlin/Nothing|>(...)" style="filled" fillcolor=gray];
-            108 [label="Stub" style="filled" fillcolor=gray];
-            109 [label="Enter safe call" style="filled" fillcolor=gray];
-            110 [label="Access variable R|<local>/x|" style="filled" fillcolor=gray];
-            111 [label="Smart cast: R|<local>/x|" style="filled" fillcolor=gray];
-            112 [label="Function call: R|<local>/x|.R|/A.bool|()" style="filled" fillcolor=gray];
-            113 [label="Function call: $subj$.R|/boo|(...)" style="filled" fillcolor=gray];
-            114 [label="Exit safe call"];
-            115 [label="Exit safe call"];
-            116 [label="Access variable R|<local>/x|"];
-            117 [label="Function call: R|<local>/x|.R|/A.id<Inapplicable(UNSAFE_CALL): /A.id>#|()" style="filled" fillcolor=yellow];
-            118 [label="Exit block"];
+            100 [label="Function call: $subj$.R|/A.id|()" style="filled" fillcolor=yellow];
+            101 [label="Enter safe call"];
+            subgraph cluster_28 {
+                color=blue
+                102 [label="Function call arguments enter"];
+                103 [label="Function call arguments exit"];
+            }
+            104 [label="Function call: $subj$.R|/A.bool|()" style="filled" fillcolor=yellow];
+            105 [label="Exit safe call"];
+            106 [label="Exit safe call"];
+            subgraph cluster_29 {
+                color=blue
+                107 [label="Function call arguments enter"];
+                108 [label="Access variable R|<local>/x|"];
+                109 [label="Function call arguments exit"];
+            }
+            110 [label="Function call: R|<local>/x|.R|/A.id<Inapplicable(UNSAFE_CALL): /A.id>#|()" style="filled" fillcolor=yellow];
+            111 [label="Exit block"];
         }
-        119 [label="Exit function test_5" style="filled" fillcolor=red];
+        112 [label="Exit function test_4" style="filled" fillcolor=red];
     }
+    94 -> {95};
     95 -> {96};
-    96 -> {97};
-    97 -> {98 114};
+    96 -> {97 105};
+    97 -> {98};
     98 -> {99};
     99 -> {100};
-    99 -> {106 107} [style=dotted];
-    99 -> {100} [style=dashed];
-    100 -> {101};
+    100 -> {101 105};
     101 -> {102};
-    102 -> {119};
-    102 -> {103} [style=dotted];
-    103 -> {104} [style=dotted];
-    104 -> {105} [style=dotted];
-    105 -> {106} [style=dotted];
-    106 -> {107} [style=dotted];
-    107 -> {108} [style=dotted];
-    108 -> {109 114} [style=dotted];
-    109 -> {110} [style=dotted];
-    110 -> {111} [style=dotted];
-    111 -> {112} [style=dotted];
-    112 -> {113} [style=dotted];
-    113 -> {115} [style=dotted];
+    102 -> {103};
+    103 -> {104};
+    104 -> {106};
+    105 -> {106};
+    106 -> {107};
+    107 -> {108};
+    108 -> {109};
+    109 -> {110};
+    110 -> {111};
+    111 -> {112};
+
+    subgraph cluster_30 {
+        color=red
+        113 [label="Enter function boo" style="filled" fillcolor=red];
+        subgraph cluster_31 {
+            color=blue
+            114 [label="Enter block"];
+            115 [label="Exit block"];
+        }
+        116 [label="Exit function boo" style="filled" fillcolor=red];
+    }
+    113 -> {114};
     114 -> {115};
     115 -> {116};
-    116 -> {117};
+
+    subgraph cluster_32 {
+        color=red
+        117 [label="Enter function test_5" style="filled" fillcolor=red];
+        subgraph cluster_33 {
+            color=blue
+            118 [label="Enter block"];
+            119 [label="Access variable R|<local>/x|"];
+            120 [label="Enter safe call"];
+            subgraph cluster_34 {
+                color=blue
+                121 [label="Function call arguments enter"];
+                122 [label="Postponed enter to lambda"];
+                subgraph cluster_35 {
+                    color=blue
+                    123 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_36 {
+                        color=blue
+                        124 [label="Enter block"];
+                        125 [label="Jump: ^test_5 Unit"];
+                        126 [label="Stub" style="filled" fillcolor=gray];
+                        127 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    128 [label="Exit function <anonymous>" style="filled" fillcolor=gray];
+                }
+                129 [label="Function call arguments exit"];
+            }
+            130 [label="Postponed exit from lambda" style="filled" fillcolor=gray];
+            131 [label="Function call: $subj$.R|kotlin/let|<R|A|, R|kotlin/Nothing|>(...)" style="filled" fillcolor=gray];
+            132 [label="Stub" style="filled" fillcolor=gray];
+            133 [label="Enter safe call" style="filled" fillcolor=gray];
+            subgraph cluster_37 {
+                color=blue
+                134 [label="Function call arguments enter" style="filled" fillcolor=gray];
+                subgraph cluster_38 {
+                    color=blue
+                    135 [label="Function call arguments enter" style="filled" fillcolor=gray];
+                    136 [label="Access variable R|<local>/x|" style="filled" fillcolor=gray];
+                    137 [label="Smart cast: R|<local>/x|" style="filled" fillcolor=gray];
+                    138 [label="Function call arguments exit" style="filled" fillcolor=gray];
+                }
+                139 [label="Function call: R|<local>/x|.R|/A.bool|()" style="filled" fillcolor=gray];
+                140 [label="Function call arguments exit" style="filled" fillcolor=gray];
+            }
+            141 [label="Function call: $subj$.R|/boo|(...)" style="filled" fillcolor=gray];
+            142 [label="Exit safe call"];
+            143 [label="Exit safe call"];
+            subgraph cluster_39 {
+                color=blue
+                144 [label="Function call arguments enter"];
+                145 [label="Access variable R|<local>/x|"];
+                146 [label="Function call arguments exit"];
+            }
+            147 [label="Function call: R|<local>/x|.R|/A.id<Inapplicable(UNSAFE_CALL): /A.id>#|()" style="filled" fillcolor=yellow];
+            148 [label="Exit block"];
+        }
+        149 [label="Exit function test_5" style="filled" fillcolor=red];
+    }
     117 -> {118};
     118 -> {119};
+    119 -> {120 142};
+    120 -> {121};
+    121 -> {122};
+    122 -> {123 129};
+    122 -> {130} [style=dotted];
+    122 -> {123} [style=dashed];
+    123 -> {124};
+    124 -> {125};
+    125 -> {149};
+    125 -> {126} [style=dotted];
+    126 -> {127} [style=dotted];
+    127 -> {128} [style=dotted];
+    128 -> {130} [style=dotted];
+    129 -> {131} [style=dotted];
+    130 -> {131} [style=dotted];
+    131 -> {132} [style=dotted];
+    132 -> {133 142} [style=dotted];
+    133 -> {134} [style=dotted];
+    134 -> {135} [style=dotted];
+    135 -> {136} [style=dotted];
+    136 -> {137} [style=dotted];
+    137 -> {138} [style=dotted];
+    138 -> {139} [style=dotted];
+    139 -> {140} [style=dotted];
+    140 -> {141} [style=dotted];
+    141 -> {143} [style=dotted];
+    142 -> {143};
+    143 -> {144};
+    144 -> {145};
+    145 -> {146};
+    146 -> {147};
+    147 -> {148};
+    148 -> {149};
 
 }

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

@@ -37,62 +37,83 @@ digraph smartCastInInit_kt {
         subgraph cluster_5 {
             color=blue
             9 [label="Enter block"];
-            10 [label="Function call: R|kotlin/TODO|()" style="filled" fillcolor=yellow];
-            11 [label="Stub" style="filled" fillcolor=gray];
-            12 [label="Jump: ^s R|kotlin/TODO|()" style="filled" fillcolor=gray];
+            subgraph cluster_6 {
+                color=blue
+                10 [label="Function call arguments enter"];
+                11 [label="Function call arguments exit"];
+            }
+            12 [label="Function call: R|kotlin/TODO|()" style="filled" fillcolor=yellow];
             13 [label="Stub" style="filled" fillcolor=gray];
-            14 [label="Exit block" style="filled" fillcolor=gray];
+            14 [label="Jump: ^s R|kotlin/TODO|()" style="filled" fillcolor=gray];
+            15 [label="Stub" style="filled" fillcolor=gray];
+            16 [label="Exit block" style="filled" fillcolor=gray];
         }
-        15 [label="Exit function s" style="filled" fillcolor=gray];
+        17 [label="Exit function s" style="filled" fillcolor=gray];
     }
     8 -> {9};
     9 -> {10};
-    10 -> {11} [style=dotted];
-    11 -> {12} [style=dotted];
-    12 -> {13 15} [style=dotted];
+    10 -> {11};
+    11 -> {12};
+    12 -> {13} [style=dotted];
     13 -> {14} [style=dotted];
-    14 -> {15} [style=dotted];
+    14 -> {15 17} [style=dotted];
+    15 -> {16} [style=dotted];
+    16 -> {17} [style=dotted];
 
-    subgraph cluster_6 {
+    subgraph cluster_7 {
         color=red
-        16 [label="Enter class Main" style="filled" fillcolor=red];
-        subgraph cluster_7 {
+        18 [label="Enter class Main" style="filled" fillcolor=red];
+        subgraph cluster_8 {
             color=blue
-            17 [label="Enter init block" style="filled" fillcolor=red];
-            subgraph cluster_8 {
+            19 [label="Enter init block" style="filled" fillcolor=red];
+            subgraph cluster_9 {
                 color=blue
-                18 [label="Enter block"];
-                19 [label="Function call: R|/s|()" style="filled" fillcolor=yellow];
-                20 [label="Assignment: R|/Main.x|"];
-                21 [label="Access variable R|/Main.x|"];
-                22 [label="Smart cast: this@R|/Main|.R|/Main.x|"];
-                23 [label="Function call: this@R|/Main|.R|/Main.x|.R|/S.foo|()" style="filled" fillcolor=yellow];
-                24 [label="Exit block"];
+                20 [label="Enter block"];
+                subgraph cluster_10 {
+                    color=blue
+                    21 [label="Function call arguments enter"];
+                    22 [label="Function call arguments exit"];
+                }
+                23 [label="Function call: R|/s|()" style="filled" fillcolor=yellow];
+                24 [label="Assignment: R|/Main.x|"];
+                subgraph cluster_11 {
+                    color=blue
+                    25 [label="Function call arguments enter"];
+                    26 [label="Access variable R|/Main.x|"];
+                    27 [label="Smart cast: this@R|/Main|.R|/Main.x|"];
+                    28 [label="Function call arguments exit"];
+                }
+                29 [label="Function call: this@R|/Main|.R|/Main.x|.R|/S.foo|()" style="filled" fillcolor=yellow];
+                30 [label="Exit block"];
             }
-            25 [label="Exit init block" style="filled" fillcolor=red];
+            31 [label="Exit init block" style="filled" fillcolor=red];
         }
-        subgraph cluster_9 {
+        subgraph cluster_12 {
             color=blue
-            26 [label="Enter function <init>" style="filled" fillcolor=red];
-            27 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
-            28 [label="Exit function <init>" style="filled" fillcolor=red];
+            32 [label="Enter function <init>" style="filled" fillcolor=red];
+            33 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
+            34 [label="Exit function <init>" style="filled" fillcolor=red];
         }
-        29 [label="Exit class Main" style="filled" fillcolor=red];
+        35 [label="Exit class Main" style="filled" fillcolor=red];
     }
-    16 -> {17} [color=green];
-    16 -> {29} [style=dotted];
-    16 -> {17 26} [style=dashed];
-    17 -> {18};
-    18 -> {19};
+    18 -> {19} [color=green];
+    18 -> {35} [style=dotted];
+    18 -> {19 32} [style=dashed];
     19 -> {20};
     20 -> {21};
     21 -> {22};
     22 -> {23};
     23 -> {24};
     24 -> {25};
-    25 -> {26} [color=green];
+    25 -> {26};
     26 -> {27};
     27 -> {28};
-    28 -> {29} [color=green];
+    28 -> {29};
+    29 -> {30};
+    30 -> {31};
+    31 -> {32} [color=green];
+    32 -> {33};
+    33 -> {34};
+    34 -> {35} [color=green];
 
 }

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

@@ -98,41 +98,51 @@ digraph smartcastInByClause_kt {
             34 [label="Lhs of ?: is not null"];
             35 [label="Exit ?:"];
             36 [label="Variable declaration: lval path: R|kotlin/String|"];
-            37 [label="Access variable R|<local>/a|"];
-            38 [label="Smart cast: R|<local>/a|"];
-            39 [label="Access variable R|/A.index|"];
-            40 [label="Function call: R|/takeInt|(...)" style="filled" fillcolor=yellow];
-            41 [label="Enter anonymous object"];
             subgraph cluster_11 {
                 color=blue
-                42 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
-                subgraph cluster_12 {
-                    color=blue
-                    43 [label="Enter field" style="filled" fillcolor=red];
-                    44 [label="Access variable R|<local>/a|"];
-                    45 [label="Smart cast: R|<local>/a|"];
-                    46 [label="Access variable R|/A.index|"];
-                    47 [label="Function call: R|/Derived.Derived|(...)" style="filled" fillcolor=yellow];
-                    48 [label="Exit field" style="filled" fillcolor=red];
-                }
+                37 [label="Function call arguments enter"];
+                38 [label="Access variable R|<local>/a|"];
+                39 [label="Smart cast: R|<local>/a|"];
+                40 [label="Access variable R|/A.index|"];
+                41 [label="Function call arguments exit"];
+            }
+            42 [label="Function call: R|/takeInt|(...)" style="filled" fillcolor=yellow];
+            43 [label="Enter anonymous object"];
+            subgraph cluster_12 {
+                color=blue
+                44 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
                 subgraph cluster_13 {
                     color=blue
-                    49 [label="Enter property" style="filled" fillcolor=red];
-                    50 [label="Access variable R|<local>/a|"];
-                    51 [label="Smart cast: R|<local>/a|"];
-                    52 [label="Access variable R|/A.index|"];
-                    53 [label="Exit property" style="filled" fillcolor=red];
+                    45 [label="Enter field" style="filled" fillcolor=red];
+                    subgraph cluster_14 {
+                        color=blue
+                        46 [label="Function call arguments enter"];
+                        47 [label="Access variable R|<local>/a|"];
+                        48 [label="Smart cast: R|<local>/a|"];
+                        49 [label="Access variable R|/A.index|"];
+                        50 [label="Function call arguments exit"];
+                    }
+                    51 [label="Function call: R|/Derived.Derived|(...)" style="filled" fillcolor=yellow];
+                    52 [label="Exit field" style="filled" fillcolor=red];
                 }
-                subgraph cluster_14 {
+                subgraph cluster_15 {
                     color=blue
-                    54 [label="Enter function <init>" style="filled" fillcolor=red];
-                    55 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
-                    56 [label="Exit function <init>" style="filled" fillcolor=red];
+                    53 [label="Enter property" style="filled" fillcolor=red];
+                    54 [label="Access variable R|<local>/a|"];
+                    55 [label="Smart cast: R|<local>/a|"];
+                    56 [label="Access variable R|/A.index|"];
+                    57 [label="Exit property" style="filled" fillcolor=red];
                 }
-                57 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
+                subgraph cluster_16 {
+                    color=blue
+                    58 [label="Enter function <init>" style="filled" fillcolor=red];
+                    59 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
+                    60 [label="Exit function <init>" style="filled" fillcolor=red];
+                }
+                61 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
             }
-            58 [label="Exit anonymous object expression"];
-            59 [label="Jump: ^test object : R|Base| {
+            62 [label="Exit anonymous object expression"];
+            63 [label="Jump: ^test object : R|Base| {
     private constructor(): R|<anonymous>| {
         super<R|kotlin/Any|>()
     }
@@ -148,24 +158,29 @@ digraph smartcastInByClause_kt {
 
 }
 "];
-            60 [label="Stub" style="filled" fillcolor=gray];
-            61 [label="Exit block" style="filled" fillcolor=gray];
+            64 [label="Stub" style="filled" fillcolor=gray];
+            65 [label="Exit block" style="filled" fillcolor=gray];
         }
-        62 [label="Exit function test" style="filled" fillcolor=red];
+        66 [label="Exit function test" style="filled" fillcolor=red];
     }
-    subgraph cluster_15 {
+    subgraph cluster_17 {
         color=blue
-        63 [label="Enter function foo" style="filled" fillcolor=red];
-        subgraph cluster_16 {
+        67 [label="Enter function foo" style="filled" fillcolor=red];
+        subgraph cluster_18 {
             color=blue
-            64 [label="Enter block"];
-            65 [label="Access variable R|<local>/a|"];
-            66 [label="Smart cast: R|<local>/a|"];
-            67 [label="Access variable R|/A.index|"];
-            68 [label="Function call: R|/takeInt|(...)" style="filled" fillcolor=yellow];
-            69 [label="Exit block"];
+            68 [label="Enter block"];
+            subgraph cluster_19 {
+                color=blue
+                69 [label="Function call arguments enter"];
+                70 [label="Access variable R|<local>/a|"];
+                71 [label="Smart cast: R|<local>/a|"];
+                72 [label="Access variable R|/A.index|"];
+                73 [label="Function call arguments exit"];
+            }
+            74 [label="Function call: R|/takeInt|(...)" style="filled" fillcolor=yellow];
+            75 [label="Exit block"];
         }
-        70 [label="Exit function foo" style="filled" fillcolor=red];
+        76 [label="Exit function foo" style="filled" fillcolor=red];
     }
     23 -> {24};
     24 -> {25};
@@ -176,7 +191,7 @@ digraph smartcastInByClause_kt {
     29 -> {30 34};
     30 -> {31};
     31 -> {32};
-    32 -> {62};
+    32 -> {66};
     32 -> {33} [style=dotted];
     33 -> {35} [style=dotted];
     34 -> {35};
@@ -187,56 +202,62 @@ digraph smartcastInByClause_kt {
     39 -> {40};
     40 -> {41};
     41 -> {42};
-    41 -> {58} [style=dotted];
-    41 -> {42} [style=dashed];
     42 -> {43};
-    42 -> {49 54 63} [color=red];
-    42 -> {57} [style=dotted];
-    42 -> {43 49 54} [style=dashed];
     43 -> {44};
+    43 -> {62} [style=dotted];
+    43 -> {44} [style=dashed];
     44 -> {45};
+    44 -> {53 58 67} [color=red];
+    44 -> {61} [style=dotted];
+    44 -> {45 53 58} [style=dashed];
     45 -> {46};
     46 -> {47};
     47 -> {48};
-    48 -> {49} [color=green];
-    48 -> {57} [color=red];
+    48 -> {49};
     49 -> {50};
     50 -> {51};
     51 -> {52};
-    52 -> {53};
-    53 -> {54} [color=green];
-    53 -> {57} [color=red];
+    52 -> {53} [color=green];
+    52 -> {61} [color=red];
+    53 -> {54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
-    57 -> {58};
-    57 -> {63} [color=green];
-    57 -> {63} [style=dashed];
+    57 -> {58} [color=green];
+    57 -> {61} [color=red];
     58 -> {59};
-    59 -> {62};
-    59 -> {60} [style=dotted];
-    60 -> {61} [style=dotted];
-    61 -> {62} [style=dotted];
-    63 -> {64};
-    64 -> {65};
-    65 -> {66};
-    66 -> {67};
+    59 -> {60};
+    60 -> {61};
+    61 -> {62};
+    61 -> {67} [color=green];
+    61 -> {67} [style=dashed];
+    62 -> {63};
+    63 -> {66};
+    63 -> {64} [style=dotted];
+    64 -> {65} [style=dotted];
+    65 -> {66} [style=dotted];
     67 -> {68};
     68 -> {69};
     69 -> {70};
-
-    subgraph cluster_17 {
-        color=red
-        71 [label="Enter function takeInt" style="filled" fillcolor=red];
-        subgraph cluster_18 {
-            color=blue
-            72 [label="Enter block"];
-            73 [label="Exit block"];
-        }
-        74 [label="Exit function takeInt" style="filled" fillcolor=red];
-    }
+    70 -> {71};
     71 -> {72};
     72 -> {73};
     73 -> {74};
+    74 -> {75};
+    75 -> {76};
+
+    subgraph cluster_20 {
+        color=red
+        77 [label="Enter function takeInt" style="filled" fillcolor=red];
+        subgraph cluster_21 {
+            color=blue
+            78 [label="Enter block"];
+            79 [label="Exit block"];
+        }
+        80 [label="Exit function takeInt" style="filled" fillcolor=red];
+    }
+    77 -> {78};
+    78 -> {79};
+    79 -> {80};
 
 }

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

@@ -16,244 +16,269 @@ digraph smartcastToNothing_kt {
         subgraph cluster_2 {
             color=blue
             3 [label="Enter block"];
-            4 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
-            5 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-            6 [label="Stub" style="filled" fillcolor=gray];
-            7 [label="Jump: ^getNothing throw R|java/lang/Exception.Exception|()" style="filled" fillcolor=gray];
+            subgraph cluster_3 {
+                color=blue
+                4 [label="Function call arguments enter"];
+                5 [label="Function call arguments exit"];
+            }
+            6 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
+            7 [label="Throw: throw R|java/lang/Exception.Exception|()"];
             8 [label="Stub" style="filled" fillcolor=gray];
-            9 [label="Exit block" style="filled" fillcolor=gray];
+            9 [label="Jump: ^getNothing throw R|java/lang/Exception.Exception|()" style="filled" fillcolor=gray];
+            10 [label="Stub" style="filled" fillcolor=gray];
+            11 [label="Exit block" style="filled" fillcolor=gray];
         }
-        10 [label="Exit function getNothing" style="filled" fillcolor=gray];
+        12 [label="Exit function getNothing" style="filled" fillcolor=gray];
     }
     2 -> {3};
     3 -> {4};
     4 -> {5};
-    5 -> {6} [style=dotted];
-    6 -> {7} [style=dotted];
-    7 -> {8 10} [style=dotted];
+    5 -> {6};
+    6 -> {7};
+    7 -> {8} [style=dotted];
     8 -> {9} [style=dotted];
-    9 -> {10} [style=dotted];
+    9 -> {10 12} [style=dotted];
+    10 -> {11} [style=dotted];
+    11 -> {12} [style=dotted];
 
-    subgraph cluster_3 {
+    subgraph cluster_4 {
         color=red
-        11 [label="Enter function getNullableNothing" style="filled" fillcolor=red];
-        subgraph cluster_4 {
+        13 [label="Enter function getNullableNothing" style="filled" fillcolor=red];
+        subgraph cluster_5 {
             color=blue
-            12 [label="Enter block"];
-            13 [label="Const: Null(null)"];
-            14 [label="Jump: ^getNullableNothing Null(null)"];
-            15 [label="Stub" style="filled" fillcolor=gray];
-            16 [label="Exit block" style="filled" fillcolor=gray];
+            14 [label="Enter block"];
+            15 [label="Const: Null(null)"];
+            16 [label="Jump: ^getNullableNothing Null(null)"];
+            17 [label="Stub" style="filled" fillcolor=gray];
+            18 [label="Exit block" style="filled" fillcolor=gray];
         }
-        17 [label="Exit function getNullableNothing" style="filled" fillcolor=red];
+        19 [label="Exit function getNullableNothing" style="filled" fillcolor=red];
     }
-    11 -> {12};
-    12 -> {13};
     13 -> {14};
-    14 -> {17};
-    14 -> {15} [style=dotted];
-    15 -> {16} [style=dotted];
+    14 -> {15};
+    15 -> {16};
+    16 -> {19};
     16 -> {17} [style=dotted];
+    17 -> {18} [style=dotted];
+    18 -> {19} [style=dotted];
 
-    subgraph cluster_5 {
+    subgraph cluster_6 {
         color=red
-        18 [label="Enter function <getter>" style="filled" fillcolor=red];
-        subgraph cluster_6 {
+        20 [label="Enter function <getter>" style="filled" fillcolor=red];
+        subgraph cluster_7 {
             color=blue
-            19 [label="Enter block"];
-            20 [label="Const: Int(1)"];
-            21 [label="Jump: ^ Int(1)"];
-            22 [label="Stub" style="filled" fillcolor=gray];
-            23 [label="Exit block" style="filled" fillcolor=gray];
+            21 [label="Enter block"];
+            22 [label="Const: Int(1)"];
+            23 [label="Jump: ^ Int(1)"];
+            24 [label="Stub" style="filled" fillcolor=gray];
+            25 [label="Exit block" style="filled" fillcolor=gray];
         }
-        24 [label="Exit function <getter>" style="filled" fillcolor=red];
+        26 [label="Exit function <getter>" style="filled" fillcolor=red];
     }
-    18 -> {19};
-    19 -> {20};
     20 -> {21};
-    21 -> {24};
-    21 -> {22} [style=dotted];
-    22 -> {23} [style=dotted];
+    21 -> {22};
+    22 -> {23};
+    23 -> {26};
     23 -> {24} [style=dotted];
+    24 -> {25} [style=dotted];
+    25 -> {26} [style=dotted];
 
-    subgraph cluster_7 {
+    subgraph cluster_8 {
         color=red
-        25 [label="Enter function <getter>" style="filled" fillcolor=red];
-        subgraph cluster_8 {
+        27 [label="Enter function <getter>" style="filled" fillcolor=red];
+        subgraph cluster_9 {
             color=blue
-            26 [label="Enter block"];
-            27 [label="Const: Int(2)"];
-            28 [label="Jump: ^ Int(2)"];
-            29 [label="Stub" style="filled" fillcolor=gray];
-            30 [label="Exit block" style="filled" fillcolor=gray];
+            28 [label="Enter block"];
+            29 [label="Const: Int(2)"];
+            30 [label="Jump: ^ Int(2)"];
+            31 [label="Stub" style="filled" fillcolor=gray];
+            32 [label="Exit block" style="filled" fillcolor=gray];
         }
-        31 [label="Exit function <getter>" style="filled" fillcolor=red];
+        33 [label="Exit function <getter>" style="filled" fillcolor=red];
     }
-    25 -> {26};
-    26 -> {27};
     27 -> {28};
-    28 -> {31};
-    28 -> {29} [style=dotted];
-    29 -> {30} [style=dotted];
+    28 -> {29};
+    29 -> {30};
+    30 -> {33};
     30 -> {31} [style=dotted];
+    31 -> {32} [style=dotted];
+    32 -> {33} [style=dotted];
 
-    subgraph cluster_9 {
+    subgraph cluster_10 {
         color=red
-        32 [label="Enter function myListOf" style="filled" fillcolor=red];
-        subgraph cluster_10 {
+        34 [label="Enter function myListOf" style="filled" fillcolor=red];
+        subgraph cluster_11 {
             color=blue
-            33 [label="Enter block"];
-            34 [label="Const: Null(null)"];
-            35 [label="Check not null: Null(null)!!" style="filled" fillcolor=yellow];
-            36 [label="Stub" style="filled" fillcolor=gray];
-            37 [label="Jump: ^myListOf Null(null)!!" style="filled" fillcolor=gray];
+            35 [label="Enter block"];
+            36 [label="Const: Null(null)"];
+            37 [label="Check not null: Null(null)!!" style="filled" fillcolor=yellow];
             38 [label="Stub" style="filled" fillcolor=gray];
-            39 [label="Exit block" style="filled" fillcolor=gray];
+            39 [label="Jump: ^myListOf Null(null)!!" style="filled" fillcolor=gray];
+            40 [label="Stub" style="filled" fillcolor=gray];
+            41 [label="Exit block" style="filled" fillcolor=gray];
         }
-        40 [label="Exit function myListOf" style="filled" fillcolor=gray];
+        42 [label="Exit function myListOf" style="filled" fillcolor=gray];
     }
-    32 -> {33};
-    33 -> {34};
     34 -> {35};
-    35 -> {36} [style=dotted];
-    36 -> {37} [style=dotted];
-    37 -> {38 40} [style=dotted];
+    35 -> {36};
+    36 -> {37};
+    37 -> {38} [style=dotted];
     38 -> {39} [style=dotted];
-    39 -> {40} [style=dotted];
+    39 -> {40 42} [style=dotted];
+    40 -> {41} [style=dotted];
+    41 -> {42} [style=dotted];
 
-    subgraph cluster_11 {
+    subgraph cluster_12 {
         color=red
-        41 [label="Enter class A" style="filled" fillcolor=red];
-        subgraph cluster_12 {
-            color=blue
-            42 [label="Enter property" style="filled" fillcolor=red];
-            43 [label="Const: Int(1)"];
-            44 [label="Exit property" style="filled" fillcolor=red];
-        }
+        43 [label="Enter class A" style="filled" fillcolor=red];
         subgraph cluster_13 {
             color=blue
-            45 [label="Enter property" style="filled" fillcolor=red];
-            46 [label="Const: Boolean(true)"];
-            47 [label="Exit property" style="filled" fillcolor=red];
+            44 [label="Enter property" style="filled" fillcolor=red];
+            45 [label="Const: Int(1)"];
+            46 [label="Exit property" style="filled" fillcolor=red];
         }
         subgraph cluster_14 {
             color=blue
-            48 [label="Enter function <init>" style="filled" fillcolor=red];
-            49 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
-            50 [label="Exit function <init>" style="filled" fillcolor=red];
+            47 [label="Enter property" style="filled" fillcolor=red];
+            48 [label="Const: Boolean(true)"];
+            49 [label="Exit property" style="filled" fillcolor=red];
         }
-        51 [label="Exit class A" style="filled" fillcolor=red];
-    }
-    41 -> {42} [color=green];
-    41 -> {51} [style=dotted];
-    41 -> {42 45 48} [style=dashed];
-    42 -> {43};
-    43 -> {44};
-    44 -> {45} [color=green];
-    45 -> {46};
-    46 -> {47};
-    47 -> {48} [color=green];
-    48 -> {49};
-    49 -> {50};
-    50 -> {51} [color=green];
-
-    subgraph cluster_15 {
-        color=red
-        52 [label="Enter function test_0" style="filled" fillcolor=red];
-        subgraph cluster_16 {
+        subgraph cluster_15 {
             color=blue
-            53 [label="Enter block"];
-            54 [label="Const: Null(null)"];
-            55 [label="Variable declaration: lvar s: R|A?|"];
-            subgraph cluster_17 {
-                color=blue
-                56 [label="Enter block"];
-                57 [label="Access variable R|<local>/results|"];
-                58 [label="Function call: R|<local>/results|.R|SubstitutionOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<kotlin/Nothing>|>|()" style="filled" fillcolor=yellow];
-                59 [label="Variable declaration: lval <iterator>: R|kotlin/collections/Iterator<kotlin/Nothing>|"];
-                subgraph cluster_18 {
-                    color=blue
-                    60 [label="Enter while loop"];
-                    subgraph cluster_19 {
-                        color=blue
-                        61 [label="Enter loop condition"];
-                        62 [label="Access variable R|<local>/<iterator>|"];
-                        63 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.hasNext: R|kotlin/Boolean|>|()" style="filled" fillcolor=yellow];
-                        64 [label="Exit loop condition"];
-                    }
-                    subgraph cluster_20 {
-                        color=blue
-                        65 [label="Enter loop block"];
-                        subgraph cluster_21 {
-                            color=blue
-                            66 [label="Enter block"];
-                            67 [label="Access variable R|<local>/<iterator>|"];
-                            68 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|kotlin/Nothing|>|()" style="filled" fillcolor=yellow];
-                            69 [label="Stub" style="filled" fillcolor=gray];
-                            70 [label="Variable declaration: lval result: R|kotlin/Nothing|" style="filled" fillcolor=gray];
-                            subgraph cluster_22 {
-                                color=blue
-                                71 [label="Enter block" style="filled" fillcolor=gray];
-                                72 [label="Access variable R|<local>/result|" style="filled" fillcolor=gray];
-                                73 [label="Stub" style="filled" fillcolor=gray];
-                                74 [label="Assignment: R|<local>/s|" style="filled" fillcolor=gray];
-                                subgraph cluster_23 {
-                                    color=blue
-                                    75 [label="Enter when" style="filled" fillcolor=gray];
-                                    subgraph cluster_24 {
-                                        color=blue
-                                        76 [label="Enter when branch condition " style="filled" fillcolor=gray];
-                                        77 [label="Access variable R|<local>/result|" style="filled" fillcolor=gray];
-                                        78 [label="Stub" style="filled" fillcolor=gray];
-                                        79 [label="Access variable <Unresolved name: b>#" style="filled" fillcolor=gray];
-                                        80 [label="Exit when branch condition" style="filled" fillcolor=gray];
-                                    }
-                                    81 [label="Synthetic else branch" style="filled" fillcolor=gray];
-                                    82 [label="Enter when branch result" style="filled" fillcolor=gray];
-                                    subgraph cluster_25 {
-                                        color=blue
-                                        83 [label="Enter block" style="filled" fillcolor=gray];
-                                        84 [label="Jump: break@@@[R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.hasNext: R|kotlin/Boolean|>|()] " style="filled" fillcolor=gray];
-                                        85 [label="Stub" style="filled" fillcolor=gray];
-                                        86 [label="Exit block" style="filled" fillcolor=gray];
-                                    }
-                                    87 [label="Exit when branch result" style="filled" fillcolor=gray];
-                                    88 [label="Exit when" style="filled" fillcolor=gray];
-                                }
-                                89 [label="Exit block" style="filled" fillcolor=gray];
-                            }
-                            90 [label="Exit block" style="filled" fillcolor=gray];
-                        }
-                        91 [label="Exit loop block" style="filled" fillcolor=gray];
-                    }
-                    92 [label="Exit while loop"];
-                }
-                93 [label="Exit block"];
-            }
-            94 [label="Access variable R|<local>/s|"];
-            95 [label="Enter safe call"];
-            96 [label="Postponed enter to lambda"];
-            subgraph cluster_26 {
-                color=blue
-                97 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_27 {
-                    color=blue
-                    98 [label="Enter block"];
-                    99 [label="Access variable R|<local>/it|"];
-                    100 [label="Access variable R|/A.a|"];
-                    101 [label="Exit block"];
-                }
-                102 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            103 [label="Postponed exit from lambda"];
-            104 [label="Function call: $subj$.R|kotlin/let|<R|A|, R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
-            105 [label="Exit safe call"];
-            106 [label="Exit block"];
+            50 [label="Enter function <init>" style="filled" fillcolor=red];
+            51 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
+            52 [label="Exit function <init>" style="filled" fillcolor=red];
         }
-        107 [label="Exit function test_0" style="filled" fillcolor=red];
+        53 [label="Exit class A" style="filled" fillcolor=red];
+    }
+    43 -> {44} [color=green];
+    43 -> {53} [style=dotted];
+    43 -> {44 47 50} [style=dashed];
+    44 -> {45};
+    45 -> {46};
+    46 -> {47} [color=green];
+    47 -> {48};
+    48 -> {49};
+    49 -> {50} [color=green];
+    50 -> {51};
+    51 -> {52};
+    52 -> {53} [color=green];
+
+    subgraph cluster_16 {
+        color=red
+        54 [label="Enter function test_0" style="filled" fillcolor=red];
+        subgraph cluster_17 {
+            color=blue
+            55 [label="Enter block"];
+            56 [label="Const: Null(null)"];
+            57 [label="Variable declaration: lvar s: R|A?|"];
+            subgraph cluster_18 {
+                color=blue
+                58 [label="Enter block"];
+                subgraph cluster_19 {
+                    color=blue
+                    59 [label="Function call arguments enter"];
+                    60 [label="Access variable R|<local>/results|"];
+                    61 [label="Function call arguments exit"];
+                }
+                62 [label="Function call: R|<local>/results|.R|SubstitutionOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<kotlin/Nothing>|>|()" style="filled" fillcolor=yellow];
+                63 [label="Variable declaration: lval <iterator>: R|kotlin/collections/Iterator<kotlin/Nothing>|"];
+                subgraph cluster_20 {
+                    color=blue
+                    64 [label="Enter while loop"];
+                    subgraph cluster_21 {
+                        color=blue
+                        65 [label="Enter loop condition"];
+                        subgraph cluster_22 {
+                            color=blue
+                            66 [label="Function call arguments enter"];
+                            67 [label="Access variable R|<local>/<iterator>|"];
+                            68 [label="Function call arguments exit"];
+                        }
+                        69 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.hasNext: R|kotlin/Boolean|>|()" style="filled" fillcolor=yellow];
+                        70 [label="Exit loop condition"];
+                    }
+                    subgraph cluster_23 {
+                        color=blue
+                        71 [label="Enter loop block"];
+                        subgraph cluster_24 {
+                            color=blue
+                            72 [label="Enter block"];
+                            subgraph cluster_25 {
+                                color=blue
+                                73 [label="Function call arguments enter"];
+                                74 [label="Access variable R|<local>/<iterator>|"];
+                                75 [label="Function call arguments exit"];
+                            }
+                            76 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.next: R|kotlin/Nothing|>|()" style="filled" fillcolor=yellow];
+                            77 [label="Stub" style="filled" fillcolor=gray];
+                            78 [label="Variable declaration: lval result: R|kotlin/Nothing|" style="filled" fillcolor=gray];
+                            subgraph cluster_26 {
+                                color=blue
+                                79 [label="Enter block" style="filled" fillcolor=gray];
+                                80 [label="Access variable R|<local>/result|" style="filled" fillcolor=gray];
+                                81 [label="Stub" style="filled" fillcolor=gray];
+                                82 [label="Assignment: R|<local>/s|" style="filled" fillcolor=gray];
+                                subgraph cluster_27 {
+                                    color=blue
+                                    83 [label="Enter when" style="filled" fillcolor=gray];
+                                    subgraph cluster_28 {
+                                        color=blue
+                                        84 [label="Enter when branch condition " style="filled" fillcolor=gray];
+                                        85 [label="Access variable R|<local>/result|" style="filled" fillcolor=gray];
+                                        86 [label="Stub" style="filled" fillcolor=gray];
+                                        87 [label="Access variable <Unresolved name: b>#" style="filled" fillcolor=gray];
+                                        88 [label="Exit when branch condition" style="filled" fillcolor=gray];
+                                    }
+                                    89 [label="Synthetic else branch" style="filled" fillcolor=gray];
+                                    90 [label="Enter when branch result" style="filled" fillcolor=gray];
+                                    subgraph cluster_29 {
+                                        color=blue
+                                        91 [label="Enter block" style="filled" fillcolor=gray];
+                                        92 [label="Jump: break@@@[R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/Iterator.hasNext: R|kotlin/Boolean|>|()] " style="filled" fillcolor=gray];
+                                        93 [label="Stub" style="filled" fillcolor=gray];
+                                        94 [label="Exit block" style="filled" fillcolor=gray];
+                                    }
+                                    95 [label="Exit when branch result" style="filled" fillcolor=gray];
+                                    96 [label="Exit when" style="filled" fillcolor=gray];
+                                }
+                                97 [label="Exit block" style="filled" fillcolor=gray];
+                            }
+                            98 [label="Exit block" style="filled" fillcolor=gray];
+                        }
+                        99 [label="Exit loop block" style="filled" fillcolor=gray];
+                    }
+                    100 [label="Exit while loop"];
+                }
+                101 [label="Exit block"];
+            }
+            102 [label="Access variable R|<local>/s|"];
+            103 [label="Enter safe call"];
+            subgraph cluster_30 {
+                color=blue
+                104 [label="Function call arguments enter"];
+                105 [label="Postponed enter to lambda"];
+                subgraph cluster_31 {
+                    color=blue
+                    106 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_32 {
+                        color=blue
+                        107 [label="Enter block"];
+                        108 [label="Access variable R|<local>/it|"];
+                        109 [label="Access variable R|/A.a|"];
+                        110 [label="Exit block"];
+                    }
+                    111 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                112 [label="Function call arguments exit"];
+            }
+            113 [label="Postponed exit from lambda"];
+            114 [label="Function call: $subj$.R|kotlin/let|<R|A|, R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
+            115 [label="Exit safe call"];
+            116 [label="Exit block"];
+        }
+        117 [label="Exit function test_0" style="filled" fillcolor=red];
     }
-    52 -> {53};
-    53 -> {54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
@@ -264,137 +289,137 @@ digraph smartcastToNothing_kt {
     61 -> {62};
     62 -> {63};
     63 -> {64};
-    64 -> {65 92};
+    64 -> {65};
     65 -> {66};
     66 -> {67};
     67 -> {68};
-    68 -> {69} [style=dotted];
-    69 -> {70} [style=dotted];
-    70 -> {71} [style=dotted];
-    71 -> {72} [style=dotted];
-    72 -> {73} [style=dotted];
-    73 -> {74} [style=dotted];
-    74 -> {75} [style=dotted];
-    75 -> {76} [style=dotted];
+    68 -> {69};
+    69 -> {70};
+    70 -> {71 100};
+    71 -> {72};
+    72 -> {73};
+    73 -> {74};
+    74 -> {75};
+    75 -> {76};
     76 -> {77} [style=dotted];
     77 -> {78} [style=dotted];
     78 -> {79} [style=dotted];
     79 -> {80} [style=dotted];
-    80 -> {81 82} [style=dotted];
-    81 -> {88} [style=dotted];
+    80 -> {81} [style=dotted];
+    81 -> {82} [style=dotted];
     82 -> {83} [style=dotted];
     83 -> {84} [style=dotted];
-    84 -> {85 92} [style=dotted];
+    84 -> {85} [style=dotted];
     85 -> {86} [style=dotted];
     86 -> {87} [style=dotted];
     87 -> {88} [style=dotted];
-    88 -> {89} [style=dotted];
-    89 -> {90} [style=dotted];
+    88 -> {89 90} [style=dotted];
+    89 -> {96} [style=dotted];
     90 -> {91} [style=dotted];
-    91 -> {61} [color=green style=dotted];
-    92 -> {93};
-    93 -> {94};
-    94 -> {95 105};
-    95 -> {96};
-    96 -> {97 104};
-    96 -> {103} [style=dotted];
-    96 -> {97} [style=dashed];
-    97 -> {98};
-    98 -> {99};
-    99 -> {100};
+    91 -> {92} [style=dotted];
+    92 -> {93 100} [style=dotted];
+    93 -> {94} [style=dotted];
+    94 -> {95} [style=dotted];
+    95 -> {96} [style=dotted];
+    96 -> {97} [style=dotted];
+    97 -> {98} [style=dotted];
+    98 -> {99} [style=dotted];
+    99 -> {65} [color=green style=dotted];
     100 -> {101};
     101 -> {102};
-    102 -> {103};
+    102 -> {103 115};
     103 -> {104};
     104 -> {105};
-    105 -> {106};
+    105 -> {106 112};
+    105 -> {113} [style=dotted];
+    105 -> {106} [style=dashed];
     106 -> {107};
-
-    subgraph cluster_28 {
-        color=red
-        108 [label="Enter function test_1" style="filled" fillcolor=red];
-        subgraph cluster_29 {
-            color=blue
-            109 [label="Enter block"];
-            subgraph cluster_30 {
-                color=blue
-                110 [label="Enter when"];
-                subgraph cluster_31 {
-                    color=blue
-                    111 [label="Enter when branch condition "];
-                    112 [label="Access variable R|<local>/a|"];
-                    113 [label="Type operator: (R|<local>/a| is R|kotlin/Nothing?|)"];
-                    114 [label="Exit when branch condition"];
-                }
-                115 [label="Synthetic else branch"];
-                116 [label="Enter when branch result"];
-                subgraph cluster_32 {
-                    color=blue
-                    117 [label="Enter block"];
-                    118 [label="Access variable R|<local>/a|"];
-                    119 [label="Smart cast: R|<local>/a|"];
-                    120 [label="Enter safe call"];
-                    121 [label="Access variable R|kotlin/String.length|"];
-                    122 [label="Exit safe call"];
-                    123 [label="Variable declaration: lval b: R|kotlin/Int?|"];
-                    124 [label="Exit block"];
-                }
-                125 [label="Exit when branch result"];
-                126 [label="Exit when"];
-            }
-            subgraph cluster_33 {
-                color=blue
-                127 [label="Enter when"];
-                subgraph cluster_34 {
-                    color=blue
-                    128 [label="Enter when branch condition "];
-                    129 [label="Access variable R|<local>/a|"];
-                    130 [label="Type operator: (R|<local>/a| is R|kotlin/Nothing|)"];
-                    131 [label="Exit when branch condition"];
-                }
-                132 [label="Synthetic else branch"];
-                133 [label="Enter when branch result"];
-                subgraph cluster_35 {
-                    color=blue
-                    134 [label="Enter block"];
-                    135 [label="Access variable R|<local>/a|"];
-                    136 [label="Smart cast: R|<local>/a|"];
-                    137 [label="Access variable R|kotlin/String.length|"];
-                    138 [label="Variable declaration: lval b: R|kotlin/Int|"];
-                    139 [label="Exit block"];
-                }
-                140 [label="Exit when branch result"];
-                141 [label="Exit when"];
-            }
-            142 [label="Exit block"];
-        }
-        143 [label="Exit function test_1" style="filled" fillcolor=red];
-    }
+    107 -> {108};
     108 -> {109};
     109 -> {110};
     110 -> {111};
-    111 -> {112};
-    112 -> {113};
+    111 -> {113};
+    112 -> {114};
     113 -> {114};
-    114 -> {115 116};
-    115 -> {126};
+    114 -> {115};
+    115 -> {116};
     116 -> {117};
-    117 -> {118};
+
+    subgraph cluster_33 {
+        color=red
+        118 [label="Enter function test_1" style="filled" fillcolor=red];
+        subgraph cluster_34 {
+            color=blue
+            119 [label="Enter block"];
+            subgraph cluster_35 {
+                color=blue
+                120 [label="Enter when"];
+                subgraph cluster_36 {
+                    color=blue
+                    121 [label="Enter when branch condition "];
+                    122 [label="Access variable R|<local>/a|"];
+                    123 [label="Type operator: (R|<local>/a| is R|kotlin/Nothing?|)"];
+                    124 [label="Exit when branch condition"];
+                }
+                125 [label="Synthetic else branch"];
+                126 [label="Enter when branch result"];
+                subgraph cluster_37 {
+                    color=blue
+                    127 [label="Enter block"];
+                    128 [label="Access variable R|<local>/a|"];
+                    129 [label="Smart cast: R|<local>/a|"];
+                    130 [label="Enter safe call"];
+                    131 [label="Access variable R|kotlin/String.length|"];
+                    132 [label="Exit safe call"];
+                    133 [label="Variable declaration: lval b: R|kotlin/Int?|"];
+                    134 [label="Exit block"];
+                }
+                135 [label="Exit when branch result"];
+                136 [label="Exit when"];
+            }
+            subgraph cluster_38 {
+                color=blue
+                137 [label="Enter when"];
+                subgraph cluster_39 {
+                    color=blue
+                    138 [label="Enter when branch condition "];
+                    139 [label="Access variable R|<local>/a|"];
+                    140 [label="Type operator: (R|<local>/a| is R|kotlin/Nothing|)"];
+                    141 [label="Exit when branch condition"];
+                }
+                142 [label="Synthetic else branch"];
+                143 [label="Enter when branch result"];
+                subgraph cluster_40 {
+                    color=blue
+                    144 [label="Enter block"];
+                    145 [label="Access variable R|<local>/a|"];
+                    146 [label="Smart cast: R|<local>/a|"];
+                    147 [label="Access variable R|kotlin/String.length|"];
+                    148 [label="Variable declaration: lval b: R|kotlin/Int|"];
+                    149 [label="Exit block"];
+                }
+                150 [label="Exit when branch result"];
+                151 [label="Exit when"];
+            }
+            152 [label="Exit block"];
+        }
+        153 [label="Exit function test_1" style="filled" fillcolor=red];
+    }
     118 -> {119};
-    119 -> {120 122};
+    119 -> {120};
     120 -> {121};
     121 -> {122};
     122 -> {123};
     123 -> {124};
-    124 -> {125};
-    125 -> {126};
+    124 -> {125 126};
+    125 -> {136};
     126 -> {127};
     127 -> {128};
     128 -> {129};
-    129 -> {130};
+    129 -> {130 132};
     130 -> {131};
-    131 -> {132 133};
-    132 -> {141};
+    131 -> {132};
+    132 -> {133};
     133 -> {134};
     134 -> {135};
     135 -> {136};
@@ -403,7 +428,17 @@ digraph smartcastToNothing_kt {
     138 -> {139};
     139 -> {140};
     140 -> {141};
-    141 -> {142};
-    142 -> {143};
+    141 -> {142 143};
+    142 -> {151};
+    143 -> {144};
+    144 -> {145};
+    145 -> {146};
+    146 -> {147};
+    147 -> {148};
+    148 -> {149};
+    149 -> {150};
+    150 -> {151};
+    151 -> {152};
+    152 -> {153};
 
 }

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

@@ -76,21 +76,36 @@ digraph delayedAssignment_kt {
                 subgraph cluster_11 {
                     color=blue
                     27 [label="Enter block"];
-                    28 [label="Function call: R|/A.A|()" style="filled" fillcolor=yellow];
-                    29 [label="Assignment: R|<local>/a|"];
-                    30 [label="Access variable R|<local>/a|"];
-                    31 [label="Smart cast: R|<local>/a|"];
-                    32 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
-                    33 [label="Exit block"];
+                    subgraph cluster_12 {
+                        color=blue
+                        28 [label="Function call arguments enter"];
+                        29 [label="Function call arguments exit"];
+                    }
+                    30 [label="Function call: R|/A.A|()" style="filled" fillcolor=yellow];
+                    31 [label="Assignment: R|<local>/a|"];
+                    subgraph cluster_13 {
+                        color=blue
+                        32 [label="Function call arguments enter"];
+                        33 [label="Access variable R|<local>/a|"];
+                        34 [label="Smart cast: R|<local>/a|"];
+                        35 [label="Function call arguments exit"];
+                    }
+                    36 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
+                    37 [label="Exit block"];
                 }
-                34 [label="Exit when branch result"];
-                35 [label="Exit when"];
+                38 [label="Exit when branch result"];
+                39 [label="Exit when"];
             }
-            36 [label="Access variable R|<local>/a|"];
-            37 [label="Function call: R|<local>/a|.R|/A.foo<Inapplicable(UNSAFE_CALL): /A.foo>#|()" style="filled" fillcolor=yellow];
-            38 [label="Exit block"];
+            subgraph cluster_14 {
+                color=blue
+                40 [label="Function call arguments enter"];
+                41 [label="Access variable R|<local>/a|"];
+                42 [label="Function call arguments exit"];
+            }
+            43 [label="Function call: R|<local>/a|.R|/A.foo<Inapplicable(UNSAFE_CALL): /A.foo>#|()" style="filled" fillcolor=yellow];
+            44 [label="Exit block"];
         }
-        39 [label="Exit function test" style="filled" fillcolor=red];
+        45 [label="Exit function test" style="filled" fillcolor=red];
     }
     11 -> {12};
     12 -> {13};
@@ -106,7 +121,7 @@ digraph delayedAssignment_kt {
     22 -> {23};
     23 -> {24};
     24 -> {25};
-    25 -> {35};
+    25 -> {39};
     26 -> {27};
     27 -> {28};
     28 -> {29};
@@ -120,5 +135,11 @@ digraph delayedAssignment_kt {
     36 -> {37};
     37 -> {38};
     38 -> {39};
+    39 -> {40};
+    40 -> {41};
+    41 -> {42};
+    42 -> {43};
+    43 -> {44};
+    44 -> {45};
 
 }

compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot

@@ -30,89 +30,127 @@ digraph complexPostponedCfg_kt {
         subgraph cluster_4 {
             color=blue
             7 [label="Enter block"];
-            8 [label="Access variable R|<local>/statements|"];
-            9 [label="Function call: R|<local>/statements|.R|kotlin/collections/last|<R|FirBase|>()" style="filled" fillcolor=yellow];
-            10 [label="Type operator: (R|<local>/statements|.R|kotlin/collections/last|<R|FirBase|>() as R|FirFunctionCall|)"];
-            11 [label="Postponed enter to lambda"];
             subgraph cluster_5 {
                 color=blue
-                12 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                8 [label="Function call arguments enter"];
                 subgraph cluster_6 {
                     color=blue
-                    13 [label="Enter block"];
-                    14 [label="Postponed enter to lambda"];
-                    subgraph cluster_7 {
-                        color=blue
-                        15 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                        subgraph cluster_8 {
-                            color=blue
-                            16 [label="Enter block"];
-                            17 [label="Access variable this@R|special/anonymous|"];
-                            18 [label="Function call: this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(...)" style="filled" fillcolor=yellow];
-                            19 [label="Access variable R|<local>/arguments|"];
-                            20 [label="Function call: R|<local>/arguments|.R|kotlin/collections/last|<R|FirBase|>()" style="filled" fillcolor=yellow];
-                            21 [label="Type operator: (R|<local>/arguments|.R|kotlin/collections/last|<R|FirBase|>() as R|FirFunctionCall|)"];
-                            22 [label="Postponed enter to lambda"];
-                            subgraph cluster_9 {
-                                color=blue
-                                23 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                                subgraph cluster_10 {
-                                    color=blue
-                                    24 [label="Enter block"];
-                                    25 [label="Access variable this@R|special/anonymous|"];
-                                    26 [label="Function call: this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(...)" style="filled" fillcolor=yellow];
-                                    27 [label="Access variable R|<local>/explicitReceiver|"];
-                                    28 [label="Type operator: (R|<local>/explicitReceiver| as R|FirFunctionCall|)"];
-                                    29 [label="Function call: this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(...)" style="filled" fillcolor=yellow];
-                                    30 [label="Exit block"];
-                                }
-                                31 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-                            }
-                            32 [label="Postponed exit from lambda"];
-                            33 [label="Function call: R|kotlin/with|<R|FirFunctionCall|, R|kotlin/Unit|>(...)" style="filled" fillcolor=yellow];
-                            34 [label="Exit block"];
-                        }
-                        35 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-                    }
-                    36 [label="Postponed exit from lambda"];
-                    37 [label="Function call: R|kotlin/collections/buildList|<R|FirFunctionCall|>(...)" style="filled" fillcolor=yellow];
-                    38 [label="Exit block"];
+                    9 [label="Function call arguments enter"];
+                    10 [label="Access variable R|<local>/statements|"];
+                    11 [label="Function call arguments exit"];
                 }
-                39 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                12 [label="Function call: R|<local>/statements|.R|kotlin/collections/last|<R|FirBase|>()" style="filled" fillcolor=yellow];
+                13 [label="Type operator: (R|<local>/statements|.R|kotlin/collections/last|<R|FirBase|>() as R|FirFunctionCall|)"];
+                14 [label="Postponed enter to lambda"];
+                subgraph cluster_7 {
+                    color=blue
+                    15 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_8 {
+                        color=blue
+                        16 [label="Enter block"];
+                        subgraph cluster_9 {
+                            color=blue
+                            17 [label="Function call arguments enter"];
+                            18 [label="Postponed enter to lambda"];
+                            subgraph cluster_10 {
+                                color=blue
+                                19 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                                subgraph cluster_11 {
+                                    color=blue
+                                    20 [label="Enter block"];
+                                    subgraph cluster_12 {
+                                        color=blue
+                                        21 [label="Function call arguments enter"];
+                                        22 [label="Access variable this@R|special/anonymous|"];
+                                        23 [label="Function call arguments exit"];
+                                    }
+                                    24 [label="Function call: this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(...)" style="filled" fillcolor=yellow];
+                                    subgraph cluster_13 {
+                                        color=blue
+                                        25 [label="Function call arguments enter"];
+                                        subgraph cluster_14 {
+                                            color=blue
+                                            26 [label="Function call arguments enter"];
+                                            27 [label="Access variable R|<local>/arguments|"];
+                                            28 [label="Function call arguments exit"];
+                                        }
+                                        29 [label="Function call: R|<local>/arguments|.R|kotlin/collections/last|<R|FirBase|>()" style="filled" fillcolor=yellow];
+                                        30 [label="Type operator: (R|<local>/arguments|.R|kotlin/collections/last|<R|FirBase|>() as R|FirFunctionCall|)"];
+                                        31 [label="Postponed enter to lambda"];
+                                        subgraph cluster_15 {
+                                            color=blue
+                                            32 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                                            subgraph cluster_16 {
+                                                color=blue
+                                                33 [label="Enter block"];
+                                                subgraph cluster_17 {
+                                                    color=blue
+                                                    34 [label="Function call arguments enter"];
+                                                    35 [label="Access variable this@R|special/anonymous|"];
+                                                    36 [label="Function call arguments exit"];
+                                                }
+                                                37 [label="Function call: this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(...)" style="filled" fillcolor=yellow];
+                                                subgraph cluster_18 {
+                                                    color=blue
+                                                    38 [label="Function call arguments enter"];
+                                                    39 [label="Access variable R|<local>/explicitReceiver|"];
+                                                    40 [label="Type operator: (R|<local>/explicitReceiver| as R|FirFunctionCall|)"];
+                                                    41 [label="Function call arguments exit"];
+                                                }
+                                                42 [label="Function call: this@R|special/anonymous|.R|SubstitutionOverride<kotlin/collections/MutableList.add: R|kotlin/Boolean|>|(...)" style="filled" fillcolor=yellow];
+                                                43 [label="Exit block"];
+                                            }
+                                            44 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                                        }
+                                        45 [label="Function call arguments exit"];
+                                    }
+                                    46 [label="Postponed exit from lambda"];
+                                    47 [label="Function call: R|kotlin/with|<R|FirFunctionCall|, R|kotlin/Unit|>(...)" style="filled" fillcolor=yellow];
+                                    48 [label="Exit block"];
+                                }
+                                49 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                            }
+                            50 [label="Function call arguments exit"];
+                        }
+                        51 [label="Postponed exit from lambda"];
+                        52 [label="Function call: R|kotlin/collections/buildList|<R|FirFunctionCall|>(...)" style="filled" fillcolor=yellow];
+                        53 [label="Exit block"];
+                    }
+                    54 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                55 [label="Function call arguments exit"];
             }
-            40 [label="Postponed exit from lambda"];
-            41 [label="Function call: R|kotlin/with|<R|FirFunctionCall|, R|kotlin/collections/List<FirFunctionCall>|>(...)" style="filled" fillcolor=yellow];
-            42 [label="Variable declaration: lval firstCalls: R|kotlin/collections/List<FirFunctionCall>|"];
-            43 [label="Access variable R|<local>/firstCalls|"];
-            44 [label="Jump: ^foo R|<local>/firstCalls|"];
-            45 [label="Stub" style="filled" fillcolor=gray];
-            46 [label="Exit block" style="filled" fillcolor=gray];
+            56 [label="Postponed exit from lambda"];
+            57 [label="Function call: R|kotlin/with|<R|FirFunctionCall|, R|kotlin/collections/List<FirFunctionCall>|>(...)" style="filled" fillcolor=yellow];
+            58 [label="Variable declaration: lval firstCalls: R|kotlin/collections/List<FirFunctionCall>|"];
+            59 [label="Access variable R|<local>/firstCalls|"];
+            60 [label="Jump: ^foo R|<local>/firstCalls|"];
+            61 [label="Stub" style="filled" fillcolor=gray];
+            62 [label="Exit block" style="filled" fillcolor=gray];
         }
-        47 [label="Exit function foo" style="filled" fillcolor=red];
+        63 [label="Exit function foo" style="filled" fillcolor=red];
     }
     6 -> {7};
     7 -> {8};
     8 -> {9};
     9 -> {10};
     10 -> {11};
-    11 -> {12 41};
-    11 -> {40} [style=dotted];
-    11 -> {12} [style=dashed];
+    11 -> {12};
     12 -> {13};
     13 -> {14};
-    14 -> {15 37};
-    14 -> {36} [style=dotted];
+    14 -> {15 55};
+    14 -> {56} [style=dotted];
     14 -> {15} [style=dashed];
     15 -> {16};
     16 -> {17};
     17 -> {18};
-    18 -> {19};
+    18 -> {19 50};
+    18 -> {51} [style=dotted];
+    18 -> {19} [style=dashed];
     19 -> {20};
     20 -> {21};
     21 -> {22};
-    22 -> {23 33};
-    22 -> {32} [style=dotted];
-    22 -> {23} [style=dashed];
+    22 -> {23};
     23 -> {24};
     24 -> {25};
     25 -> {26};
@@ -121,13 +159,14 @@ digraph complexPostponedCfg_kt {
     28 -> {29};
     29 -> {30};
     30 -> {31};
-    31 -> {32};
+    31 -> {32 45};
+    31 -> {46} [style=dotted];
+    31 -> {32} [style=dashed];
     32 -> {33};
     33 -> {34};
     34 -> {35};
     35 -> {36};
-    36 -> {37} [color=green];
-    36 -> {41} [color=red];
+    36 -> {37};
     37 -> {38};
     38 -> {39};
     39 -> {40};
@@ -135,9 +174,26 @@ digraph complexPostponedCfg_kt {
     41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {47};
-    44 -> {45} [style=dotted];
-    45 -> {46} [style=dotted];
-    46 -> {47} [style=dotted];
+    44 -> {46};
+    45 -> {47};
+    46 -> {47};
+    47 -> {48};
+    48 -> {49};
+    49 -> {51};
+    50 -> {52};
+    51 -> {52} [color=green];
+    51 -> {57} [color=red];
+    52 -> {53};
+    53 -> {54};
+    54 -> {56};
+    55 -> {57};
+    56 -> {57};
+    57 -> {58};
+    58 -> {59};
+    59 -> {60};
+    60 -> {63};
+    60 -> {61} [style=dotted];
+    61 -> {62} [style=dotted];
+    62 -> {63} [style=dotted];
 
 }

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

@@ -17,403 +17,501 @@ digraph callsInPlace_kt {
             color=blue
             3 [label="Enter block"];
             4 [label="Variable declaration: lval x: R|kotlin/Int|"];
-            5 [label="Postponed enter to lambda"];
             subgraph cluster_3 {
                 color=blue
-                6 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                5 [label="Function call arguments enter"];
+                6 [label="Postponed enter to lambda"];
                 subgraph cluster_4 {
                     color=blue
-                    7 [label="Enter block"];
-                    8 [label="Const: Int(1)"];
-                    9 [label="Assignment: R|<local>/x|"];
-                    10 [label="Exit block"];
+                    7 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_5 {
+                        color=blue
+                        8 [label="Enter block"];
+                        9 [label="Const: Int(1)"];
+                        10 [label="Assignment: R|<local>/x|"];
+                        11 [label="Exit block"];
+                    }
+                    12 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                 }
-                11 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                13 [label="Function call arguments exit"];
             }
-            12 [label="Postponed exit from lambda"];
-            13 [label="Function call: R|kotlin/run|<R|kotlin/Unit|>(...)" style="filled" fillcolor=yellow];
-            14 [label="Access variable R|<local>/x|"];
-            15 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
-            16 [label="Exit block"];
+            14 [label="Postponed exit from lambda"];
+            15 [label="Function call: R|kotlin/run|<R|kotlin/Unit|>(...)" style="filled" fillcolor=yellow];
+            subgraph cluster_6 {
+                color=blue
+                16 [label="Function call arguments enter"];
+                17 [label="Access variable R|<local>/x|"];
+                18 [label="Function call arguments exit"];
+            }
+            19 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
+            20 [label="Exit block"];
         }
-        17 [label="Exit function test" style="filled" fillcolor=red];
+        21 [label="Exit function test" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
     4 -> {5};
-    5 -> {6 13};
-    5 -> {12} [style=dotted];
-    5 -> {6} [style=dashed];
-    6 -> {7};
+    5 -> {6};
+    6 -> {7 13};
+    6 -> {14} [style=dotted];
+    6 -> {7} [style=dashed];
     7 -> {8};
     8 -> {9};
     9 -> {10};
     10 -> {11};
     11 -> {12};
-    12 -> {13};
-    13 -> {14};
+    12 -> {14};
+    13 -> {15};
     14 -> {15};
     15 -> {16};
     16 -> {17};
-
-    subgraph cluster_5 {
-        color=red
-        18 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_6 {
-            color=blue
-            19 [label="Enter block"];
-            20 [label="Const: Int(10)"];
-            21 [label="Postponed enter to lambda"];
-            subgraph cluster_7 {
-                color=blue
-                22 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_8 {
-                    color=blue
-                    23 [label="Enter block"];
-                    24 [label="Const: String(test_2)"];
-                    25 [label="Exit block"];
-                }
-                26 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            27 [label="Postponed exit from lambda"];
-            28 [label="Function call: R|kotlin/repeat|(...)" style="filled" fillcolor=yellow];
-            29 [label="Exit block"];
-        }
-        30 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
+    17 -> {18};
     18 -> {19};
     19 -> {20};
     20 -> {21};
-    21 -> {22 27 28};
-    21 -> {22} [style=dashed];
+
+    subgraph cluster_7 {
+        color=red
+        22 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_8 {
+            color=blue
+            23 [label="Enter block"];
+            subgraph cluster_9 {
+                color=blue
+                24 [label="Function call arguments enter"];
+                25 [label="Const: Int(10)"];
+                26 [label="Postponed enter to lambda"];
+                subgraph cluster_10 {
+                    color=blue
+                    27 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_11 {
+                        color=blue
+                        28 [label="Enter block"];
+                        29 [label="Const: String(test_2)"];
+                        30 [label="Exit block"];
+                    }
+                    31 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                32 [label="Function call arguments exit"];
+            }
+            33 [label="Postponed exit from lambda"];
+            34 [label="Function call: R|kotlin/repeat|(...)" style="filled" fillcolor=yellow];
+            35 [label="Exit block"];
+        }
+        36 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
     22 -> {23};
     23 -> {24};
     24 -> {25};
     25 -> {26};
-    26 -> {27};
+    26 -> {27 32 33};
+    26 -> {27} [style=dashed];
     27 -> {28};
-    27 -> {21} [color=green style=dashed];
     28 -> {29};
     29 -> {30};
-
-    subgraph cluster_9 {
-        color=red
-        31 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_10 {
-            color=blue
-            32 [label="Enter block"];
-            33 [label="Const: Int(10)"];
-            34 [label="Postponed enter to lambda"];
-            subgraph cluster_11 {
-                color=blue
-                35 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_12 {
-                    color=blue
-                    36 [label="Enter block"];
-                    37 [label="Const: String(test_3)"];
-                    38 [label="Exit block"];
-                }
-                39 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            40 [label="Postponed exit from lambda"];
-            41 [label="Function call: R|kotlin/repeat|(...)" style="filled" fillcolor=yellow];
-            42 [label="Exit block"];
-        }
-        43 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
-    31 -> {32};
-    32 -> {33};
+    30 -> {31};
+    31 -> {33};
+    32 -> {34};
     33 -> {34};
-    34 -> {35 40 41};
-    34 -> {35} [style=dashed];
+    33 -> {26} [color=green style=dashed];
+    34 -> {35};
     35 -> {36};
-    36 -> {37};
+
+    subgraph cluster_12 {
+        color=red
+        37 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_13 {
+            color=blue
+            38 [label="Enter block"];
+            subgraph cluster_14 {
+                color=blue
+                39 [label="Function call arguments enter"];
+                40 [label="Const: Int(10)"];
+                41 [label="Postponed enter to lambda"];
+                subgraph cluster_15 {
+                    color=blue
+                    42 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_16 {
+                        color=blue
+                        43 [label="Enter block"];
+                        44 [label="Const: String(test_3)"];
+                        45 [label="Exit block"];
+                    }
+                    46 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                47 [label="Function call arguments exit"];
+            }
+            48 [label="Postponed exit from lambda"];
+            49 [label="Function call: R|kotlin/repeat|(...)" style="filled" fillcolor=yellow];
+            50 [label="Exit block"];
+        }
+        51 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
     37 -> {38};
     38 -> {39};
     39 -> {40};
     40 -> {41};
-    40 -> {34} [color=green style=dashed];
-    41 -> {42};
+    41 -> {42 47 48};
+    41 -> {42} [style=dashed];
     42 -> {43};
-
-    subgraph cluster_13 {
-        color=red
-        44 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_14 {
-            color=blue
-            45 [label="Enter block"];
-            46 [label="Const: Int(1)"];
-            47 [label="Postponed enter to lambda"];
-            subgraph cluster_15 {
-                color=blue
-                48 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_16 {
-                    color=blue
-                    49 [label="Enter block"];
-                    50 [label="Const: String(test_4)"];
-                    51 [label="Access variable R|<local>/it|"];
-                    52 [label="Const: Int(0)"];
-                    53 [label="Function call: R|<local>/it|.R|kotlin/Int.compareTo|(...)" style="filled" fillcolor=yellow];
-                    54 [label="Comparison >"];
-                    55 [label="Exit block"];
-                }
-                56 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            57 [label="Postponed exit from lambda"];
-            58 [label="Function call: Int(1).R|kotlin/takeUnless|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
-            59 [label="Exit block"];
-        }
-        60 [label="Exit function test_4" style="filled" fillcolor=red];
-    }
+    43 -> {44};
     44 -> {45};
     45 -> {46};
-    46 -> {47};
-    47 -> {48 58};
-    47 -> {57} [style=dotted];
-    47 -> {48} [style=dashed];
+    46 -> {48};
+    47 -> {49};
     48 -> {49};
+    48 -> {41} [color=green style=dashed];
     49 -> {50};
     50 -> {51};
-    51 -> {52};
+
+    subgraph cluster_17 {
+        color=red
+        52 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_18 {
+            color=blue
+            53 [label="Enter block"];
+            subgraph cluster_19 {
+                color=blue
+                54 [label="Function call arguments enter"];
+                55 [label="Const: Int(1)"];
+                56 [label="Postponed enter to lambda"];
+                subgraph cluster_20 {
+                    color=blue
+                    57 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_21 {
+                        color=blue
+                        58 [label="Enter block"];
+                        59 [label="Const: String(test_4)"];
+                        subgraph cluster_22 {
+                            color=blue
+                            60 [label="Function call arguments enter"];
+                            61 [label="Access variable R|<local>/it|"];
+                            62 [label="Const: Int(0)"];
+                            63 [label="Function call arguments exit"];
+                        }
+                        64 [label="Function call: R|<local>/it|.R|kotlin/Int.compareTo|(...)" style="filled" fillcolor=yellow];
+                        65 [label="Comparison >"];
+                        66 [label="Exit block"];
+                    }
+                    67 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                68 [label="Function call arguments exit"];
+            }
+            69 [label="Postponed exit from lambda"];
+            70 [label="Function call: Int(1).R|kotlin/takeUnless|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
+            71 [label="Exit block"];
+        }
+        72 [label="Exit function test_4" style="filled" fillcolor=red];
+    }
     52 -> {53};
     53 -> {54};
     54 -> {55};
     55 -> {56};
-    56 -> {57};
+    56 -> {57 68};
+    56 -> {69} [style=dotted];
+    56 -> {57} [style=dashed];
     57 -> {58};
     58 -> {59};
     59 -> {60};
-
-    subgraph cluster_17 {
-        color=red
-        61 [label="Enter function test_5" style="filled" fillcolor=red];
-        subgraph cluster_18 {
-            color=blue
-            62 [label="Enter block"];
-            63 [label="Const: Int(1)"];
-            64 [label="Postponed enter to lambda"];
-            subgraph cluster_19 {
-                color=blue
-                65 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_20 {
-                    color=blue
-                    66 [label="Enter block"];
-                    67 [label="Const: String(test_5)"];
-                    68 [label="Access variable R|<local>/it|"];
-                    69 [label="Const: Int(0)"];
-                    70 [label="Function call: R|<local>/it|.R|kotlin/Int.compareTo|(...)" style="filled" fillcolor=yellow];
-                    71 [label="Comparison >"];
-                    72 [label="Exit block"];
-                }
-                73 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            74 [label="Postponed exit from lambda"];
-            75 [label="Function call: Int(1).R|kotlin/takeUnless|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
-            76 [label="Exit block"];
-        }
-        77 [label="Exit function test_5" style="filled" fillcolor=red];
-    }
+    60 -> {61};
     61 -> {62};
     62 -> {63};
     63 -> {64};
-    64 -> {65 75};
-    64 -> {74} [style=dotted];
-    64 -> {65} [style=dashed];
+    64 -> {65};
     65 -> {66};
     66 -> {67};
-    67 -> {68};
-    68 -> {69};
+    67 -> {69};
+    68 -> {70};
     69 -> {70};
     70 -> {71};
     71 -> {72};
-    72 -> {73};
+
+    subgraph cluster_23 {
+        color=red
+        73 [label="Enter function test_5" style="filled" fillcolor=red];
+        subgraph cluster_24 {
+            color=blue
+            74 [label="Enter block"];
+            subgraph cluster_25 {
+                color=blue
+                75 [label="Function call arguments enter"];
+                76 [label="Const: Int(1)"];
+                77 [label="Postponed enter to lambda"];
+                subgraph cluster_26 {
+                    color=blue
+                    78 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_27 {
+                        color=blue
+                        79 [label="Enter block"];
+                        80 [label="Const: String(test_5)"];
+                        subgraph cluster_28 {
+                            color=blue
+                            81 [label="Function call arguments enter"];
+                            82 [label="Access variable R|<local>/it|"];
+                            83 [label="Const: Int(0)"];
+                            84 [label="Function call arguments exit"];
+                        }
+                        85 [label="Function call: R|<local>/it|.R|kotlin/Int.compareTo|(...)" style="filled" fillcolor=yellow];
+                        86 [label="Comparison >"];
+                        87 [label="Exit block"];
+                    }
+                    88 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                89 [label="Function call arguments exit"];
+            }
+            90 [label="Postponed exit from lambda"];
+            91 [label="Function call: Int(1).R|kotlin/takeUnless|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
+            92 [label="Exit block"];
+        }
+        93 [label="Exit function test_5" style="filled" fillcolor=red];
+    }
     73 -> {74};
     74 -> {75};
     75 -> {76};
     76 -> {77};
-
-    subgraph cluster_21 {
-        color=red
-        78 [label="Enter function myRun" style="filled" fillcolor=red];
-        subgraph cluster_22 {
-            color=blue
-            79 [label="Enter block"];
-            80 [label="Function call: R|<local>/block1|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            81 [label="Function call: R|<local>/block2|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            82 [label="Exit block"];
-        }
-        83 [label="Exit function myRun" style="filled" fillcolor=red];
-    }
+    77 -> {78 89};
+    77 -> {90} [style=dotted];
+    77 -> {78} [style=dashed];
     78 -> {79};
     79 -> {80};
     80 -> {81};
     81 -> {82};
     82 -> {83};
-
-    subgraph cluster_23 {
-        color=red
-        84 [label="Enter function test_6" style="filled" fillcolor=red];
-        subgraph cluster_24 {
-            color=blue
-            85 [label="Enter block"];
-            86 [label="Postponed enter to lambda"];
-            subgraph cluster_25 {
-                color=blue
-                87 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_26 {
-                    color=blue
-                    88 [label="Enter block"];
-                    89 [label="Const: String(test_6_2)"];
-                    90 [label="Exit block"];
-                }
-                91 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            subgraph cluster_27 {
-                color=blue
-                92 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_28 {
-                    color=blue
-                    93 [label="Enter block"];
-                    94 [label="Const: String(test_6_1)"];
-                    95 [label="Exit block"];
-                }
-                96 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            97 [label="Postponed exit from lambda"];
-            98 [label="Postponed exit from lambda"];
-            99 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow];
-            100 [label="Exit block"];
-        }
-        101 [label="Exit function test_6" style="filled" fillcolor=red];
-    }
+    83 -> {84};
     84 -> {85};
     85 -> {86};
-    86 -> {87 92 97 98 99};
-    86 -> {87 92} [style=dashed];
+    86 -> {87};
     87 -> {88};
-    88 -> {89};
-    89 -> {90};
+    88 -> {90};
+    89 -> {91};
     90 -> {91};
-    91 -> {97};
+    91 -> {92};
     92 -> {93};
-    93 -> {94};
-    94 -> {95};
-    95 -> {96};
-    96 -> {98};
-    97 -> {99};
-    97 -> {86} [color=green style=dashed];
-    98 -> {99};
-    98 -> {86} [color=green style=dashed];
-    99 -> {100};
-    100 -> {101};
 
     subgraph cluster_29 {
         color=red
-        102 [label="Enter function test_7" style="filled" fillcolor=red];
+        94 [label="Enter function myRun" style="filled" fillcolor=red];
         subgraph cluster_30 {
             color=blue
-            103 [label="Enter block"];
-            104 [label="Postponed enter to lambda"];
+            95 [label="Enter block"];
             subgraph cluster_31 {
                 color=blue
-                105 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_32 {
-                    color=blue
-                    106 [label="Enter block"];
-                    107 [label="Const: String(test_7_1)"];
-                    108 [label="Exit block"];
-                }
-                109 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                96 [label="Function call arguments enter"];
+                97 [label="Function call arguments exit"];
             }
-            subgraph cluster_33 {
+            98 [label="Function call: R|<local>/block1|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            subgraph cluster_32 {
                 color=blue
-                110 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_34 {
-                    color=blue
-                    111 [label="Enter block"];
-                    112 [label="Const: String(test_7_2)"];
-                    113 [label="Exit block"];
-                }
-                114 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                99 [label="Function call arguments enter"];
+                100 [label="Function call arguments exit"];
             }
-            115 [label="Postponed exit from lambda"];
-            116 [label="Postponed exit from lambda"];
-            117 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow];
-            118 [label="Exit block"];
+            101 [label="Function call: R|<local>/block2|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            102 [label="Exit block"];
         }
-        119 [label="Exit function test_7" style="filled" fillcolor=red];
+        103 [label="Exit function myRun" style="filled" fillcolor=red];
     }
+    94 -> {95};
+    95 -> {96};
+    96 -> {97};
+    97 -> {98};
+    98 -> {99};
+    99 -> {100};
+    100 -> {101};
+    101 -> {102};
     102 -> {103};
-    103 -> {104};
-    104 -> {105 110 115 116 117};
-    104 -> {105 110} [style=dashed];
+
+    subgraph cluster_33 {
+        color=red
+        104 [label="Enter function test_6" style="filled" fillcolor=red];
+        subgraph cluster_34 {
+            color=blue
+            105 [label="Enter block"];
+            subgraph cluster_35 {
+                color=blue
+                106 [label="Function call arguments enter"];
+                107 [label="Postponed enter to lambda"];
+                subgraph cluster_36 {
+                    color=blue
+                    108 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_37 {
+                        color=blue
+                        109 [label="Enter block"];
+                        110 [label="Const: String(test_6_2)"];
+                        111 [label="Exit block"];
+                    }
+                    112 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                subgraph cluster_38 {
+                    color=blue
+                    113 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_39 {
+                        color=blue
+                        114 [label="Enter block"];
+                        115 [label="Const: String(test_6_1)"];
+                        116 [label="Exit block"];
+                    }
+                    117 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                118 [label="Function call arguments exit"];
+            }
+            119 [label="Postponed exit from lambda"];
+            120 [label="Postponed exit from lambda"];
+            121 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow];
+            122 [label="Exit block"];
+        }
+        123 [label="Exit function test_6" style="filled" fillcolor=red];
+    }
+    104 -> {105};
     105 -> {106};
     106 -> {107};
-    107 -> {108};
+    107 -> {108 113 118 119 120};
+    107 -> {108 113} [style=dashed];
     108 -> {109};
-    109 -> {115};
+    109 -> {110};
     110 -> {111};
     111 -> {112};
-    112 -> {113};
+    112 -> {119};
     113 -> {114};
-    114 -> {116};
-    115 -> {117};
-    115 -> {104} [color=green style=dashed];
+    114 -> {115};
+    115 -> {116};
     116 -> {117};
-    116 -> {104} [color=green style=dashed];
-    117 -> {118};
-    118 -> {119};
-
-    subgraph cluster_35 {
-        color=red
-        120 [label="Enter function myDummyRun" style="filled" fillcolor=red];
-        subgraph cluster_36 {
-            color=blue
-            121 [label="Enter block"];
-            122 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            123 [label="Exit block"];
-        }
-        124 [label="Exit function myDummyRun" style="filled" fillcolor=red];
-    }
+    117 -> {120};
+    118 -> {121};
+    119 -> {121};
+    119 -> {107} [color=green style=dashed];
     120 -> {121};
+    120 -> {107} [color=green style=dashed];
     121 -> {122};
     122 -> {123};
-    123 -> {124};
 
-    subgraph cluster_37 {
+    subgraph cluster_40 {
         color=red
-        125 [label="Enter function test_8" style="filled" fillcolor=red];
-        subgraph cluster_38 {
+        124 [label="Enter function test_7" style="filled" fillcolor=red];
+        subgraph cluster_41 {
             color=blue
-            126 [label="Enter block"];
-            127 [label="Postponed enter to lambda"];
-            subgraph cluster_39 {
+            125 [label="Enter block"];
+            subgraph cluster_42 {
                 color=blue
-                128 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_40 {
+                126 [label="Function call arguments enter"];
+                127 [label="Postponed enter to lambda"];
+                subgraph cluster_43 {
                     color=blue
-                    129 [label="Enter block"];
-                    130 [label="Const: String(test_8)"];
-                    131 [label="Exit block"];
+                    128 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_44 {
+                        color=blue
+                        129 [label="Enter block"];
+                        130 [label="Const: String(test_7_1)"];
+                        131 [label="Exit block"];
+                    }
+                    132 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                 }
-                132 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                subgraph cluster_45 {
+                    color=blue
+                    133 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_46 {
+                        color=blue
+                        134 [label="Enter block"];
+                        135 [label="Const: String(test_7_2)"];
+                        136 [label="Exit block"];
+                    }
+                    137 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                138 [label="Function call arguments exit"];
             }
-            133 [label="Postponed exit from lambda"];
-            134 [label="Function call: R|/myDummyRun|(...)" style="filled" fillcolor=yellow];
-            135 [label="Exit block"];
+            139 [label="Postponed exit from lambda"];
+            140 [label="Postponed exit from lambda"];
+            141 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow];
+            142 [label="Exit block"];
         }
-        136 [label="Exit function test_8" style="filled" fillcolor=red];
+        143 [label="Exit function test_7" style="filled" fillcolor=red];
     }
+    124 -> {125};
     125 -> {126};
     126 -> {127};
-    127 -> {128 133 134};
-    127 -> {128} [style=dashed];
+    127 -> {128 133 138 139 140};
+    127 -> {128 133} [style=dashed];
     128 -> {129};
     129 -> {130};
     130 -> {131};
     131 -> {132};
+    132 -> {139};
     133 -> {134};
     134 -> {135};
     135 -> {136};
+    136 -> {137};
+    137 -> {140};
+    138 -> {141};
+    139 -> {141};
+    139 -> {127} [color=green style=dashed];
+    140 -> {141};
+    140 -> {127} [color=green style=dashed];
+    141 -> {142};
+    142 -> {143};
+
+    subgraph cluster_47 {
+        color=red
+        144 [label="Enter function myDummyRun" style="filled" fillcolor=red];
+        subgraph cluster_48 {
+            color=blue
+            145 [label="Enter block"];
+            subgraph cluster_49 {
+                color=blue
+                146 [label="Function call arguments enter"];
+                147 [label="Function call arguments exit"];
+            }
+            148 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            149 [label="Exit block"];
+        }
+        150 [label="Exit function myDummyRun" style="filled" fillcolor=red];
+    }
+    144 -> {145};
+    145 -> {146};
+    146 -> {147};
+    147 -> {148};
+    148 -> {149};
+    149 -> {150};
+
+    subgraph cluster_50 {
+        color=red
+        151 [label="Enter function test_8" style="filled" fillcolor=red];
+        subgraph cluster_51 {
+            color=blue
+            152 [label="Enter block"];
+            subgraph cluster_52 {
+                color=blue
+                153 [label="Function call arguments enter"];
+                154 [label="Postponed enter to lambda"];
+                subgraph cluster_53 {
+                    color=blue
+                    155 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_54 {
+                        color=blue
+                        156 [label="Enter block"];
+                        157 [label="Const: String(test_8)"];
+                        158 [label="Exit block"];
+                    }
+                    159 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                160 [label="Function call arguments exit"];
+            }
+            161 [label="Postponed exit from lambda"];
+            162 [label="Function call: R|/myDummyRun|(...)" style="filled" fillcolor=yellow];
+            163 [label="Exit block"];
+        }
+        164 [label="Exit function test_8" style="filled" fillcolor=red];
+    }
+    151 -> {152};
+    152 -> {153};
+    153 -> {154};
+    154 -> {155 160 161};
+    154 -> {155} [style=dashed];
+    155 -> {156};
+    156 -> {157};
+    157 -> {158};
+    158 -> {159};
+    160 -> {162};
+    161 -> {162};
+    162 -> {163};
+    163 -> {164};
 
 }

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

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

compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.dot

@@ -53,23 +53,38 @@ digraph inAnonymousObject_kt {
             }
             21 [label="Exit anonymous object expression"];
             22 [label="Variable declaration: lval obj: R|<anonymous>|"];
-            23 [label="Access variable R|<local>/obj|"];
-            24 [label="Function call: R|<local>/obj|.R|/<anonymous>.run|()" style="filled" fillcolor=yellow];
-            25 [label="Function call: R|<local>/d|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            26 [label="Exit block"];
+            subgraph cluster_9 {
+                color=blue
+                23 [label="Function call arguments enter"];
+                24 [label="Access variable R|<local>/obj|"];
+                25 [label="Function call arguments exit"];
+            }
+            26 [label="Function call: R|<local>/obj|.R|/<anonymous>.run|()" style="filled" fillcolor=yellow];
+            subgraph cluster_10 {
+                color=blue
+                27 [label="Function call arguments enter"];
+                28 [label="Function call arguments exit"];
+            }
+            29 [label="Function call: R|<local>/d|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            30 [label="Exit block"];
         }
-        27 [label="Exit function foo" style="filled" fillcolor=red];
+        31 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    subgraph cluster_9 {
+    subgraph cluster_11 {
         color=blue
-        28 [label="Enter function run" style="filled" fillcolor=red];
-        subgraph cluster_10 {
+        32 [label="Enter function run" style="filled" fillcolor=red];
+        subgraph cluster_12 {
             color=blue
-            29 [label="Enter block"];
-            30 [label="Function call: R|<local>/c|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            31 [label="Exit block"];
+            33 [label="Enter block"];
+            subgraph cluster_13 {
+                color=blue
+                34 [label="Function call arguments enter"];
+                35 [label="Function call arguments exit"];
+            }
+            36 [label="Function call: R|<local>/c|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            37 [label="Exit block"];
         }
-        32 [label="Exit function run" style="filled" fillcolor=red];
+        38 [label="Exit function run" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
@@ -79,7 +94,7 @@ digraph inAnonymousObject_kt {
     6 -> {21} [style=dotted];
     6 -> {7} [style=dashed];
     7 -> {8};
-    7 -> {11 17 28} [color=red];
+    7 -> {11 17 32} [color=red];
     7 -> {20} [style=dotted];
     7 -> {8 11 17} [style=dashed];
     8 -> {9};
@@ -97,17 +112,23 @@ digraph inAnonymousObject_kt {
     18 -> {19};
     19 -> {20};
     20 -> {21};
-    20 -> {28} [color=green];
-    20 -> {28} [style=dashed];
+    20 -> {32} [color=green];
+    20 -> {32} [style=dashed];
     21 -> {22};
     22 -> {23};
     23 -> {24};
     24 -> {25};
     25 -> {26};
     26 -> {27};
+    27 -> {28};
     28 -> {29};
     29 -> {30};
     30 -> {31};
-    31 -> {32};
+    32 -> {33};
+    33 -> {34};
+    34 -> {35};
+    35 -> {36};
+    36 -> {37};
+    37 -> {38};
 
 }

compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.dot

@@ -22,79 +22,104 @@ digraph inLocalClass_kt {
                 5 [label="Exit block"];
             }
             6 [label="Local class declaration"];
-            7 [label="Function call: R|<local>/LocalClass.LocalClass|()" style="filled" fillcolor=yellow];
-            8 [label="Function call: R|<local>/LocalClass.LocalClass|().R|<local>/run|()" style="filled" fillcolor=yellow];
-            9 [label="Function call: R|<local>/e|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            10 [label="Exit block"];
-        }
-        11 [label="Exit function foo" style="filled" fillcolor=red];
-    }
-    subgraph cluster_4 {
-        color=blue
-        12 [label="Enter class LocalClass" style="filled" fillcolor=red];
-        subgraph cluster_5 {
-            color=blue
-            13 [label="Enter property" style="filled" fillcolor=red];
-            14 [label="Access variable R|<local>/a|"];
-            15 [label="Exit property" style="filled" fillcolor=red];
-        }
-        subgraph cluster_6 {
-            color=blue
-            16 [label="Enter init block" style="filled" fillcolor=red];
-            subgraph cluster_7 {
+            subgraph cluster_4 {
                 color=blue
-                17 [label="Enter block"];
-                18 [label="Access variable R|<local>/c|"];
-                19 [label="Assignment: R|<local>/leaked|"];
-                20 [label="Exit block"];
+                7 [label="Function call arguments enter"];
+                subgraph cluster_5 {
+                    color=blue
+                    8 [label="Function call arguments enter"];
+                    9 [label="Function call arguments exit"];
+                }
+                10 [label="Function call: R|<local>/LocalClass.LocalClass|()" style="filled" fillcolor=yellow];
+                11 [label="Function call arguments exit"];
             }
-            21 [label="Exit init block" style="filled" fillcolor=red];
+            12 [label="Function call: R|<local>/LocalClass.LocalClass|().R|<local>/run|()" style="filled" fillcolor=yellow];
+            subgraph cluster_6 {
+                color=blue
+                13 [label="Function call arguments enter"];
+                14 [label="Function call arguments exit"];
+            }
+            15 [label="Function call: R|<local>/e|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            16 [label="Exit block"];
         }
+        17 [label="Exit function foo" style="filled" fillcolor=red];
+    }
+    subgraph cluster_7 {
+        color=blue
+        18 [label="Enter class LocalClass" style="filled" fillcolor=red];
         subgraph cluster_8 {
             color=blue
-            22 [label="Enter function <init>" style="filled" fillcolor=red];
-            23 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
-            subgraph cluster_9 {
+            19 [label="Enter property" style="filled" fillcolor=red];
+            20 [label="Access variable R|<local>/a|"];
+            21 [label="Exit property" style="filled" fillcolor=red];
+        }
+        subgraph cluster_9 {
+            color=blue
+            22 [label="Enter init block" style="filled" fillcolor=red];
+            subgraph cluster_10 {
                 color=blue
-                24 [label="Enter block"];
-                25 [label="Function call: R|<local>/b|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+                23 [label="Enter block"];
+                24 [label="Access variable R|<local>/c|"];
+                25 [label="Assignment: R|<local>/leaked|"];
                 26 [label="Exit block"];
             }
-            27 [label="Exit function <init>" style="filled" fillcolor=red];
+            27 [label="Exit init block" style="filled" fillcolor=red];
         }
-        28 [label="Exit class LocalClass" style="filled" fillcolor=red];
-    }
-    subgraph cluster_10 {
-        color=blue
-        29 [label="Enter function run" style="filled" fillcolor=red];
         subgraph cluster_11 {
             color=blue
-            30 [label="Enter block"];
-            31 [label="Function call: R|<local>/d|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            32 [label="Exit block"];
+            28 [label="Enter function <init>" style="filled" fillcolor=red];
+            29 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
+            subgraph cluster_12 {
+                color=blue
+                30 [label="Enter block"];
+                subgraph cluster_13 {
+                    color=blue
+                    31 [label="Function call arguments enter"];
+                    32 [label="Function call arguments exit"];
+                }
+                33 [label="Function call: R|<local>/b|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+                34 [label="Exit block"];
+            }
+            35 [label="Exit function <init>" style="filled" fillcolor=red];
         }
-        33 [label="Exit function run" style="filled" fillcolor=red];
+        36 [label="Exit class LocalClass" style="filled" fillcolor=red];
+    }
+    subgraph cluster_14 {
+        color=blue
+        37 [label="Enter function run" style="filled" fillcolor=red];
+        subgraph cluster_15 {
+            color=blue
+            38 [label="Enter block"];
+            subgraph cluster_16 {
+                color=blue
+                39 [label="Function call arguments enter"];
+                40 [label="Function call arguments exit"];
+            }
+            41 [label="Function call: R|<local>/d|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            42 [label="Exit block"];
+        }
+        43 [label="Exit function run" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
     4 -> {5};
     5 -> {6};
-    6 -> {7 12};
-    6 -> {12} [style=dashed];
+    6 -> {7 18};
+    6 -> {18} [style=dashed];
     7 -> {8};
     8 -> {9};
     9 -> {10};
     10 -> {11};
+    11 -> {12};
     12 -> {13};
-    12 -> {16 22 29} [color=red];
-    12 -> {28} [style=dotted];
-    12 -> {13 16 22} [style=dashed];
     13 -> {14};
     14 -> {15};
-    15 -> {16} [color=green];
+    15 -> {16};
     16 -> {17};
-    17 -> {18};
     18 -> {19};
+    18 -> {22 28 37} [color=red];
+    18 -> {36} [style=dotted];
+    18 -> {19 22 28} [style=dashed];
     19 -> {20};
     20 -> {21};
     21 -> {22} [color=green];
@@ -104,11 +129,21 @@ digraph inLocalClass_kt {
     25 -> {26};
     26 -> {27};
     27 -> {28} [color=green];
-    28 -> {29} [color=green];
-    28 -> {29} [style=dashed];
+    28 -> {29};
     29 -> {30};
     30 -> {31};
     31 -> {32};
     32 -> {33};
+    33 -> {34};
+    34 -> {35};
+    35 -> {36} [color=green];
+    36 -> {37} [color=green];
+    36 -> {37} [style=dashed];
+    37 -> {38};
+    38 -> {39};
+    39 -> {40};
+    40 -> {41};
+    41 -> {42};
+    42 -> {43};
 
 }

compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.dot

@@ -22,39 +22,67 @@ digraph inLocalFunction_kt {
                 5 [label="Exit block"];
             }
             6 [label="Local function declaration"];
-            7 [label="Function call: R|<local>/localFun|()" style="filled" fillcolor=yellow];
-            8 [label="Function call: R|<local>/b|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            9 [label="Exit block"];
+            subgraph cluster_4 {
+                color=blue
+                7 [label="Function call arguments enter"];
+                8 [label="Function call arguments exit"];
+            }
+            9 [label="Function call: R|<local>/localFun|()" style="filled" fillcolor=yellow];
+            subgraph cluster_5 {
+                color=blue
+                10 [label="Function call arguments enter"];
+                11 [label="Function call arguments exit"];
+            }
+            12 [label="Function call: R|<local>/b|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            13 [label="Exit block"];
         }
-        10 [label="Exit function foo" style="filled" fillcolor=red];
+        14 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    subgraph cluster_4 {
+    subgraph cluster_6 {
         color=blue
-        11 [label="Enter function localFun" style="filled" fillcolor=red];
-        subgraph cluster_5 {
+        15 [label="Enter function localFun" style="filled" fillcolor=red];
+        subgraph cluster_7 {
             color=blue
-            12 [label="Enter block"];
-            13 [label="Access variable R|<local>/a|"];
-            14 [label="Function call: R|<local>/a|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            15 [label="Function call: R|<local>/a|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            16 [label="Exit block"];
+            16 [label="Enter block"];
+            subgraph cluster_8 {
+                color=blue
+                17 [label="Function call arguments enter"];
+                18 [label="Access variable R|<local>/a|"];
+                19 [label="Function call arguments exit"];
+            }
+            20 [label="Function call: R|<local>/a|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            subgraph cluster_9 {
+                color=blue
+                21 [label="Function call arguments enter"];
+                22 [label="Function call arguments exit"];
+            }
+            23 [label="Function call: R|<local>/a|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            24 [label="Exit block"];
         }
-        17 [label="Exit function localFun" style="filled" fillcolor=red];
+        25 [label="Exit function localFun" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
     4 -> {5};
     5 -> {6};
-    6 -> {7 11};
-    6 -> {11} [style=dashed];
+    6 -> {7 15};
+    6 -> {15} [style=dashed];
     7 -> {8};
     8 -> {9};
     9 -> {10};
+    10 -> {11};
     11 -> {12};
     12 -> {13};
     13 -> {14};
-    14 -> {15};
     15 -> {16};
     16 -> {17};
+    17 -> {18};
+    18 -> {19};
+    19 -> {20};
+    20 -> {21};
+    21 -> {22};
+    22 -> {23};
+    23 -> {24};
+    24 -> {25};
 
 }

compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.dot

@@ -55,28 +55,43 @@ digraph toLocalVariables_kt {
                     17 [label="Enter block"];
                     18 [label="Access variable R|<local>/y|"];
                     19 [label="Variable declaration: lval yCopy: R|() -> kotlin/Unit|"];
-                    20 [label="Function call: R|<local>/yCopy|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-                    21 [label="Exit block"];
+                    subgraph cluster_10 {
+                        color=blue
+                        20 [label="Function call arguments enter"];
+                        21 [label="Function call arguments exit"];
+                    }
+                    22 [label="Function call: R|<local>/yCopy|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+                    23 [label="Exit block"];
                 }
-                22 [label="Exit when branch result"];
-                23 [label="Enter when branch result"];
-                subgraph cluster_10 {
+                24 [label="Exit when branch result"];
+                25 [label="Enter when branch result"];
+                subgraph cluster_11 {
                     color=blue
-                    24 [label="Enter block"];
-                    25 [label="Access variable R|<local>/x|"];
-                    26 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow];
-                    27 [label="Exit block"];
+                    26 [label="Enter block"];
+                    subgraph cluster_12 {
+                        color=blue
+                        27 [label="Function call arguments enter"];
+                        28 [label="Access variable R|<local>/x|"];
+                        29 [label="Function call arguments exit"];
+                    }
+                    30 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow];
+                    31 [label="Exit block"];
                 }
-                28 [label="Exit when branch result"];
-                29 [label="Exit when"];
+                32 [label="Exit when branch result"];
+                33 [label="Exit when"];
             }
-            30 [label="Variable declaration: lval zCopy: R|() -> kotlin/Unit|"];
-            31 [label="Access variable R|<local>/z|"];
-            32 [label="Assignment: R|<local>/zCopy|"];
-            33 [label="Function call: R|<local>/zCopy|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            34 [label="Exit block"];
+            34 [label="Variable declaration: lval zCopy: R|() -> kotlin/Unit|"];
+            35 [label="Access variable R|<local>/z|"];
+            36 [label="Assignment: R|<local>/zCopy|"];
+            subgraph cluster_13 {
+                color=blue
+                37 [label="Function call arguments enter"];
+                38 [label="Function call arguments exit"];
+            }
+            39 [label="Function call: R|<local>/zCopy|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            40 [label="Exit block"];
         }
-        35 [label="Exit function foo" style="filled" fillcolor=red];
+        41 [label="Exit function foo" style="filled" fillcolor=red];
     }
     6 -> {7};
     7 -> {8};
@@ -85,7 +100,7 @@ digraph toLocalVariables_kt {
     10 -> {11};
     11 -> {12};
     12 -> {13};
-    13 -> {14 23};
+    13 -> {14 25};
     14 -> {15};
     15 -> {16};
     16 -> {17};
@@ -94,9 +109,9 @@ digraph toLocalVariables_kt {
     19 -> {20};
     20 -> {21};
     21 -> {22};
-    22 -> {29};
+    22 -> {23};
     23 -> {24};
-    24 -> {25};
+    24 -> {33};
     25 -> {26};
     26 -> {27};
     27 -> {28};
@@ -107,5 +122,11 @@ digraph toLocalVariables_kt {
     32 -> {33};
     33 -> {34};
     34 -> {35};
+    35 -> {36};
+    36 -> {37};
+    37 -> {38};
+    38 -> {39};
+    39 -> {40};
+    40 -> {41};
 
 }

compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.dot

@@ -21,10 +21,15 @@ digraph atLeastOnce_kt {
                 4 [label="Enter block"];
                 5 [label="Exit block"];
             }
-            6 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            7 [label="Exit block"];
+            subgraph cluster_4 {
+                color=blue
+                6 [label="Function call arguments enter"];
+                7 [label="Function call arguments exit"];
+            }
+            8 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            9 [label="Exit block"];
         }
-        8 [label="Exit function inlineRun" style="filled" fillcolor=red];
+        10 [label="Exit function inlineRun" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
@@ -32,122 +37,159 @@ digraph atLeastOnce_kt {
     5 -> {6};
     6 -> {7};
     7 -> {8};
-
-    subgraph cluster_4 {
-        color=red
-        9 [label="Enter function myRun" style="filled" fillcolor=red];
-        subgraph cluster_5 {
-            color=blue
-            10 [label="Enter block"];
-            subgraph cluster_6 {
-                color=blue
-                11 [label="Enter block"];
-                12 [label="Exit block"];
-            }
-            13 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            14 [label="Exit block"];
-        }
-        15 [label="Exit function myRun" style="filled" fillcolor=red];
-    }
+    8 -> {9};
     9 -> {10};
-    10 -> {11};
+
+    subgraph cluster_5 {
+        color=red
+        11 [label="Enter function myRun" style="filled" fillcolor=red];
+        subgraph cluster_6 {
+            color=blue
+            12 [label="Enter block"];
+            subgraph cluster_7 {
+                color=blue
+                13 [label="Enter block"];
+                14 [label="Exit block"];
+            }
+            subgraph cluster_8 {
+                color=blue
+                15 [label="Function call arguments enter"];
+                16 [label="Function call arguments exit"];
+            }
+            17 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            18 [label="Exit block"];
+        }
+        19 [label="Exit function myRun" style="filled" fillcolor=red];
+    }
     11 -> {12};
     12 -> {13};
     13 -> {14};
     14 -> {15};
-
-    subgraph cluster_7 {
-        color=red
-        16 [label="Enter function test_1" style="filled" fillcolor=red];
-        subgraph cluster_8 {
-            color=blue
-            17 [label="Enter block"];
-            18 [label="Variable declaration: lval x: R|kotlin/Int|"];
-            19 [label="Postponed enter to lambda"];
-            subgraph cluster_9 {
-                color=blue
-                20 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_10 {
-                    color=blue
-                    21 [label="Enter block"];
-                    22 [label="Const: Int(1)"];
-                    23 [label="Assignment: R|<local>/x|"];
-                    24 [label="Exit block"];
-                }
-                25 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            26 [label="Postponed exit from lambda"];
-            27 [label="Function call: R|/inlineRun|(...)" style="filled" fillcolor=yellow];
-            28 [label="Access variable R|<local>/x|"];
-            29 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
-            30 [label="Exit block"];
-        }
-        31 [label="Exit function test_1" style="filled" fillcolor=red];
-    }
+    15 -> {16};
     16 -> {17};
     17 -> {18};
     18 -> {19};
-    19 -> {20 27};
-    19 -> {26} [style=dotted];
-    19 -> {20} [style=dashed];
+
+    subgraph cluster_9 {
+        color=red
+        20 [label="Enter function test_1" style="filled" fillcolor=red];
+        subgraph cluster_10 {
+            color=blue
+            21 [label="Enter block"];
+            22 [label="Variable declaration: lval x: R|kotlin/Int|"];
+            subgraph cluster_11 {
+                color=blue
+                23 [label="Function call arguments enter"];
+                24 [label="Postponed enter to lambda"];
+                subgraph cluster_12 {
+                    color=blue
+                    25 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_13 {
+                        color=blue
+                        26 [label="Enter block"];
+                        27 [label="Const: Int(1)"];
+                        28 [label="Assignment: R|<local>/x|"];
+                        29 [label="Exit block"];
+                    }
+                    30 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                31 [label="Function call arguments exit"];
+            }
+            32 [label="Postponed exit from lambda"];
+            33 [label="Function call: R|/inlineRun|(...)" style="filled" fillcolor=yellow];
+            subgraph cluster_14 {
+                color=blue
+                34 [label="Function call arguments enter"];
+                35 [label="Access variable R|<local>/x|"];
+                36 [label="Function call arguments exit"];
+            }
+            37 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
+            38 [label="Exit block"];
+        }
+        39 [label="Exit function test_1" style="filled" fillcolor=red];
+    }
     20 -> {21};
     21 -> {22};
     22 -> {23};
     23 -> {24};
-    24 -> {25};
+    24 -> {25 31};
+    24 -> {32} [style=dotted];
+    24 -> {25} [style=dashed];
     25 -> {26};
     26 -> {27};
-    26 -> {19} [color=green style=dashed];
     27 -> {28};
     28 -> {29};
     29 -> {30};
-    30 -> {31};
-
-    subgraph cluster_11 {
-        color=red
-        32 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_12 {
-            color=blue
-            33 [label="Enter block"];
-            34 [label="Variable declaration: lval x: R|kotlin/Int|"];
-            35 [label="Postponed enter to lambda"];
-            subgraph cluster_13 {
-                color=blue
-                36 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_14 {
-                    color=blue
-                    37 [label="Enter block"];
-                    38 [label="Const: Int(1)"];
-                    39 [label="Assignment: R|<local>/x|"];
-                    40 [label="Exit block"];
-                }
-                41 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            42 [label="Postponed exit from lambda"];
-            43 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow];
-            44 [label="Access variable R|<local>/x|"];
-            45 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
-            46 [label="Exit block"];
-        }
-        47 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
+    30 -> {32};
+    31 -> {33};
     32 -> {33};
+    32 -> {24} [color=green style=dashed];
     33 -> {34};
     34 -> {35};
-    35 -> {36 43};
-    35 -> {42} [style=dotted];
-    35 -> {36} [style=dashed];
+    35 -> {36};
     36 -> {37};
     37 -> {38};
     38 -> {39};
-    39 -> {40};
+
+    subgraph cluster_15 {
+        color=red
+        40 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_16 {
+            color=blue
+            41 [label="Enter block"];
+            42 [label="Variable declaration: lval x: R|kotlin/Int|"];
+            subgraph cluster_17 {
+                color=blue
+                43 [label="Function call arguments enter"];
+                44 [label="Postponed enter to lambda"];
+                subgraph cluster_18 {
+                    color=blue
+                    45 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_19 {
+                        color=blue
+                        46 [label="Enter block"];
+                        47 [label="Const: Int(1)"];
+                        48 [label="Assignment: R|<local>/x|"];
+                        49 [label="Exit block"];
+                    }
+                    50 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                51 [label="Function call arguments exit"];
+            }
+            52 [label="Postponed exit from lambda"];
+            53 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow];
+            subgraph cluster_20 {
+                color=blue
+                54 [label="Function call arguments enter"];
+                55 [label="Access variable R|<local>/x|"];
+                56 [label="Function call arguments exit"];
+            }
+            57 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
+            58 [label="Exit block"];
+        }
+        59 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
     40 -> {41};
     41 -> {42};
     42 -> {43};
-    42 -> {35} [color=green style=dashed];
     43 -> {44};
-    44 -> {45};
+    44 -> {45 51};
+    44 -> {52} [style=dotted];
+    44 -> {45} [style=dashed];
     45 -> {46};
     46 -> {47};
+    47 -> {48};
+    48 -> {49};
+    49 -> {50};
+    50 -> {52};
+    51 -> {53};
+    52 -> {53};
+    52 -> {44} [color=green style=dashed];
+    53 -> {54};
+    54 -> {55};
+    55 -> {56};
+    56 -> {57};
+    57 -> {58};
+    58 -> {59};
 
 }

compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.dot

@@ -21,10 +21,15 @@ digraph atMostOnce_kt {
                 4 [label="Enter block"];
                 5 [label="Exit block"];
             }
-            6 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            7 [label="Exit block"];
+            subgraph cluster_4 {
+                color=blue
+                6 [label="Function call arguments enter"];
+                7 [label="Function call arguments exit"];
+            }
+            8 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            9 [label="Exit block"];
         }
-        8 [label="Exit function inlineRun" style="filled" fillcolor=red];
+        10 [label="Exit function inlineRun" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
@@ -32,118 +37,155 @@ digraph atMostOnce_kt {
     5 -> {6};
     6 -> {7};
     7 -> {8};
-
-    subgraph cluster_4 {
-        color=red
-        9 [label="Enter function myRun" style="filled" fillcolor=red];
-        subgraph cluster_5 {
-            color=blue
-            10 [label="Enter block"];
-            subgraph cluster_6 {
-                color=blue
-                11 [label="Enter block"];
-                12 [label="Exit block"];
-            }
-            13 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            14 [label="Exit block"];
-        }
-        15 [label="Exit function myRun" style="filled" fillcolor=red];
-    }
+    8 -> {9};
     9 -> {10};
-    10 -> {11};
+
+    subgraph cluster_5 {
+        color=red
+        11 [label="Enter function myRun" style="filled" fillcolor=red];
+        subgraph cluster_6 {
+            color=blue
+            12 [label="Enter block"];
+            subgraph cluster_7 {
+                color=blue
+                13 [label="Enter block"];
+                14 [label="Exit block"];
+            }
+            subgraph cluster_8 {
+                color=blue
+                15 [label="Function call arguments enter"];
+                16 [label="Function call arguments exit"];
+            }
+            17 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            18 [label="Exit block"];
+        }
+        19 [label="Exit function myRun" style="filled" fillcolor=red];
+    }
     11 -> {12};
     12 -> {13};
     13 -> {14};
     14 -> {15};
-
-    subgraph cluster_7 {
-        color=red
-        16 [label="Enter function test_1" style="filled" fillcolor=red];
-        subgraph cluster_8 {
-            color=blue
-            17 [label="Enter block"];
-            18 [label="Variable declaration: lval x: R|kotlin/Int|"];
-            19 [label="Postponed enter to lambda"];
-            subgraph cluster_9 {
-                color=blue
-                20 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_10 {
-                    color=blue
-                    21 [label="Enter block"];
-                    22 [label="Const: Int(1)"];
-                    23 [label="Assignment: R|<local>/x|"];
-                    24 [label="Exit block"];
-                }
-                25 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            26 [label="Postponed exit from lambda"];
-            27 [label="Function call: R|/inlineRun|(...)" style="filled" fillcolor=yellow];
-            28 [label="Access variable R|<local>/x|"];
-            29 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
-            30 [label="Exit block"];
-        }
-        31 [label="Exit function test_1" style="filled" fillcolor=red];
-    }
+    15 -> {16};
     16 -> {17};
     17 -> {18};
     18 -> {19};
-    19 -> {20 26 27};
-    19 -> {20} [style=dashed];
+
+    subgraph cluster_9 {
+        color=red
+        20 [label="Enter function test_1" style="filled" fillcolor=red];
+        subgraph cluster_10 {
+            color=blue
+            21 [label="Enter block"];
+            22 [label="Variable declaration: lval x: R|kotlin/Int|"];
+            subgraph cluster_11 {
+                color=blue
+                23 [label="Function call arguments enter"];
+                24 [label="Postponed enter to lambda"];
+                subgraph cluster_12 {
+                    color=blue
+                    25 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_13 {
+                        color=blue
+                        26 [label="Enter block"];
+                        27 [label="Const: Int(1)"];
+                        28 [label="Assignment: R|<local>/x|"];
+                        29 [label="Exit block"];
+                    }
+                    30 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                31 [label="Function call arguments exit"];
+            }
+            32 [label="Postponed exit from lambda"];
+            33 [label="Function call: R|/inlineRun|(...)" style="filled" fillcolor=yellow];
+            subgraph cluster_14 {
+                color=blue
+                34 [label="Function call arguments enter"];
+                35 [label="Access variable R|<local>/x|"];
+                36 [label="Function call arguments exit"];
+            }
+            37 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
+            38 [label="Exit block"];
+        }
+        39 [label="Exit function test_1" style="filled" fillcolor=red];
+    }
     20 -> {21};
     21 -> {22};
     22 -> {23};
     23 -> {24};
-    24 -> {25};
+    24 -> {25 31 32};
+    24 -> {25} [style=dashed];
     25 -> {26};
     26 -> {27};
     27 -> {28};
     28 -> {29};
     29 -> {30};
-    30 -> {31};
-
-    subgraph cluster_11 {
-        color=red
-        32 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_12 {
-            color=blue
-            33 [label="Enter block"];
-            34 [label="Variable declaration: lval x: R|kotlin/Int|"];
-            35 [label="Postponed enter to lambda"];
-            subgraph cluster_13 {
-                color=blue
-                36 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_14 {
-                    color=blue
-                    37 [label="Enter block"];
-                    38 [label="Const: Int(1)"];
-                    39 [label="Assignment: R|<local>/x|"];
-                    40 [label="Exit block"];
-                }
-                41 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            42 [label="Postponed exit from lambda"];
-            43 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow];
-            44 [label="Access variable R|<local>/x|"];
-            45 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
-            46 [label="Exit block"];
-        }
-        47 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
+    30 -> {32};
+    31 -> {33};
     32 -> {33};
     33 -> {34};
     34 -> {35};
-    35 -> {36 42 43};
-    35 -> {36} [style=dashed];
+    35 -> {36};
     36 -> {37};
     37 -> {38};
     38 -> {39};
-    39 -> {40};
+
+    subgraph cluster_15 {
+        color=red
+        40 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_16 {
+            color=blue
+            41 [label="Enter block"];
+            42 [label="Variable declaration: lval x: R|kotlin/Int|"];
+            subgraph cluster_17 {
+                color=blue
+                43 [label="Function call arguments enter"];
+                44 [label="Postponed enter to lambda"];
+                subgraph cluster_18 {
+                    color=blue
+                    45 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_19 {
+                        color=blue
+                        46 [label="Enter block"];
+                        47 [label="Const: Int(1)"];
+                        48 [label="Assignment: R|<local>/x|"];
+                        49 [label="Exit block"];
+                    }
+                    50 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                51 [label="Function call arguments exit"];
+            }
+            52 [label="Postponed exit from lambda"];
+            53 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow];
+            subgraph cluster_20 {
+                color=blue
+                54 [label="Function call arguments enter"];
+                55 [label="Access variable R|<local>/x|"];
+                56 [label="Function call arguments exit"];
+            }
+            57 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
+            58 [label="Exit block"];
+        }
+        59 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
     40 -> {41};
     41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {45};
+    44 -> {45 51 52};
+    44 -> {45} [style=dashed];
     45 -> {46};
     46 -> {47};
+    47 -> {48};
+    48 -> {49};
+    49 -> {50};
+    50 -> {52};
+    51 -> {53};
+    52 -> {53};
+    53 -> {54};
+    54 -> {55};
+    55 -> {56};
+    56 -> {57};
+    57 -> {58};
+    58 -> {59};
 
 }

compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.dot

@@ -21,11 +21,16 @@ digraph contractsUsage_kt {
                 4 [label="Enter block"];
                 5 [label="Exit block"];
             }
-            6 [label="Access variable R|<local>/x|"];
-            7 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            8 [label="Exit block"];
+            subgraph cluster_4 {
+                color=blue
+                6 [label="Function call arguments enter"];
+                7 [label="Access variable R|<local>/x|"];
+                8 [label="Function call arguments exit"];
+            }
+            9 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            10 [label="Exit block"];
         }
-        9 [label="Exit function bar" style="filled" fillcolor=red];
+        11 [label="Exit function bar" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
@@ -34,126 +39,156 @@ digraph contractsUsage_kt {
     6 -> {7};
     7 -> {8};
     8 -> {9};
+    9 -> {10};
+    10 -> {11};
 
-    subgraph cluster_4 {
+    subgraph cluster_5 {
         color=red
-        10 [label="Enter function baz" style="filled" fillcolor=red];
-        subgraph cluster_5 {
+        12 [label="Enter function baz" style="filled" fillcolor=red];
+        subgraph cluster_6 {
             color=blue
-            11 [label="Enter block"];
-            subgraph cluster_6 {
-                color=blue
-                12 [label="Enter block"];
-                13 [label="Exit block"];
-            }
+            13 [label="Enter block"];
             subgraph cluster_7 {
                 color=blue
-                14 [label="Enter when"];
-                subgraph cluster_8 {
-                    color=blue
-                    15 [label="Enter when branch condition "];
-                    16 [label="Const: Boolean(true)"];
-                    17 [label="Exit when branch condition"];
-                }
-                18 [label="Synthetic else branch"];
-                19 [label="Enter when branch result"];
+                14 [label="Enter block"];
+                15 [label="Exit block"];
+            }
+            subgraph cluster_8 {
+                color=blue
+                16 [label="Enter when"];
                 subgraph cluster_9 {
                     color=blue
-                    20 [label="Enter block"];
-                    21 [label="Access variable this@R|/baz|"];
-                    22 [label="Function call: this@R|/baz|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-                    23 [label="Exit block"];
+                    17 [label="Enter when branch condition "];
+                    18 [label="Const: Boolean(true)"];
+                    19 [label="Exit when branch condition"];
                 }
-                24 [label="Exit when branch result"];
-                25 [label="Exit when"];
+                20 [label="Synthetic else branch"];
+                21 [label="Enter when branch result"];
+                subgraph cluster_10 {
+                    color=blue
+                    22 [label="Enter block"];
+                    subgraph cluster_11 {
+                        color=blue
+                        23 [label="Function call arguments enter"];
+                        24 [label="Access variable this@R|/baz|"];
+                        25 [label="Function call arguments exit"];
+                    }
+                    26 [label="Function call: this@R|/baz|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+                    27 [label="Exit block"];
+                }
+                28 [label="Exit when branch result"];
+                29 [label="Exit when"];
             }
-            26 [label="Exit block"];
+            30 [label="Exit block"];
         }
-        27 [label="Exit function baz" style="filled" fillcolor=red];
+        31 [label="Exit function baz" style="filled" fillcolor=red];
     }
-    10 -> {11};
-    11 -> {12};
     12 -> {13};
     13 -> {14};
     14 -> {15};
     15 -> {16};
     16 -> {17};
-    17 -> {18 19};
-    18 -> {25};
-    19 -> {20};
-    20 -> {21};
+    17 -> {18};
+    18 -> {19};
+    19 -> {20 21};
+    20 -> {29};
     21 -> {22};
     22 -> {23};
     23 -> {24};
     24 -> {25};
     25 -> {26};
     26 -> {27};
-
-    subgraph cluster_10 {
-        color=red
-        28 [label="Enter function foo" style="filled" fillcolor=red];
-        subgraph cluster_11 {
-            color=blue
-            29 [label="Enter block"];
-            subgraph cluster_12 {
-                color=blue
-                30 [label="Enter block"];
-                31 [label="Exit block"];
-            }
-            subgraph cluster_13 {
-                color=blue
-                32 [label="Enter when"];
-                subgraph cluster_14 {
-                    color=blue
-                    33 [label="Enter when branch condition "];
-                    34 [label="Const: Boolean(true)"];
-                    35 [label="Exit when branch condition"];
-                }
-                36 [label="Synthetic else branch"];
-                37 [label="Enter when branch result"];
-                subgraph cluster_15 {
-                    color=blue
-                    38 [label="Enter block"];
-                    39 [label="Access variable R|<local>/x|"];
-                    40 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-                    41 [label="Access variable R|<local>/y|"];
-                    42 [label="Function call: R|<local>/y|.R|/baz|()" style="filled" fillcolor=yellow];
-                    43 [label="Jump: ^foo Unit"];
-                    44 [label="Stub" style="filled" fillcolor=gray];
-                    45 [label="Exit block" style="filled" fillcolor=gray];
-                }
-                46 [label="Exit when branch result" style="filled" fillcolor=gray];
-                47 [label="Exit when"];
-            }
-            48 [label="Access variable R|<local>/x|"];
-            49 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow];
-            50 [label="Exit block"];
-        }
-        51 [label="Exit function foo" style="filled" fillcolor=red];
-    }
+    27 -> {28};
     28 -> {29};
     29 -> {30};
     30 -> {31};
-    31 -> {32};
+
+    subgraph cluster_12 {
+        color=red
+        32 [label="Enter function foo" style="filled" fillcolor=red];
+        subgraph cluster_13 {
+            color=blue
+            33 [label="Enter block"];
+            subgraph cluster_14 {
+                color=blue
+                34 [label="Enter block"];
+                35 [label="Exit block"];
+            }
+            subgraph cluster_15 {
+                color=blue
+                36 [label="Enter when"];
+                subgraph cluster_16 {
+                    color=blue
+                    37 [label="Enter when branch condition "];
+                    38 [label="Const: Boolean(true)"];
+                    39 [label="Exit when branch condition"];
+                }
+                40 [label="Synthetic else branch"];
+                41 [label="Enter when branch result"];
+                subgraph cluster_17 {
+                    color=blue
+                    42 [label="Enter block"];
+                    subgraph cluster_18 {
+                        color=blue
+                        43 [label="Function call arguments enter"];
+                        44 [label="Access variable R|<local>/x|"];
+                        45 [label="Function call arguments exit"];
+                    }
+                    46 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+                    subgraph cluster_19 {
+                        color=blue
+                        47 [label="Function call arguments enter"];
+                        48 [label="Access variable R|<local>/y|"];
+                        49 [label="Function call arguments exit"];
+                    }
+                    50 [label="Function call: R|<local>/y|.R|/baz|()" style="filled" fillcolor=yellow];
+                    51 [label="Jump: ^foo Unit"];
+                    52 [label="Stub" style="filled" fillcolor=gray];
+                    53 [label="Exit block" style="filled" fillcolor=gray];
+                }
+                54 [label="Exit when branch result" style="filled" fillcolor=gray];
+                55 [label="Exit when"];
+            }
+            subgraph cluster_20 {
+                color=blue
+                56 [label="Function call arguments enter"];
+                57 [label="Access variable R|<local>/x|"];
+                58 [label="Function call arguments exit"];
+            }
+            59 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow];
+            60 [label="Exit block"];
+        }
+        61 [label="Exit function foo" style="filled" fillcolor=red];
+    }
     32 -> {33};
     33 -> {34};
     34 -> {35};
-    35 -> {36 37};
-    36 -> {47};
+    35 -> {36};
+    36 -> {37};
     37 -> {38};
     38 -> {39};
-    39 -> {40};
-    40 -> {41};
+    39 -> {40 41};
+    40 -> {55};
     41 -> {42};
     42 -> {43};
-    43 -> {51};
-    43 -> {44} [style=dotted];
-    44 -> {45} [style=dotted];
-    45 -> {46} [style=dotted];
-    46 -> {47} [style=dotted];
+    43 -> {44};
+    44 -> {45};
+    45 -> {46};
+    46 -> {47};
     47 -> {48};
     48 -> {49};
     49 -> {50};
     50 -> {51};
+    51 -> {61};
+    51 -> {52} [style=dotted];
+    52 -> {53} [style=dotted];
+    53 -> {54} [style=dotted];
+    54 -> {55} [style=dotted];
+    55 -> {56};
+    56 -> {57};
+    57 -> {58};
+    58 -> {59};
+    59 -> {60};
+    60 -> {61};
 
 }

compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.dot

@@ -21,10 +21,15 @@ digraph exactlyOnce_kt {
                 4 [label="Enter block"];
                 5 [label="Exit block"];
             }
-            6 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            7 [label="Exit block"];
+            subgraph cluster_4 {
+                color=blue
+                6 [label="Function call arguments enter"];
+                7 [label="Function call arguments exit"];
+            }
+            8 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            9 [label="Exit block"];
         }
-        8 [label="Exit function inlineRun" style="filled" fillcolor=red];
+        10 [label="Exit function inlineRun" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
@@ -32,120 +37,157 @@ digraph exactlyOnce_kt {
     5 -> {6};
     6 -> {7};
     7 -> {8};
-
-    subgraph cluster_4 {
-        color=red
-        9 [label="Enter function myRun" style="filled" fillcolor=red];
-        subgraph cluster_5 {
-            color=blue
-            10 [label="Enter block"];
-            subgraph cluster_6 {
-                color=blue
-                11 [label="Enter block"];
-                12 [label="Exit block"];
-            }
-            13 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            14 [label="Exit block"];
-        }
-        15 [label="Exit function myRun" style="filled" fillcolor=red];
-    }
+    8 -> {9};
     9 -> {10};
-    10 -> {11};
+
+    subgraph cluster_5 {
+        color=red
+        11 [label="Enter function myRun" style="filled" fillcolor=red];
+        subgraph cluster_6 {
+            color=blue
+            12 [label="Enter block"];
+            subgraph cluster_7 {
+                color=blue
+                13 [label="Enter block"];
+                14 [label="Exit block"];
+            }
+            subgraph cluster_8 {
+                color=blue
+                15 [label="Function call arguments enter"];
+                16 [label="Function call arguments exit"];
+            }
+            17 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            18 [label="Exit block"];
+        }
+        19 [label="Exit function myRun" style="filled" fillcolor=red];
+    }
     11 -> {12};
     12 -> {13};
     13 -> {14};
     14 -> {15};
-
-    subgraph cluster_7 {
-        color=red
-        16 [label="Enter function test_1" style="filled" fillcolor=red];
-        subgraph cluster_8 {
-            color=blue
-            17 [label="Enter block"];
-            18 [label="Variable declaration: lval x: R|kotlin/Int|"];
-            19 [label="Postponed enter to lambda"];
-            subgraph cluster_9 {
-                color=blue
-                20 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_10 {
-                    color=blue
-                    21 [label="Enter block"];
-                    22 [label="Const: Int(1)"];
-                    23 [label="Assignment: R|<local>/x|"];
-                    24 [label="Exit block"];
-                }
-                25 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            26 [label="Postponed exit from lambda"];
-            27 [label="Function call: R|/inlineRun|(...)" style="filled" fillcolor=yellow];
-            28 [label="Access variable R|<local>/x|"];
-            29 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
-            30 [label="Exit block"];
-        }
-        31 [label="Exit function test_1" style="filled" fillcolor=red];
-    }
+    15 -> {16};
     16 -> {17};
     17 -> {18};
     18 -> {19};
-    19 -> {20 27};
-    19 -> {26} [style=dotted];
-    19 -> {20} [style=dashed];
+
+    subgraph cluster_9 {
+        color=red
+        20 [label="Enter function test_1" style="filled" fillcolor=red];
+        subgraph cluster_10 {
+            color=blue
+            21 [label="Enter block"];
+            22 [label="Variable declaration: lval x: R|kotlin/Int|"];
+            subgraph cluster_11 {
+                color=blue
+                23 [label="Function call arguments enter"];
+                24 [label="Postponed enter to lambda"];
+                subgraph cluster_12 {
+                    color=blue
+                    25 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_13 {
+                        color=blue
+                        26 [label="Enter block"];
+                        27 [label="Const: Int(1)"];
+                        28 [label="Assignment: R|<local>/x|"];
+                        29 [label="Exit block"];
+                    }
+                    30 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                31 [label="Function call arguments exit"];
+            }
+            32 [label="Postponed exit from lambda"];
+            33 [label="Function call: R|/inlineRun|(...)" style="filled" fillcolor=yellow];
+            subgraph cluster_14 {
+                color=blue
+                34 [label="Function call arguments enter"];
+                35 [label="Access variable R|<local>/x|"];
+                36 [label="Function call arguments exit"];
+            }
+            37 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
+            38 [label="Exit block"];
+        }
+        39 [label="Exit function test_1" style="filled" fillcolor=red];
+    }
     20 -> {21};
     21 -> {22};
     22 -> {23};
     23 -> {24};
-    24 -> {25};
+    24 -> {25 31};
+    24 -> {32} [style=dotted];
+    24 -> {25} [style=dashed];
     25 -> {26};
     26 -> {27};
     27 -> {28};
     28 -> {29};
     29 -> {30};
-    30 -> {31};
-
-    subgraph cluster_11 {
-        color=red
-        32 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_12 {
-            color=blue
-            33 [label="Enter block"];
-            34 [label="Variable declaration: lval x: R|kotlin/Int|"];
-            35 [label="Postponed enter to lambda"];
-            subgraph cluster_13 {
-                color=blue
-                36 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_14 {
-                    color=blue
-                    37 [label="Enter block"];
-                    38 [label="Const: Int(1)"];
-                    39 [label="Assignment: R|<local>/x|"];
-                    40 [label="Exit block"];
-                }
-                41 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            42 [label="Postponed exit from lambda"];
-            43 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow];
-            44 [label="Access variable R|<local>/x|"];
-            45 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
-            46 [label="Exit block"];
-        }
-        47 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
+    30 -> {32};
+    31 -> {33};
     32 -> {33};
     33 -> {34};
     34 -> {35};
-    35 -> {36 43};
-    35 -> {42} [style=dotted];
-    35 -> {36} [style=dashed];
+    35 -> {36};
     36 -> {37};
     37 -> {38};
     38 -> {39};
-    39 -> {40};
+
+    subgraph cluster_15 {
+        color=red
+        40 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_16 {
+            color=blue
+            41 [label="Enter block"];
+            42 [label="Variable declaration: lval x: R|kotlin/Int|"];
+            subgraph cluster_17 {
+                color=blue
+                43 [label="Function call arguments enter"];
+                44 [label="Postponed enter to lambda"];
+                subgraph cluster_18 {
+                    color=blue
+                    45 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_19 {
+                        color=blue
+                        46 [label="Enter block"];
+                        47 [label="Const: Int(1)"];
+                        48 [label="Assignment: R|<local>/x|"];
+                        49 [label="Exit block"];
+                    }
+                    50 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                51 [label="Function call arguments exit"];
+            }
+            52 [label="Postponed exit from lambda"];
+            53 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow];
+            subgraph cluster_20 {
+                color=blue
+                54 [label="Function call arguments enter"];
+                55 [label="Access variable R|<local>/x|"];
+                56 [label="Function call arguments exit"];
+            }
+            57 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
+            58 [label="Exit block"];
+        }
+        59 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
     40 -> {41};
     41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {45};
+    44 -> {45 51};
+    44 -> {52} [style=dotted];
+    44 -> {45} [style=dashed];
     45 -> {46};
     46 -> {47};
+    47 -> {48};
+    48 -> {49};
+    49 -> {50};
+    50 -> {52};
+    51 -> {53};
+    52 -> {53};
+    53 -> {54};
+    54 -> {55};
+    55 -> {56};
+    56 -> {57};
+    57 -> {58};
+    58 -> {59};
 
 }

compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.dot

@@ -35,20 +35,30 @@ digraph flow_kt {
                 subgraph cluster_6 {
                     color=blue
                     12 [label="Enter block"];
-                    13 [label="Access variable R|<local>/x|"];
-                    14 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-                    15 [label="Jump: ^bar Unit"];
-                    16 [label="Stub" style="filled" fillcolor=gray];
-                    17 [label="Exit block" style="filled" fillcolor=gray];
+                    subgraph cluster_7 {
+                        color=blue
+                        13 [label="Function call arguments enter"];
+                        14 [label="Access variable R|<local>/x|"];
+                        15 [label="Function call arguments exit"];
+                    }
+                    16 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+                    17 [label="Jump: ^bar Unit"];
+                    18 [label="Stub" style="filled" fillcolor=gray];
+                    19 [label="Exit block" style="filled" fillcolor=gray];
                 }
-                18 [label="Exit when branch result" style="filled" fillcolor=gray];
-                19 [label="Exit when"];
+                20 [label="Exit when branch result" style="filled" fillcolor=gray];
+                21 [label="Exit when"];
             }
-            20 [label="Access variable R|<local>/x|"];
-            21 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow];
-            22 [label="Exit block"];
+            subgraph cluster_8 {
+                color=blue
+                22 [label="Function call arguments enter"];
+                23 [label="Access variable R|<local>/x|"];
+                24 [label="Function call arguments exit"];
+            }
+            25 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow];
+            26 [label="Exit block"];
         }
-        23 [label="Exit function bar" style="filled" fillcolor=red];
+        27 [label="Exit function bar" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
@@ -58,209 +68,259 @@ digraph flow_kt {
     7 -> {8};
     8 -> {9};
     9 -> {10 11};
-    10 -> {19};
+    10 -> {21};
     11 -> {12};
     12 -> {13};
     13 -> {14};
     14 -> {15};
-    15 -> {23};
-    15 -> {16} [style=dotted];
-    16 -> {17} [style=dotted];
+    15 -> {16};
+    16 -> {17};
+    17 -> {27};
     17 -> {18} [style=dotted];
     18 -> {19} [style=dotted];
-    19 -> {20};
-    20 -> {21};
+    19 -> {20} [style=dotted];
+    20 -> {21} [style=dotted];
     21 -> {22};
     22 -> {23};
-
-    subgraph cluster_7 {
-        color=red
-        24 [label="Enter function foo" style="filled" fillcolor=red];
-        subgraph cluster_8 {
-            color=blue
-            25 [label="Enter block"];
-            subgraph cluster_9 {
-                color=blue
-                26 [label="Enter block"];
-                27 [label="Exit block"];
-            }
-            subgraph cluster_10 {
-                color=blue
-                28 [label="Enter when"];
-                subgraph cluster_11 {
-                    color=blue
-                    29 [label="Enter when branch condition "];
-                    30 [label="Const: Boolean(true)"];
-                    31 [label="Exit when branch condition"];
-                }
-                subgraph cluster_12 {
-                    color=blue
-                    32 [label="Enter when branch condition else"];
-                    33 [label="Exit when branch condition"];
-                }
-                34 [label="Enter when branch result"];
-                subgraph cluster_13 {
-                    color=blue
-                    35 [label="Enter block"];
-                    subgraph cluster_14 {
-                        color=blue
-                        36 [label="Enter when"];
-                        subgraph cluster_15 {
-                            color=blue
-                            37 [label="Enter when branch condition "];
-                            38 [label="Const: Boolean(false)"];
-                            39 [label="Exit when branch condition"];
-                        }
-                        subgraph cluster_16 {
-                            color=blue
-                            40 [label="Enter when branch condition else"];
-                            41 [label="Exit when branch condition"];
-                        }
-                        42 [label="Enter when branch result"];
-                        subgraph cluster_17 {
-                            color=blue
-                            43 [label="Enter block"];
-                            44 [label="Access variable R|<local>/y|"];
-                            45 [label="Function call: R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-                            46 [label="Access variable R|<local>/z|"];
-                            47 [label="Function call: R|<local>/z|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-                            48 [label="Jump: ^foo Unit"];
-                            49 [label="Stub" style="filled" fillcolor=gray];
-                            50 [label="Exit block" style="filled" fillcolor=gray];
-                        }
-                        51 [label="Exit when branch result" style="filled" fillcolor=gray];
-                        52 [label="Enter when branch result"];
-                        subgraph cluster_18 {
-                            color=blue
-                            53 [label="Enter block"];
-                            54 [label="Access variable R|<local>/y|"];
-                            55 [label="Function call: R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-                            56 [label="Exit block"];
-                        }
-                        57 [label="Exit when branch result"];
-                        58 [label="Exit when"];
-                    }
-                    59 [label="Exit block"];
-                }
-                60 [label="Exit when branch result"];
-                61 [label="Enter when branch result"];
-                subgraph cluster_19 {
-                    color=blue
-                    62 [label="Enter block"];
-                    subgraph cluster_20 {
-                        color=blue
-                        63 [label="Enter block"];
-                        64 [label="Const: Int(0)"];
-                        65 [label="Const: Int(0)"];
-                        66 [label="Function call: Int(0).R|kotlin/Int.rangeTo|(...)" style="filled" fillcolor=yellow];
-                        67 [label="Function call: Int(0).R|kotlin/Int.rangeTo|(...).R|kotlin/ranges/IntProgression.iterator|()" style="filled" fillcolor=yellow];
-                        68 [label="Variable declaration: lval <iterator>: R|kotlin/collections/IntIterator|"];
-                        subgraph cluster_21 {
-                            color=blue
-                            69 [label="Enter while loop"];
-                            subgraph cluster_22 {
-                                color=blue
-                                70 [label="Enter loop condition"];
-                                71 [label="Access variable R|<local>/<iterator>|"];
-                                72 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/IntIterator.hasNext: R|kotlin/Boolean|>|()" style="filled" fillcolor=yellow];
-                                73 [label="Exit loop condition"];
-                            }
-                            subgraph cluster_23 {
-                                color=blue
-                                74 [label="Enter loop block"];
-                                subgraph cluster_24 {
-                                    color=blue
-                                    75 [label="Enter block"];
-                                    76 [label="Access variable R|<local>/<iterator>|"];
-                                    77 [label="Function call: R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()" style="filled" fillcolor=yellow];
-                                    78 [label="Variable declaration: lval i: R|kotlin/Int|"];
-                                    subgraph cluster_25 {
-                                        color=blue
-                                        79 [label="Enter block"];
-                                        80 [label="Access variable R|<local>/x|"];
-                                        81 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-                                        82 [label="Exit block"];
-                                    }
-                                    83 [label="Exit block"];
-                                }
-                                84 [label="Exit loop block"];
-                            }
-                            85 [label="Exit while loop"];
-                        }
-                        86 [label="Exit block"];
-                    }
-                    87 [label="Access variable R|<local>/y|"];
-                    88 [label="Function call: R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-                    89 [label="Exit block"];
-                }
-                90 [label="Exit when branch result"];
-                91 [label="Exit when"];
-            }
-            subgraph cluster_26 {
-                color=blue
-                92 [label="Enter do-while loop"];
-                subgraph cluster_27 {
-                    color=blue
-                    93 [label="Enter loop block"];
-                    subgraph cluster_28 {
-                        color=blue
-                        94 [label="Enter block"];
-                        95 [label="Access variable R|<local>/z|"];
-                        96 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow];
-                        97 [label="Exit block"];
-                    }
-                    98 [label="Exit loop block"];
-                }
-                subgraph cluster_29 {
-                    color=blue
-                    99 [label="Enter loop condition"];
-                    100 [label="Const: Boolean(true)"];
-                    101 [label="Exit loop condition"];
-                }
-                102 [label="Exit do-while loop" style="filled" fillcolor=gray];
-            }
-            103 [label="Exit block" style="filled" fillcolor=gray];
-        }
-        104 [label="Exit function foo" style="filled" fillcolor=red];
-    }
+    23 -> {24};
     24 -> {25};
     25 -> {26};
     26 -> {27};
-    27 -> {28};
+
+    subgraph cluster_9 {
+        color=red
+        28 [label="Enter function foo" style="filled" fillcolor=red];
+        subgraph cluster_10 {
+            color=blue
+            29 [label="Enter block"];
+            subgraph cluster_11 {
+                color=blue
+                30 [label="Enter block"];
+                31 [label="Exit block"];
+            }
+            subgraph cluster_12 {
+                color=blue
+                32 [label="Enter when"];
+                subgraph cluster_13 {
+                    color=blue
+                    33 [label="Enter when branch condition "];
+                    34 [label="Const: Boolean(true)"];
+                    35 [label="Exit when branch condition"];
+                }
+                subgraph cluster_14 {
+                    color=blue
+                    36 [label="Enter when branch condition else"];
+                    37 [label="Exit when branch condition"];
+                }
+                38 [label="Enter when branch result"];
+                subgraph cluster_15 {
+                    color=blue
+                    39 [label="Enter block"];
+                    subgraph cluster_16 {
+                        color=blue
+                        40 [label="Enter when"];
+                        subgraph cluster_17 {
+                            color=blue
+                            41 [label="Enter when branch condition "];
+                            42 [label="Const: Boolean(false)"];
+                            43 [label="Exit when branch condition"];
+                        }
+                        subgraph cluster_18 {
+                            color=blue
+                            44 [label="Enter when branch condition else"];
+                            45 [label="Exit when branch condition"];
+                        }
+                        46 [label="Enter when branch result"];
+                        subgraph cluster_19 {
+                            color=blue
+                            47 [label="Enter block"];
+                            subgraph cluster_20 {
+                                color=blue
+                                48 [label="Function call arguments enter"];
+                                49 [label="Access variable R|<local>/y|"];
+                                50 [label="Function call arguments exit"];
+                            }
+                            51 [label="Function call: R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+                            subgraph cluster_21 {
+                                color=blue
+                                52 [label="Function call arguments enter"];
+                                53 [label="Access variable R|<local>/z|"];
+                                54 [label="Function call arguments exit"];
+                            }
+                            55 [label="Function call: R|<local>/z|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+                            56 [label="Jump: ^foo Unit"];
+                            57 [label="Stub" style="filled" fillcolor=gray];
+                            58 [label="Exit block" style="filled" fillcolor=gray];
+                        }
+                        59 [label="Exit when branch result" style="filled" fillcolor=gray];
+                        60 [label="Enter when branch result"];
+                        subgraph cluster_22 {
+                            color=blue
+                            61 [label="Enter block"];
+                            subgraph cluster_23 {
+                                color=blue
+                                62 [label="Function call arguments enter"];
+                                63 [label="Access variable R|<local>/y|"];
+                                64 [label="Function call arguments exit"];
+                            }
+                            65 [label="Function call: R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+                            66 [label="Exit block"];
+                        }
+                        67 [label="Exit when branch result"];
+                        68 [label="Exit when"];
+                    }
+                    69 [label="Exit block"];
+                }
+                70 [label="Exit when branch result"];
+                71 [label="Enter when branch result"];
+                subgraph cluster_24 {
+                    color=blue
+                    72 [label="Enter block"];
+                    subgraph cluster_25 {
+                        color=blue
+                        73 [label="Enter block"];
+                        subgraph cluster_26 {
+                            color=blue
+                            74 [label="Function call arguments enter"];
+                            subgraph cluster_27 {
+                                color=blue
+                                75 [label="Function call arguments enter"];
+                                76 [label="Const: Int(0)"];
+                                77 [label="Const: Int(0)"];
+                                78 [label="Function call arguments exit"];
+                            }
+                            79 [label="Function call: Int(0).R|kotlin/Int.rangeTo|(...)" style="filled" fillcolor=yellow];
+                            80 [label="Function call arguments exit"];
+                        }
+                        81 [label="Function call: Int(0).R|kotlin/Int.rangeTo|(...).R|kotlin/ranges/IntProgression.iterator|()" style="filled" fillcolor=yellow];
+                        82 [label="Variable declaration: lval <iterator>: R|kotlin/collections/IntIterator|"];
+                        subgraph cluster_28 {
+                            color=blue
+                            83 [label="Enter while loop"];
+                            subgraph cluster_29 {
+                                color=blue
+                                84 [label="Enter loop condition"];
+                                subgraph cluster_30 {
+                                    color=blue
+                                    85 [label="Function call arguments enter"];
+                                    86 [label="Access variable R|<local>/<iterator>|"];
+                                    87 [label="Function call arguments exit"];
+                                }
+                                88 [label="Function call: R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/IntIterator.hasNext: R|kotlin/Boolean|>|()" style="filled" fillcolor=yellow];
+                                89 [label="Exit loop condition"];
+                            }
+                            subgraph cluster_31 {
+                                color=blue
+                                90 [label="Enter loop block"];
+                                subgraph cluster_32 {
+                                    color=blue
+                                    91 [label="Enter block"];
+                                    subgraph cluster_33 {
+                                        color=blue
+                                        92 [label="Function call arguments enter"];
+                                        93 [label="Access variable R|<local>/<iterator>|"];
+                                        94 [label="Function call arguments exit"];
+                                    }
+                                    95 [label="Function call: R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()" style="filled" fillcolor=yellow];
+                                    96 [label="Variable declaration: lval i: R|kotlin/Int|"];
+                                    subgraph cluster_34 {
+                                        color=blue
+                                        97 [label="Enter block"];
+                                        subgraph cluster_35 {
+                                            color=blue
+                                            98 [label="Function call arguments enter"];
+                                            99 [label="Access variable R|<local>/x|"];
+                                            100 [label="Function call arguments exit"];
+                                        }
+                                        101 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+                                        102 [label="Exit block"];
+                                    }
+                                    103 [label="Exit block"];
+                                }
+                                104 [label="Exit loop block"];
+                            }
+                            105 [label="Exit while loop"];
+                        }
+                        106 [label="Exit block"];
+                    }
+                    subgraph cluster_36 {
+                        color=blue
+                        107 [label="Function call arguments enter"];
+                        108 [label="Access variable R|<local>/y|"];
+                        109 [label="Function call arguments exit"];
+                    }
+                    110 [label="Function call: R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+                    111 [label="Exit block"];
+                }
+                112 [label="Exit when branch result"];
+                113 [label="Exit when"];
+            }
+            subgraph cluster_37 {
+                color=blue
+                114 [label="Enter do-while loop"];
+                subgraph cluster_38 {
+                    color=blue
+                    115 [label="Enter loop block"];
+                    subgraph cluster_39 {
+                        color=blue
+                        116 [label="Enter block"];
+                        subgraph cluster_40 {
+                            color=blue
+                            117 [label="Function call arguments enter"];
+                            118 [label="Access variable R|<local>/z|"];
+                            119 [label="Function call arguments exit"];
+                        }
+                        120 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow];
+                        121 [label="Exit block"];
+                    }
+                    122 [label="Exit loop block"];
+                }
+                subgraph cluster_41 {
+                    color=blue
+                    123 [label="Enter loop condition"];
+                    124 [label="Const: Boolean(true)"];
+                    125 [label="Exit loop condition"];
+                }
+                126 [label="Exit do-while loop" style="filled" fillcolor=gray];
+            }
+            127 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        128 [label="Exit function foo" style="filled" fillcolor=red];
+    }
     28 -> {29};
     29 -> {30};
     30 -> {31};
-    31 -> {32 61};
+    31 -> {32};
     32 -> {33};
     33 -> {34};
     34 -> {35};
-    35 -> {36};
+    35 -> {36 71};
     36 -> {37};
     37 -> {38};
     38 -> {39};
-    39 -> {40 52};
+    39 -> {40};
     40 -> {41};
     41 -> {42};
     42 -> {43};
-    43 -> {44};
+    43 -> {44 60};
     44 -> {45};
     45 -> {46};
     46 -> {47};
     47 -> {48};
-    48 -> {104};
-    48 -> {49} [style=dotted];
-    49 -> {50} [style=dotted];
-    50 -> {51} [style=dotted];
-    51 -> {58} [style=dotted];
+    48 -> {49};
+    49 -> {50};
+    50 -> {51};
+    51 -> {52};
     52 -> {53};
     53 -> {54};
     54 -> {55};
     55 -> {56};
-    56 -> {57};
-    57 -> {58};
-    58 -> {59};
-    59 -> {60};
-    60 -> {91};
+    56 -> {128};
+    56 -> {57} [style=dotted];
+    57 -> {58} [style=dotted];
+    58 -> {59} [style=dotted];
+    59 -> {68} [style=dotted];
+    60 -> {61};
     61 -> {62};
     62 -> {63};
     63 -> {64};
@@ -270,10 +330,10 @@ digraph flow_kt {
     67 -> {68};
     68 -> {69};
     69 -> {70};
-    70 -> {71};
+    70 -> {113};
     71 -> {72};
     72 -> {73};
-    73 -> {74 85};
+    73 -> {74};
     74 -> {75};
     75 -> {76};
     76 -> {77};
@@ -284,12 +344,12 @@ digraph flow_kt {
     81 -> {82};
     82 -> {83};
     83 -> {84};
-    84 -> {70} [color=green style=dashed];
+    84 -> {85};
     85 -> {86};
     86 -> {87};
     87 -> {88};
     88 -> {89};
-    89 -> {90};
+    89 -> {90 105};
     90 -> {91};
     91 -> {92};
     92 -> {93};
@@ -301,9 +361,33 @@ digraph flow_kt {
     98 -> {99};
     99 -> {100};
     100 -> {101};
-    101 -> {93} [color=green style=dashed];
-    101 -> {102} [style=dotted];
-    102 -> {103} [style=dotted];
-    103 -> {104} [style=dotted];
+    101 -> {102};
+    102 -> {103};
+    103 -> {104};
+    104 -> {84} [color=green style=dashed];
+    105 -> {106};
+    106 -> {107};
+    107 -> {108};
+    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 -> {121};
+    121 -> {122};
+    122 -> {123};
+    123 -> {124};
+    124 -> {125};
+    125 -> {115} [color=green style=dashed];
+    125 -> {126} [style=dotted];
+    126 -> {127} [style=dotted];
+    127 -> {128} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.dot

@@ -35,15 +35,20 @@ digraph inPlaceLambda_kt {
                 subgraph cluster_6 {
                     color=blue
                     12 [label="Enter block"];
-                    13 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-                    14 [label="Exit block"];
+                    subgraph cluster_7 {
+                        color=blue
+                        13 [label="Function call arguments enter"];
+                        14 [label="Function call arguments exit"];
+                    }
+                    15 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+                    16 [label="Exit block"];
                 }
-                15 [label="Exit when branch result"];
-                16 [label="Exit when"];
+                17 [label="Exit when branch result"];
+                18 [label="Exit when"];
             }
-            17 [label="Exit block"];
+            19 [label="Exit block"];
         }
-        18 [label="Exit function bar" style="filled" fillcolor=red];
+        20 [label="Exit function bar" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
@@ -53,7 +58,7 @@ digraph inPlaceLambda_kt {
     7 -> {8};
     8 -> {9};
     9 -> {10 11};
-    10 -> {16};
+    10 -> {18};
     11 -> {12};
     12 -> {13};
     13 -> {14};
@@ -61,51 +66,74 @@ digraph inPlaceLambda_kt {
     15 -> {16};
     16 -> {17};
     17 -> {18};
+    18 -> {19};
+    19 -> {20};
 
-    subgraph cluster_7 {
+    subgraph cluster_8 {
         color=red
-        19 [label="Enter function foo" style="filled" fillcolor=red];
-        subgraph cluster_8 {
+        21 [label="Enter function foo" style="filled" fillcolor=red];
+        subgraph cluster_9 {
             color=blue
-            20 [label="Enter block"];
-            subgraph cluster_9 {
-                color=blue
-                21 [label="Enter block"];
-                22 [label="Exit block"];
-            }
-            23 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            24 [label="Postponed enter to lambda"];
+            22 [label="Enter block"];
             subgraph cluster_10 {
                 color=blue
-                25 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_11 {
-                    color=blue
-                    26 [label="Enter block"];
-                    27 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-                    28 [label="Exit block"];
-                }
-                29 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                23 [label="Enter block"];
+                24 [label="Exit block"];
             }
-            30 [label="Postponed exit from lambda"];
-            31 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow];
-            32 [label="Exit block"];
+            subgraph cluster_11 {
+                color=blue
+                25 [label="Function call arguments enter"];
+                26 [label="Function call arguments exit"];
+            }
+            27 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            subgraph cluster_12 {
+                color=blue
+                28 [label="Function call arguments enter"];
+                29 [label="Postponed enter to lambda"];
+                subgraph cluster_13 {
+                    color=blue
+                    30 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_14 {
+                        color=blue
+                        31 [label="Enter block"];
+                        subgraph cluster_15 {
+                            color=blue
+                            32 [label="Function call arguments enter"];
+                            33 [label="Function call arguments exit"];
+                        }
+                        34 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+                        35 [label="Exit block"];
+                    }
+                    36 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                37 [label="Function call arguments exit"];
+            }
+            38 [label="Postponed exit from lambda"];
+            39 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow];
+            40 [label="Exit block"];
         }
-        33 [label="Exit function foo" style="filled" fillcolor=red];
+        41 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    19 -> {20};
-    20 -> {21};
     21 -> {22};
     22 -> {23};
     23 -> {24};
-    24 -> {25 30 31};
-    24 -> {25} [style=dashed];
+    24 -> {25};
     25 -> {26};
     26 -> {27};
     27 -> {28};
     28 -> {29};
-    29 -> {30};
+    29 -> {30 37 38};
+    29 -> {30} [style=dashed];
     30 -> {31};
     31 -> {32};
     32 -> {33};
+    33 -> {34};
+    34 -> {35};
+    35 -> {36};
+    36 -> {38};
+    37 -> {39};
+    38 -> {39};
+    39 -> {40};
+    40 -> {41};
 
 }

compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.dot

@@ -21,11 +21,16 @@ digraph simple_kt {
                 4 [label="Enter block"];
                 5 [label="Exit block"];
             }
-            6 [label="Access variable R|<local>/x|"];
-            7 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            8 [label="Exit block"];
+            subgraph cluster_4 {
+                color=blue
+                6 [label="Function call arguments enter"];
+                7 [label="Access variable R|<local>/x|"];
+                8 [label="Function call arguments exit"];
+            }
+            9 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            10 [label="Exit block"];
         }
-        9 [label="Exit function bar" style="filled" fillcolor=red];
+        11 [label="Exit function bar" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
@@ -34,48 +39,63 @@ digraph simple_kt {
     6 -> {7};
     7 -> {8};
     8 -> {9};
+    9 -> {10};
+    10 -> {11};
 
-    subgraph cluster_4 {
+    subgraph cluster_5 {
         color=red
-        10 [label="Enter function foo" style="filled" fillcolor=red];
-        subgraph cluster_5 {
+        12 [label="Enter function foo" style="filled" fillcolor=red];
+        subgraph cluster_6 {
             color=blue
-            11 [label="Enter block"];
-            subgraph cluster_6 {
-                color=blue
-                12 [label="Enter block"];
-                13 [label="Exit block"];
-            }
-            14 [label="Access variable R|<local>/x|"];
-            15 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            13 [label="Enter block"];
             subgraph cluster_7 {
                 color=blue
-                16 [label="Enter when"];
-                subgraph cluster_8 {
-                    color=blue
-                    17 [label="Enter when branch condition "];
-                    18 [label="Const: Boolean(true)"];
-                    19 [label="Exit when branch condition"];
-                }
-                20 [label="Synthetic else branch"];
-                21 [label="Enter when branch result"];
-                subgraph cluster_9 {
-                    color=blue
-                    22 [label="Enter block"];
-                    23 [label="Function call: R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-                    24 [label="Exit block"];
-                }
-                25 [label="Exit when branch result"];
-                26 [label="Exit when"];
+                14 [label="Enter block"];
+                15 [label="Exit block"];
             }
-            27 [label="Access variable R|<local>/z|"];
-            28 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow];
-            29 [label="Exit block"];
+            subgraph cluster_8 {
+                color=blue
+                16 [label="Function call arguments enter"];
+                17 [label="Access variable R|<local>/x|"];
+                18 [label="Function call arguments exit"];
+            }
+            19 [label="Function call: R|<local>/x|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            subgraph cluster_9 {
+                color=blue
+                20 [label="Enter when"];
+                subgraph cluster_10 {
+                    color=blue
+                    21 [label="Enter when branch condition "];
+                    22 [label="Const: Boolean(true)"];
+                    23 [label="Exit when branch condition"];
+                }
+                24 [label="Synthetic else branch"];
+                25 [label="Enter when branch result"];
+                subgraph cluster_11 {
+                    color=blue
+                    26 [label="Enter block"];
+                    subgraph cluster_12 {
+                        color=blue
+                        27 [label="Function call arguments enter"];
+                        28 [label="Function call arguments exit"];
+                    }
+                    29 [label="Function call: R|<local>/y|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+                    30 [label="Exit block"];
+                }
+                31 [label="Exit when branch result"];
+                32 [label="Exit when"];
+            }
+            subgraph cluster_13 {
+                color=blue
+                33 [label="Function call arguments enter"];
+                34 [label="Access variable R|<local>/z|"];
+                35 [label="Function call arguments exit"];
+            }
+            36 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow];
+            37 [label="Exit block"];
         }
-        30 [label="Exit function foo" style="filled" fillcolor=red];
+        38 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    10 -> {11};
-    11 -> {12};
     12 -> {13};
     13 -> {14};
     14 -> {15};
@@ -83,16 +103,24 @@ digraph simple_kt {
     16 -> {17};
     17 -> {18};
     18 -> {19};
-    19 -> {20 21};
-    20 -> {26};
+    19 -> {20};
+    20 -> {21};
     21 -> {22};
     22 -> {23};
-    23 -> {24};
-    24 -> {25};
+    23 -> {24 25};
+    24 -> {32};
     25 -> {26};
     26 -> {27};
     27 -> {28};
     28 -> {29};
     29 -> {30};
+    30 -> {31};
+    31 -> {32};
+    32 -> {33};
+    33 -> {34};
+    34 -> {35};
+    35 -> {36};
+    36 -> {37};
+    37 -> {38};
 
 }

compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.dot

@@ -21,10 +21,15 @@ digraph unknown_kt {
                 4 [label="Enter block"];
                 5 [label="Exit block"];
             }
-            6 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            7 [label="Exit block"];
+            subgraph cluster_4 {
+                color=blue
+                6 [label="Function call arguments enter"];
+                7 [label="Function call arguments exit"];
+            }
+            8 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            9 [label="Exit block"];
         }
-        8 [label="Exit function inlineRun" style="filled" fillcolor=red];
+        10 [label="Exit function inlineRun" style="filled" fillcolor=red];
     }
     2 -> {3};
     3 -> {4};
@@ -32,120 +37,157 @@ digraph unknown_kt {
     5 -> {6};
     6 -> {7};
     7 -> {8};
-
-    subgraph cluster_4 {
-        color=red
-        9 [label="Enter function myRun" style="filled" fillcolor=red];
-        subgraph cluster_5 {
-            color=blue
-            10 [label="Enter block"];
-            subgraph cluster_6 {
-                color=blue
-                11 [label="Enter block"];
-                12 [label="Exit block"];
-            }
-            13 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
-            14 [label="Exit block"];
-        }
-        15 [label="Exit function myRun" style="filled" fillcolor=red];
-    }
+    8 -> {9};
     9 -> {10};
-    10 -> {11};
+
+    subgraph cluster_5 {
+        color=red
+        11 [label="Enter function myRun" style="filled" fillcolor=red];
+        subgraph cluster_6 {
+            color=blue
+            12 [label="Enter block"];
+            subgraph cluster_7 {
+                color=blue
+                13 [label="Enter block"];
+                14 [label="Exit block"];
+            }
+            subgraph cluster_8 {
+                color=blue
+                15 [label="Function call arguments enter"];
+                16 [label="Function call arguments exit"];
+            }
+            17 [label="Function call: R|<local>/block|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()" style="filled" fillcolor=yellow];
+            18 [label="Exit block"];
+        }
+        19 [label="Exit function myRun" style="filled" fillcolor=red];
+    }
     11 -> {12};
     12 -> {13};
     13 -> {14};
     14 -> {15};
-
-    subgraph cluster_7 {
-        color=red
-        16 [label="Enter function test_1" style="filled" fillcolor=red];
-        subgraph cluster_8 {
-            color=blue
-            17 [label="Enter block"];
-            18 [label="Variable declaration: lval x: R|kotlin/Int|"];
-            19 [label="Postponed enter to lambda"];
-            subgraph cluster_9 {
-                color=blue
-                20 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_10 {
-                    color=blue
-                    21 [label="Enter block"];
-                    22 [label="Const: Int(1)"];
-                    23 [label="Assignment: R|<local>/x|"];
-                    24 [label="Exit block"];
-                }
-                25 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            26 [label="Postponed exit from lambda"];
-            27 [label="Function call: R|/inlineRun|(...)" style="filled" fillcolor=yellow];
-            28 [label="Access variable R|<local>/x|"];
-            29 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
-            30 [label="Exit block"];
-        }
-        31 [label="Exit function test_1" style="filled" fillcolor=red];
-    }
+    15 -> {16};
     16 -> {17};
     17 -> {18};
     18 -> {19};
-    19 -> {20 26 27};
-    19 -> {20} [style=dashed];
+
+    subgraph cluster_9 {
+        color=red
+        20 [label="Enter function test_1" style="filled" fillcolor=red];
+        subgraph cluster_10 {
+            color=blue
+            21 [label="Enter block"];
+            22 [label="Variable declaration: lval x: R|kotlin/Int|"];
+            subgraph cluster_11 {
+                color=blue
+                23 [label="Function call arguments enter"];
+                24 [label="Postponed enter to lambda"];
+                subgraph cluster_12 {
+                    color=blue
+                    25 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_13 {
+                        color=blue
+                        26 [label="Enter block"];
+                        27 [label="Const: Int(1)"];
+                        28 [label="Assignment: R|<local>/x|"];
+                        29 [label="Exit block"];
+                    }
+                    30 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                31 [label="Function call arguments exit"];
+            }
+            32 [label="Postponed exit from lambda"];
+            33 [label="Function call: R|/inlineRun|(...)" style="filled" fillcolor=yellow];
+            subgraph cluster_14 {
+                color=blue
+                34 [label="Function call arguments enter"];
+                35 [label="Access variable R|<local>/x|"];
+                36 [label="Function call arguments exit"];
+            }
+            37 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
+            38 [label="Exit block"];
+        }
+        39 [label="Exit function test_1" style="filled" fillcolor=red];
+    }
     20 -> {21};
     21 -> {22};
     22 -> {23};
     23 -> {24};
-    24 -> {25};
+    24 -> {25 31 32};
+    24 -> {25} [style=dashed];
     25 -> {26};
     26 -> {27};
-    26 -> {19} [color=green style=dashed];
     27 -> {28};
     28 -> {29};
     29 -> {30};
-    30 -> {31};
-
-    subgraph cluster_11 {
-        color=red
-        32 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_12 {
-            color=blue
-            33 [label="Enter block"];
-            34 [label="Variable declaration: lval x: R|kotlin/Int|"];
-            35 [label="Postponed enter to lambda"];
-            subgraph cluster_13 {
-                color=blue
-                36 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_14 {
-                    color=blue
-                    37 [label="Enter block"];
-                    38 [label="Const: Int(1)"];
-                    39 [label="Assignment: R|<local>/x|"];
-                    40 [label="Exit block"];
-                }
-                41 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            42 [label="Postponed exit from lambda"];
-            43 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow];
-            44 [label="Access variable R|<local>/x|"];
-            45 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
-            46 [label="Exit block"];
-        }
-        47 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
+    30 -> {32};
+    31 -> {33};
     32 -> {33};
+    32 -> {24} [color=green style=dashed];
     33 -> {34};
     34 -> {35};
-    35 -> {36 42 43};
-    35 -> {36} [style=dashed];
+    35 -> {36};
     36 -> {37};
     37 -> {38};
     38 -> {39};
-    39 -> {40};
+
+    subgraph cluster_15 {
+        color=red
+        40 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_16 {
+            color=blue
+            41 [label="Enter block"];
+            42 [label="Variable declaration: lval x: R|kotlin/Int|"];
+            subgraph cluster_17 {
+                color=blue
+                43 [label="Function call arguments enter"];
+                44 [label="Postponed enter to lambda"];
+                subgraph cluster_18 {
+                    color=blue
+                    45 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_19 {
+                        color=blue
+                        46 [label="Enter block"];
+                        47 [label="Const: Int(1)"];
+                        48 [label="Assignment: R|<local>/x|"];
+                        49 [label="Exit block"];
+                    }
+                    50 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                51 [label="Function call arguments exit"];
+            }
+            52 [label="Postponed exit from lambda"];
+            53 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow];
+            subgraph cluster_20 {
+                color=blue
+                54 [label="Function call arguments enter"];
+                55 [label="Access variable R|<local>/x|"];
+                56 [label="Function call arguments exit"];
+            }
+            57 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
+            58 [label="Exit block"];
+        }
+        59 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
     40 -> {41};
     41 -> {42};
     42 -> {43};
-    42 -> {35} [color=green style=dashed];
     43 -> {44};
-    44 -> {45};
+    44 -> {45 51 52};
+    44 -> {45} [style=dashed];
     45 -> {46};
     46 -> {47};
+    47 -> {48};
+    48 -> {49};
+    49 -> {50};
+    50 -> {52};
+    51 -> {53};
+    52 -> {53};
+    52 -> {44} [color=green style=dashed];
+    53 -> {54};
+    54 -> {55};
+    55 -> {56};
+    56 -> {57};
+    57 -> {58};
+    58 -> {59};
 
 }

compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot

@@ -90,167 +90,216 @@ digraph delegateWithAnonymousObject_kt {
         subgraph cluster_10 {
             color=blue
             26 [label="Enter property" style="filled" fillcolor=red];
-            27 [label="Postponed enter to lambda"];
             subgraph cluster_11 {
                 color=blue
-                28 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                27 [label="Function call arguments enter"];
+                28 [label="Postponed enter to lambda"];
                 subgraph cluster_12 {
                     color=blue
-                    29 [label="Enter block"];
-                    30 [label="Enter anonymous object"];
+                    29 [label="Enter function <anonymous>" style="filled" fillcolor=red];
                     subgraph cluster_13 {
                         color=blue
-                        31 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
+                        30 [label="Enter block"];
+                        31 [label="Enter anonymous object"];
                         subgraph cluster_14 {
                             color=blue
-                            32 [label="Enter function <init>" style="filled" fillcolor=red];
-                            33 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
-                            34 [label="Exit function <init>" style="filled" fillcolor=red];
+                            32 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
+                            subgraph cluster_15 {
+                                color=blue
+                                33 [label="Enter function <init>" style="filled" fillcolor=red];
+                                34 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
+                                35 [label="Exit function <init>" style="filled" fillcolor=red];
+                            }
+                            36 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
                         }
-                        35 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
+                        37 [label="Exit anonymous object expression"];
+                        38 [label="Exit block"];
                     }
-                    36 [label="Exit anonymous object expression"];
-                    37 [label="Exit block"];
+                    39 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                 }
-                38 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-            }
-            subgraph cluster_15 {
-                color=blue
-                39 [label="Enter function setValue" style="filled" fillcolor=red];
                 subgraph cluster_16 {
                     color=blue
-                    40 [label="Enter block"];
-                    41 [label="Function call: R|/IssueListView.IssueListView|()" style="filled" fillcolor=yellow];
-                    42 [label="Access variable R|<local>/value|"];
-                    43 [label="Function call: R|/IssueListView.IssueListView|().R|/IssueListView.updateFrom|(...)" style="filled" fillcolor=yellow];
-                    44 [label="Jump: ^setValue R|/IssueListView.IssueListView|().R|/IssueListView.updateFrom|(R|<local>/value|)"];
-                    45 [label="Stub" style="filled" fillcolor=gray];
-                    46 [label="Exit block" style="filled" fillcolor=gray];
+                    40 [label="Enter function setValue" style="filled" fillcolor=red];
+                    subgraph cluster_17 {
+                        color=blue
+                        41 [label="Enter block"];
+                        subgraph cluster_18 {
+                            color=blue
+                            42 [label="Function call arguments enter"];
+                            subgraph cluster_19 {
+                                color=blue
+                                43 [label="Function call arguments enter"];
+                                44 [label="Function call arguments exit"];
+                            }
+                            45 [label="Function call: R|/IssueListView.IssueListView|()" style="filled" fillcolor=yellow];
+                            46 [label="Access variable R|<local>/value|"];
+                            47 [label="Function call arguments exit"];
+                        }
+                        48 [label="Function call: R|/IssueListView.IssueListView|().R|/IssueListView.updateFrom|(...)" style="filled" fillcolor=yellow];
+                        49 [label="Jump: ^setValue R|/IssueListView.IssueListView|().R|/IssueListView.updateFrom|(R|<local>/value|)"];
+                        50 [label="Stub" style="filled" fillcolor=gray];
+                        51 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    52 [label="Exit function setValue" style="filled" fillcolor=red];
                 }
-                47 [label="Exit function setValue" style="filled" fillcolor=red];
-            }
-            subgraph cluster_17 {
-                color=blue
-                48 [label="Enter function getValue" style="filled" fillcolor=red];
-                subgraph cluster_18 {
+                subgraph cluster_20 {
                     color=blue
-                    49 [label="Enter block"];
-                    50 [label="Function call: R|/IssueListView.IssueListView|()" style="filled" fillcolor=yellow];
-                    51 [label="Jump: ^getValue R|/IssueListView.IssueListView|()"];
-                    52 [label="Stub" style="filled" fillcolor=gray];
-                    53 [label="Exit block" style="filled" fillcolor=gray];
+                    53 [label="Enter function getValue" style="filled" fillcolor=red];
+                    subgraph cluster_21 {
+                        color=blue
+                        54 [label="Enter block"];
+                        subgraph cluster_22 {
+                            color=blue
+                            55 [label="Function call arguments enter"];
+                            56 [label="Function call arguments exit"];
+                        }
+                        57 [label="Function call: R|/IssueListView.IssueListView|()" style="filled" fillcolor=yellow];
+                        58 [label="Jump: ^getValue R|/IssueListView.IssueListView|()"];
+                        59 [label="Stub" style="filled" fillcolor=gray];
+                        60 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    61 [label="Exit function getValue" style="filled" fillcolor=red];
                 }
-                54 [label="Exit function getValue" style="filled" fillcolor=red];
+                62 [label="Function call arguments exit"];
             }
-            55 [label="Postponed exit from lambda"];
-            56 [label="Function call: this@R|/IssuesListUserProfile|.R|/delegate|<R|IssuesListUserProfile|, R|IssuesListUserProfile|, R|IssueListView|>(...)" style="filled" fillcolor=yellow];
-            57 [label="Function call: this@R|/IssuesListUserProfile|.R|/delegate|<R|IssuesListUserProfile|, R|IssuesListUserProfile|, R|IssueListView|>(...).R?C|special/error|(...)" style="filled" fillcolor=yellow];
-            58 [label="Exit property delegate" style="filled" fillcolor=yellow];
-            59 [label="Exit property" style="filled" fillcolor=red];
+            63 [label="Postponed exit from lambda"];
+            64 [label="Function call: this@R|/IssuesListUserProfile|.R|/delegate|<R|IssuesListUserProfile|, R|IssuesListUserProfile|, R|IssueListView|>(...)" style="filled" fillcolor=yellow];
+            subgraph cluster_23 {
+                color=blue
+                65 [label="Function call arguments enter"];
+                66 [label="Function call arguments exit"];
+            }
+            67 [label="Function call: this@R|/IssuesListUserProfile|.R|/delegate|<R|IssuesListUserProfile|, R|IssuesListUserProfile|, R|IssueListView|>(...).R?C|special/error|(...)" style="filled" fillcolor=yellow];
+            68 [label="Exit property delegate" style="filled" fillcolor=yellow];
+            69 [label="Exit property" style="filled" fillcolor=red];
         }
-        subgraph cluster_19 {
+        subgraph cluster_24 {
             color=blue
-            60 [label="Enter function <init>" style="filled" fillcolor=red];
-            61 [label="Delegated constructor call: super<R|DelegateProvider<IssuesListUserProfile>|>()" style="filled" fillcolor=yellow];
-            62 [label="Exit function <init>" style="filled" fillcolor=red];
+            70 [label="Enter function <init>" style="filled" fillcolor=red];
+            71 [label="Delegated constructor call: super<R|DelegateProvider<IssuesListUserProfile>|>()" style="filled" fillcolor=yellow];
+            72 [label="Exit function <init>" style="filled" fillcolor=red];
         }
-        63 [label="Exit class IssuesListUserProfile" style="filled" fillcolor=red];
+        73 [label="Exit class IssuesListUserProfile" style="filled" fillcolor=red];
     }
     25 -> {26} [color=green];
-    25 -> {63} [style=dotted];
-    25 -> {26 60} [style=dashed];
+    25 -> {73} [style=dotted];
+    25 -> {26 70} [style=dashed];
     26 -> {27};
-    27 -> {28 55 56};
-    27 -> {28} [style=dashed];
-    28 -> {29};
+    27 -> {28};
+    28 -> {29 62 63};
+    28 -> {29} [style=dashed];
     29 -> {30};
     30 -> {31};
-    30 -> {36} [style=dotted];
-    30 -> {31} [style=dashed];
     31 -> {32};
-    31 -> {39 48} [color=red];
-    31 -> {35} [style=dotted];
+    31 -> {37} [style=dotted];
     31 -> {32} [style=dashed];
     32 -> {33};
+    32 -> {40 53} [color=red];
+    32 -> {36} [style=dotted];
+    32 -> {33} [style=dashed];
     33 -> {34};
     34 -> {35};
     35 -> {36};
-    35 -> {39 48} [color=green];
-    35 -> {39 48} [style=dashed];
     36 -> {37};
+    36 -> {40 53} [color=green];
+    36 -> {40 53} [style=dashed];
     37 -> {38};
-    39 -> {40};
+    38 -> {39};
     40 -> {41};
     41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {47};
-    44 -> {45} [style=dotted];
-    45 -> {46} [style=dotted];
-    46 -> {47} [style=dotted];
+    44 -> {45};
+    45 -> {46};
+    46 -> {47};
+    47 -> {48};
     48 -> {49};
-    49 -> {50};
-    50 -> {51};
-    51 -> {54};
+    49 -> {52};
+    49 -> {50} [style=dotted];
+    50 -> {51} [style=dotted];
     51 -> {52} [style=dotted];
-    52 -> {53} [style=dotted];
-    53 -> {54} [style=dotted];
-    55 -> {56} [color=green];
-    55 -> {58} [color=red];
+    53 -> {54};
+    54 -> {55};
+    55 -> {56};
     56 -> {57};
     57 -> {58};
-    58 -> {59};
-    59 -> {60} [color=green];
-    60 -> {61};
-    61 -> {62};
-    62 -> {63} [color=green];
-
-    subgraph cluster_20 {
-        color=red
-        64 [label="Enter function <getter>" style="filled" fillcolor=red];
-        subgraph cluster_21 {
-            color=blue
-            65 [label="Enter block"];
-            66 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
-            67 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|IssueListView|>|(...)" style="filled" fillcolor=yellow];
-            68 [label="Jump: ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|IssueListView|>|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|)"];
-            69 [label="Stub" style="filled" fillcolor=gray];
-            70 [label="Exit block" style="filled" fillcolor=gray];
-        }
-        71 [label="Exit function <getter>" style="filled" fillcolor=red];
-    }
+    58 -> {61};
+    58 -> {59} [style=dotted];
+    59 -> {60} [style=dotted];
+    60 -> {61} [style=dotted];
+    62 -> {64};
+    63 -> {64} [color=green];
+    63 -> {68} [color=red];
     64 -> {65};
     65 -> {66};
     66 -> {67};
     67 -> {68};
-    68 -> {71};
-    68 -> {69} [style=dotted];
-    69 -> {70} [style=dotted];
-    70 -> {71} [style=dotted];
+    68 -> {69};
+    69 -> {70} [color=green];
+    70 -> {71};
+    71 -> {72};
+    72 -> {73} [color=green];
 
-    subgraph cluster_22 {
+    subgraph cluster_25 {
         color=red
-        72 [label="Enter function <setter>" style="filled" fillcolor=red];
-        subgraph cluster_23 {
+        74 [label="Enter function <getter>" style="filled" fillcolor=red];
+        subgraph cluster_26 {
             color=blue
-            73 [label="Enter block"];
-            74 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
-            75 [label="Access variable R|<local>/issueListView|"];
-            76 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(...)" style="filled" fillcolor=yellow];
-            77 [label="Jump: ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|, R|<local>/issueListView|)"];
-            78 [label="Stub" style="filled" fillcolor=gray];
-            79 [label="Exit block" style="filled" fillcolor=gray];
+            75 [label="Enter block"];
+            subgraph cluster_27 {
+                color=blue
+                76 [label="Function call arguments enter"];
+                77 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
+                78 [label="Function call arguments exit"];
+            }
+            79 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|IssueListView|>|(...)" style="filled" fillcolor=yellow];
+            80 [label="Jump: ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|IssueListView|>|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|)"];
+            81 [label="Stub" style="filled" fillcolor=gray];
+            82 [label="Exit block" style="filled" fillcolor=gray];
         }
-        80 [label="Exit function <setter>" style="filled" fillcolor=red];
+        83 [label="Exit function <getter>" style="filled" fillcolor=red];
     }
-    72 -> {73};
-    73 -> {74};
     74 -> {75};
     75 -> {76};
     76 -> {77};
-    77 -> {80};
-    77 -> {78} [style=dotted];
-    78 -> {79} [style=dotted];
-    79 -> {80} [style=dotted];
+    77 -> {78};
+    78 -> {79};
+    79 -> {80};
+    80 -> {83};
+    80 -> {81} [style=dotted];
+    81 -> {82} [style=dotted];
+    82 -> {83} [style=dotted];
+
+    subgraph cluster_28 {
+        color=red
+        84 [label="Enter function <setter>" style="filled" fillcolor=red];
+        subgraph cluster_29 {
+            color=blue
+            85 [label="Enter block"];
+            subgraph cluster_30 {
+                color=blue
+                86 [label="Function call arguments enter"];
+                87 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
+                88 [label="Access variable R|<local>/issueListView|"];
+                89 [label="Function call arguments exit"];
+            }
+            90 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(...)" style="filled" fillcolor=yellow];
+            91 [label="Jump: ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|, R|<local>/issueListView|)"];
+            92 [label="Stub" style="filled" fillcolor=gray];
+            93 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        94 [label="Exit function <setter>" style="filled" fillcolor=red];
+    }
+    84 -> {85};
+    85 -> {86};
+    86 -> {87};
+    87 -> {88};
+    88 -> {89};
+    89 -> {90};
+    90 -> {91};
+    91 -> {94};
+    91 -> {92} [style=dotted];
+    92 -> {93} [style=dotted];
+    93 -> {94} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.dot

@@ -89,73 +89,101 @@ digraph plusAssignWithLambdaInRhs_kt {
         subgraph cluster_9 {
             color=blue
             28 [label="Enter block"];
-            29 [label="Function call: R|kotlin/collections/mutableListOf|<R|() -> kotlin/Unit|>()" style="filled" fillcolor=yellow];
-            30 [label="Variable declaration: lval queue: R|kotlin/collections/MutableList<kotlin/Function0<kotlin/Unit>>|"];
-            31 [label="Postponed enter to lambda"];
             subgraph cluster_10 {
                 color=blue
-                32 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                subgraph cluster_11 {
-                    color=blue
-                    33 [label="Enter block"];
-                    34 [label="Access variable R|<local>/queue|"];
-                    35 [label="Postponed enter to lambda"];
-                    subgraph cluster_12 {
-                        color=blue
-                        36 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                        subgraph cluster_13 {
-                            color=blue
-                            37 [label="Enter block"];
-                            38 [label="Function call: R|<local>/computation|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()" style="filled" fillcolor=yellow];
-                            39 [label="Function call: R|<local>/resolve|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(...)" style="filled" fillcolor=yellow];
-                            40 [label="Exit block"];
-                        }
-                        41 [label="Exit function <anonymous>" style="filled" fillcolor=red];
-                    }
-                    42 [label="Postponed exit from lambda"];
-                    43 [label="Function call: R|<local>/queue|.R|kotlin/collections/plusAssign|<R|() -> kotlin/Unit|>(...)" style="filled" fillcolor=yellow];
-                    44 [label="Exit block"];
-                }
-                45 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                29 [label="Function call arguments enter"];
+                30 [label="Function call arguments exit"];
             }
-            46 [label="Postponed exit from lambda"];
-            47 [label="Function call: R|/A.A|<R|T|>(...)" style="filled" fillcolor=yellow];
-            48 [label="Jump: ^postpone R|/A.A|<R|T|>(<L> = A@fun <anonymous>(resolve: R|(T) -> kotlin/Unit|): R|kotlin/Unit| <inline=NoInline>  {
+            31 [label="Function call: R|kotlin/collections/mutableListOf|<R|() -> kotlin/Unit|>()" style="filled" fillcolor=yellow];
+            32 [label="Variable declaration: lval queue: R|kotlin/collections/MutableList<kotlin/Function0<kotlin/Unit>>|"];
+            subgraph cluster_11 {
+                color=blue
+                33 [label="Function call arguments enter"];
+                34 [label="Postponed enter to lambda"];
+                subgraph cluster_12 {
+                    color=blue
+                    35 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                    subgraph cluster_13 {
+                        color=blue
+                        36 [label="Enter block"];
+                        37 [label="Access variable R|<local>/queue|"];
+                        38 [label="Postponed enter to lambda"];
+                        subgraph cluster_14 {
+                            color=blue
+                            39 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                            subgraph cluster_15 {
+                                color=blue
+                                40 [label="Enter block"];
+                                subgraph cluster_16 {
+                                    color=blue
+                                    41 [label="Function call arguments enter"];
+                                    subgraph cluster_17 {
+                                        color=blue
+                                        42 [label="Function call arguments enter"];
+                                        43 [label="Function call arguments exit"];
+                                    }
+                                    44 [label="Function call: R|<local>/computation|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()" style="filled" fillcolor=yellow];
+                                    45 [label="Function call arguments exit"];
+                                }
+                                46 [label="Function call: R|<local>/resolve|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(...)" style="filled" fillcolor=yellow];
+                                47 [label="Exit block"];
+                            }
+                            48 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                        }
+                        49 [label="Postponed exit from lambda"];
+                        50 [label="Function call: R|<local>/queue|.R|kotlin/collections/plusAssign|<R|() -> kotlin/Unit|>(...)" style="filled" fillcolor=yellow];
+                        51 [label="Exit block"];
+                    }
+                    52 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                }
+                53 [label="Function call arguments exit"];
+            }
+            54 [label="Postponed exit from lambda"];
+            55 [label="Function call: R|/A.A|<R|T|>(...)" style="filled" fillcolor=yellow];
+            56 [label="Jump: ^postpone R|/A.A|<R|T|>(<L> = A@fun <anonymous>(resolve: R|(T) -> kotlin/Unit|): R|kotlin/Unit| <inline=NoInline>  {
     R|<local>/queue|.R|kotlin/collections/plusAssign|<R|() -> kotlin/Unit|>(fun <anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
         R|<local>/resolve|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/computation|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
     }
     )
 }
 )"];
-            49 [label="Stub" style="filled" fillcolor=gray];
-            50 [label="Exit block" style="filled" fillcolor=gray];
+            57 [label="Stub" style="filled" fillcolor=gray];
+            58 [label="Exit block" style="filled" fillcolor=gray];
         }
-        51 [label="Exit function postpone" style="filled" fillcolor=red];
+        59 [label="Exit function postpone" style="filled" fillcolor=red];
     }
     27 -> {28};
     28 -> {29};
     29 -> {30};
     30 -> {31};
-    31 -> {32 46 47};
-    31 -> {32} [style=dashed];
+    31 -> {32};
     32 -> {33};
     33 -> {34};
-    34 -> {35};
-    35 -> {36 42 43};
-    35 -> {36} [style=dashed];
+    34 -> {35 53 54};
+    34 -> {35} [style=dashed];
+    35 -> {36};
     36 -> {37};
     37 -> {38};
-    38 -> {39};
+    38 -> {39 49 50};
+    38 -> {39} [style=dashed];
     39 -> {40};
     40 -> {41};
+    41 -> {42};
     42 -> {43};
     43 -> {44};
     44 -> {45};
+    45 -> {46};
     46 -> {47};
     47 -> {48};
-    48 -> {51};
-    48 -> {49} [style=dotted];
-    49 -> {50} [style=dotted];
-    50 -> {51} [style=dotted];
+    49 -> {50};
+    50 -> {51};
+    51 -> {52};
+    53 -> {55};
+    54 -> {55};
+    55 -> {56};
+    56 -> {59};
+    56 -> {57} [style=dotted];
+    57 -> {58} [style=dotted];
+    58 -> {59} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.dot

@@ -60,38 +60,43 @@ digraph tryWithLambdaInside_kt {
                     subgraph cluster_9 {
                         color=blue
                         17 [label="Enter block"];
-                        18 [label="Access variable R|<local>/list|"];
-                        19 [label="Postponed enter to lambda"];
                         subgraph cluster_10 {
                             color=blue
-                            20 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                            18 [label="Function call arguments enter"];
+                            19 [label="Access variable R|<local>/list|"];
+                            20 [label="Postponed enter to lambda"];
                             subgraph cluster_11 {
                                 color=blue
-                                21 [label="Enter block"];
-                                22 [label="Access variable R|<local>/it|"];
-                                23 [label="Exit block"];
+                                21 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                                subgraph cluster_12 {
+                                    color=blue
+                                    22 [label="Enter block"];
+                                    23 [label="Access variable R|<local>/it|"];
+                                    24 [label="Exit block"];
+                                }
+                                25 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                             }
-                            24 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                            26 [label="Function call arguments exit"];
                         }
-                        25 [label="Postponed exit from lambda"];
-                        26 [label="Function call: R|<local>/list|.R|kotlin/collections/filter|<R|kotlin/Boolean|>(...)" style="filled" fillcolor=yellow];
-                        27 [label="Exit block"];
+                        27 [label="Postponed exit from lambda"];
+                        28 [label="Function call: R|<local>/list|.R|kotlin/collections/filter|<R|kotlin/Boolean|>(...)" style="filled" fillcolor=yellow];
+                        29 [label="Exit block"];
                     }
-                    28 [label="Try main block exit"];
+                    30 [label="Try main block exit"];
                 }
-                subgraph cluster_12 {
+                subgraph cluster_13 {
                     color=blue
-                    29 [label="Enter finally"];
-                    subgraph cluster_13 {
+                    31 [label="Enter finally"];
+                    subgraph cluster_14 {
                         color=blue
-                        30 [label="Enter block"];
-                        31 [label="Exit block"];
+                        32 [label="Enter block"];
+                        33 [label="Exit block"];
                     }
-                    32 [label="Exit finally"];
+                    34 [label="Exit finally"];
                 }
-                33 [label="Try expression exit"];
+                35 [label="Try expression exit"];
             }
-            34 [label="Jump: ^testInPlace try {
+            36 [label="Jump: ^testInPlace try {
     R|<local>/list|.R|kotlin/collections/filter|<R|kotlin/Boolean|>(<L> = filter@fun <anonymous>(it: R|kotlin/Boolean|): R|kotlin/Boolean| <inline=Inline, kind=UNKNOWN>  {
         ^ R|<local>/it|
     }
@@ -100,88 +105,95 @@ digraph tryWithLambdaInside_kt {
 finally {
 }
 "];
-            35 [label="Stub" style="filled" fillcolor=gray];
-            36 [label="Exit block" style="filled" fillcolor=gray];
+            37 [label="Stub" style="filled" fillcolor=gray];
+            38 [label="Exit block" style="filled" fillcolor=gray];
         }
-        37 [label="Exit function testInPlace" style="filled" fillcolor=red];
+        39 [label="Exit function testInPlace" style="filled" fillcolor=red];
     }
     13 -> {14};
     14 -> {15};
     15 -> {16};
-    15 -> {29} [label="onUncaughtException"];
+    15 -> {31} [label="onUncaughtException"];
     16 -> {17};
     17 -> {18};
     18 -> {19};
-    19 -> {20 25 26};
-    19 -> {20} [style=dashed];
-    20 -> {21};
+    19 -> {20};
+    20 -> {21 26 27};
+    20 -> {21} [style=dashed];
     21 -> {22};
     22 -> {23};
     23 -> {24};
     24 -> {25};
-    25 -> {19} [color=green style=dashed];
-    25 -> {26} [color=green];
-    25 -> {33} [color=red];
-    26 -> {27};
-    27 -> {28};
+    25 -> {27};
+    26 -> {28};
+    27 -> {20} [color=green style=dashed];
+    27 -> {28} [color=green];
+    27 -> {35} [color=red];
     28 -> {29};
     29 -> {30};
     30 -> {31};
     31 -> {32};
     32 -> {33};
     33 -> {34};
-    34 -> {37};
-    34 -> {35} [style=dotted];
-    35 -> {36} [style=dotted];
+    34 -> {35};
+    35 -> {36};
+    36 -> {39};
     36 -> {37} [style=dotted];
+    37 -> {38} [style=dotted];
+    38 -> {39} [style=dotted];
 
-    subgraph cluster_14 {
+    subgraph cluster_15 {
         color=red
-        38 [label="Enter function testNotInPlace" style="filled" fillcolor=red];
-        subgraph cluster_15 {
+        40 [label="Enter function testNotInPlace" style="filled" fillcolor=red];
+        subgraph cluster_16 {
             color=blue
-            39 [label="Enter block"];
-            subgraph cluster_16 {
+            41 [label="Enter block"];
+            subgraph cluster_17 {
                 color=blue
-                40 [label="Try expression enter"];
-                subgraph cluster_17 {
+                42 [label="Try expression enter"];
+                subgraph cluster_18 {
                     color=blue
-                    41 [label="Try main block enter"];
-                    subgraph cluster_18 {
+                    43 [label="Try main block enter"];
+                    subgraph cluster_19 {
                         color=blue
-                        42 [label="Enter block"];
-                        43 [label="Access variable R|<local>/list|"];
-                        44 [label="Postponed enter to lambda"];
-                        subgraph cluster_19 {
+                        44 [label="Enter block"];
+                        subgraph cluster_20 {
                             color=blue
-                            45 [label="Enter function <anonymous>" style="filled" fillcolor=red];
-                            subgraph cluster_20 {
+                            45 [label="Function call arguments enter"];
+                            46 [label="Access variable R|<local>/list|"];
+                            47 [label="Postponed enter to lambda"];
+                            subgraph cluster_21 {
                                 color=blue
-                                46 [label="Enter block"];
-                                47 [label="Access variable R|<local>/it|"];
-                                48 [label="Exit block"];
+                                48 [label="Enter function <anonymous>" style="filled" fillcolor=red];
+                                subgraph cluster_22 {
+                                    color=blue
+                                    49 [label="Enter block"];
+                                    50 [label="Access variable R|<local>/it|"];
+                                    51 [label="Exit block"];
+                                }
+                                52 [label="Exit function <anonymous>" style="filled" fillcolor=red];
                             }
-                            49 [label="Exit function <anonymous>" style="filled" fillcolor=red];
+                            53 [label="Function call arguments exit"];
                         }
-                        50 [label="Postponed exit from lambda"];
-                        51 [label="Function call: R|<local>/list|.R|/notInPlaceFilter|<R|kotlin/Boolean|>(...)" style="filled" fillcolor=yellow];
-                        52 [label="Exit block"];
-                    }
-                    53 [label="Try main block exit"];
-                }
-                subgraph cluster_21 {
-                    color=blue
-                    54 [label="Enter finally"];
-                    subgraph cluster_22 {
-                        color=blue
-                        55 [label="Enter block"];
+                        54 [label="Postponed exit from lambda"];
+                        55 [label="Function call: R|<local>/list|.R|/notInPlaceFilter|<R|kotlin/Boolean|>(...)" style="filled" fillcolor=yellow];
                         56 [label="Exit block"];
                     }
-                    57 [label="Exit finally"];
+                    57 [label="Try main block exit"];
                 }
-                58 [label="Try expression exit"];
+                subgraph cluster_23 {
+                    color=blue
+                    58 [label="Enter finally"];
+                    subgraph cluster_24 {
+                        color=blue
+                        59 [label="Enter block"];
+                        60 [label="Exit block"];
+                    }
+                    61 [label="Exit finally"];
+                }
+                62 [label="Try expression exit"];
             }
-            59 [label="Jump: ^testNotInPlace try {
+            63 [label="Jump: ^testNotInPlace try {
     R|<local>/list|.R|/notInPlaceFilter|<R|kotlin/Boolean|>(<L> = notInPlaceFilter@fun <anonymous>(it: R|kotlin/Boolean|): R|kotlin/Boolean| <inline=NoInline>  {
         ^ R|<local>/it|
     }
@@ -190,37 +202,39 @@ finally {
 finally {
 }
 "];
-            60 [label="Stub" style="filled" fillcolor=gray];
-            61 [label="Exit block" style="filled" fillcolor=gray];
+            64 [label="Stub" style="filled" fillcolor=gray];
+            65 [label="Exit block" style="filled" fillcolor=gray];
         }
-        62 [label="Exit function testNotInPlace" style="filled" fillcolor=red];
+        66 [label="Exit function testNotInPlace" style="filled" fillcolor=red];
     }
-    38 -> {39};
-    39 -> {40};
     40 -> {41};
-    40 -> {54} [label="onUncaughtException"];
     41 -> {42};
     42 -> {43};
+    42 -> {58} [label="onUncaughtException"];
     43 -> {44};
-    44 -> {45 50 51};
-    44 -> {45} [style=dashed];
+    44 -> {45};
     45 -> {46};
     46 -> {47};
-    47 -> {48};
+    47 -> {48 53 54};
+    47 -> {48} [style=dashed];
     48 -> {49};
-    50 -> {51} [color=green];
-    50 -> {58} [color=red];
+    49 -> {50};
+    50 -> {51};
     51 -> {52};
-    52 -> {53};
-    53 -> {54};
-    54 -> {55};
+    53 -> {55};
+    54 -> {55} [color=green];
+    54 -> {62} [color=red];
     55 -> {56};
     56 -> {57};
     57 -> {58};
     58 -> {59};
-    59 -> {62};
-    59 -> {60} [style=dotted];
-    60 -> {61} [style=dotted];
-    61 -> {62} [style=dotted];
+    59 -> {60};
+    60 -> {61};
+    61 -> {62};
+    62 -> {63};
+    63 -> {66};
+    63 -> {64} [style=dotted];
+    64 -> {65} [style=dotted];
+    65 -> {66} [style=dotted];
 
 }

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

@@ -43098,6 +43098,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
                 runTest("compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachUnsafe.kt");
             }
 
+            @Test
+            @TestMetadata("invokeRecieverUnsafe.kt")
+            public void testInvokeRecieverUnsafe() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/smartcasts/invokeRecieverUnsafe.kt");
+            }
+
             @Test
             @TestMetadata("kt10463.kt")
             public void testKt10463() throws Exception {

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

@@ -43218,6 +43218,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
                 runTest("compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachUnsafe.kt");
             }
 
+            @Test
+            @TestMetadata("invokeRecieverUnsafe.kt")
+            public void testInvokeRecieverUnsafe() throws Exception {
+                runTest("compiler/testData/diagnostics/testsWithStdLib/smartcasts/invokeRecieverUnsafe.kt");
+            }
+
             @Test
             @TestMetadata("kt10463.kt")
             public void testKt10463() throws Exception {

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

@@ -51249,6 +51249,18 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
             runTest("compiler/testData/codegen/box/smartCasts/implicitToGrandSon.kt");
         }
 
+        @Test
+        @TestMetadata("invokeRecieverSmartcastK1.kt")
+        public void testInvokeRecieverSmartcastK1() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/invokeRecieverSmartcastK1.kt");
+        }
+
+        @Test
+        @TestMetadata("invokeRecieverSmartcastK2.kt")
+        public void testInvokeRecieverSmartcastK2() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/invokeRecieverSmartcastK2.kt");
+        }
+
         @Test
         @TestMetadata("kt17725.kt")
         public void testKt17725() throws Exception {

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

@@ -51249,6 +51249,18 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated
             runTest("compiler/testData/codegen/box/smartCasts/implicitToGrandSon.kt");
         }
 
+        @Test
+        @TestMetadata("invokeRecieverSmartcastK1.kt")
+        public void testInvokeRecieverSmartcastK1() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/invokeRecieverSmartcastK1.kt");
+        }
+
+        @Test
+        @TestMetadata("invokeRecieverSmartcastK2.kt")
+        public void testInvokeRecieverSmartcastK2() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/invokeRecieverSmartcastK2.kt");
+        }
+
         @Test
         @TestMetadata("kt17725.kt")
         public void testKt17725() throws Exception {

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

@@ -51249,6 +51249,18 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
             runTest("compiler/testData/codegen/box/smartCasts/implicitToGrandSon.kt");
         }
 
+        @Test
+        @TestMetadata("invokeRecieverSmartcastK1.kt")
+        public void testInvokeRecieverSmartcastK1() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/invokeRecieverSmartcastK1.kt");
+        }
+
+        @Test
+        @TestMetadata("invokeRecieverSmartcastK2.kt")
+        public void testInvokeRecieverSmartcastK2() throws Exception {
+            runTest("compiler/testData/codegen/box/smartCasts/invokeRecieverSmartcastK2.kt");
+        }
+
         @Test
         @TestMetadata("kt17725.kt")
         public void testKt17725() throws Exception {

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

@@ -366,8 +366,9 @@ private fun BodyResolveComponents.typeFromSymbol(symbol: FirBasedSymbol<*>): Fir
 
 fun BodyResolveComponents.transformQualifiedAccessUsingSmartcastInfo(
     qualifiedAccessExpression: FirQualifiedAccessExpression,
+    ignoreCallArguments: Boolean,
 ): FirExpression {
-    val (stability, typesFromSmartCast) = dataFlowAnalyzer.getTypeUsingSmartcastInfo(qualifiedAccessExpression)
+    val (stability, typesFromSmartCast) = dataFlowAnalyzer.getTypeUsingSmartcastInfo(qualifiedAccessExpression, ignoreCallArguments)
         ?: return qualifiedAccessExpression
 
     return transformExpressionUsingSmartcastInfo(qualifiedAccessExpression, stability, typesFromSmartCast) ?: qualifiedAccessExpression
@@ -376,7 +377,7 @@ fun BodyResolveComponents.transformQualifiedAccessUsingSmartcastInfo(
 fun BodyResolveComponents.transformWhenSubjectExpressionUsingSmartcastInfo(
     whenSubjectExpression: FirWhenSubjectExpression,
 ): FirExpression {
-    val (stability, typesFromSmartCast) = dataFlowAnalyzer.getTypeUsingSmartcastInfo(whenSubjectExpression)
+    val (stability, typesFromSmartCast) = dataFlowAnalyzer.getTypeUsingSmartcastInfo(whenSubjectExpression, ignoreCallArguments = false)
         ?: return whenSubjectExpression
 
     return transformExpressionUsingSmartcastInfo(whenSubjectExpression, stability, typesFromSmartCast) ?: whenSubjectExpression
@@ -385,8 +386,9 @@ fun BodyResolveComponents.transformWhenSubjectExpressionUsingSmartcastInfo(
 fun BodyResolveComponents.transformDesugaredAssignmentValueUsingSmartcastInfo(
     expression: FirDesugaredAssignmentValueReferenceExpression,
 ): FirExpression {
-    val (stability, typesFromSmartCast) = dataFlowAnalyzer.getTypeUsingSmartcastInfo(expression.expressionRef.value)
-        ?: return expression
+    val (stability, typesFromSmartCast) =
+        dataFlowAnalyzer.getTypeUsingSmartcastInfo(expression.expressionRef.value, ignoreCallArguments = false)
+            ?: return expression
 
     return transformExpressionUsingSmartcastInfo(expression, stability, typesFromSmartCast) ?: expression
 }

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

@@ -326,7 +326,7 @@ private fun BodyResolveComponents.createExplicitReceiverForInvokeByCallable(
     }.build().let {
         callCompleter.completeCall(it, ResolutionMode.ReceiverResolution)
     }.let {
-        transformQualifiedAccessUsingSmartcastInfo(it)
+        transformQualifiedAccessUsingSmartcastInfo(it, ignoreCallArguments = true)
     }
 }
 

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

@@ -129,8 +129,18 @@ abstract class FirDataFlowAnalyzer(
     fun isAccessToUnstableLocalVariable(expression: FirExpression): Boolean =
         context.variableAssignmentAnalyzer.isAccessToUnstableLocalVariable(expression)
 
-    open fun getTypeUsingSmartcastInfo(expression: FirExpression): Pair<PropertyStability, MutableList<ConeKotlinType>>? {
-        val flow = graphBuilder.lastNode.flow
+    /**
+     * @param ignoreCallArguments Should be set to `true` when call argument flow should not be used for smart-casting. This is important
+     * because the receiver of implicit `invoke` calls is visited *after* the call arguments due to tower resolution.
+     */
+    open fun getTypeUsingSmartcastInfo(
+        expression: FirExpression,
+        ignoreCallArguments: Boolean,
+    ): Pair<PropertyStability, MutableList<ConeKotlinType>>? {
+        // TODO(KT-64094): Consider moving logic to tower resolution instead.
+        val node = graphBuilder.lastNode
+            .let { if (ignoreCallArguments && it is FunctionCallArgumentsExitNode) it.enterNode else it }
+        val flow = node.flow
         val variable = variableStorage.getRealVariableWithoutUnwrappingAlias(flow, expression) ?: return null
         val types = flow.getTypeStatement(variable)?.exactType?.ifEmpty { null } ?: return null
         return variable.stability to types.toMutableList()
@@ -871,14 +881,27 @@ abstract class FirDataFlowAnalyzer(
     }
 
     fun enterCallArguments(call: FirStatement, arguments: List<FirExpression>) {
+        graphBuilder.enterCall()
+
         val lambdas = arguments.mapNotNull { it.unwrapAnonymousFunctionExpression() }
         context.variableAssignmentAnalyzer.enterFunctionCall(lambdas)
-        graphBuilder.enterCall()
-        graphBuilder.enterCallArguments(call, lambdas)
+        graphBuilder.enterCallArguments(call, lambdas)?.mergeIncomingFlow()
     }
 
     fun exitCallArguments() {
-        graphBuilder.exitCallArguments()?.mergeIncomingFlow()
+        val (splitNode, exitNode) = graphBuilder.exitCallArguments()
+        splitNode?.mergeIncomingFlow()
+
+        if (exitNode != null) {
+            exitNode.mergeIncomingFlow()
+
+            // Reset implicit receivers back to their state *before* call arguments as tower resolve will use receiver types to lookup
+            // functions after call arguments have been processed.
+            // TODO(KT-64094): Consider moving logic to tower resolution instead.
+            val flow = exitNode.enterNode.flow
+            updateAllReceivers(currentReceiverState, flow)
+            currentReceiverState = flow
+        }
     }
 
     fun exitFunctionCall(functionCall: FirFunctionCall, callCompleted: Boolean) {

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt

@@ -77,6 +77,7 @@ class ControlFlowGraphBuilder {
     private val finallyBlocksInProgress: Stack<FinallyBlockEnterNode> = stackOf()
     private val finallyBlocksInProgressSet = mutableSetOf<FirElement>()
 
+    private val exitFunctionCallArgumentsNodes: Stack<FunctionCallArgumentsExitNode?> = stackOf()
     private val exitSafeCallNodes: Stack<ExitSafeCallNode> = stackOf()
     private val exitElvisExpressionNodes: Stack<ElvisExitNode> = stackOf()
     private val elvisRhsEnterNodes: Stack<ElvisRhsEnterNode> = stackOf()
@@ -1172,18 +1173,33 @@ class ControlFlowGraphBuilder {
         splitDataFlowForPostponedLambdas()
     }
 
-    fun enterCallArguments(fir: FirStatement, anonymousFunctions: List<FirAnonymousFunction>) {
+    fun enterCallArguments(call: FirStatement, anonymousFunctions: List<FirAnonymousFunction>): FunctionCallArgumentsEnterNode? {
         if (anonymousFunctions.isEmpty()) {
             argumentListSplitNodes.push(null)
         } else {
-            val splitNode = createSplitPostponedLambdasNode(fir, anonymousFunctions)
+            val splitNode = createSplitPostponedLambdasNode(call, anonymousFunctions)
             anonymousFunctions.associateTo(postponedAnonymousFunctionNodes) { it.symbol to (splitNode to null) }
             argumentListSplitNodes.push(splitNode)
         }
+
+        if (call is FirFunctionCall) {
+            val enterNode = createFunctionCallArgumentsEnterNode(call)
+            val exitNode = createFunctionCallArgumentsExitNode(call, enterNode)
+
+            exitFunctionCallArgumentsNodes.push(exitNode)
+            addNewSimpleNode(enterNode)
+
+            return enterNode
+        } else {
+            exitFunctionCallArgumentsNodes.push(null)
+            return null
+        }
     }
 
-    fun exitCallArguments(): SplitPostponedLambdasNode? {
-        return argumentListSplitNodes.pop()?.also { addNewSimpleNode(it) }
+    fun exitCallArguments(): Pair<SplitPostponedLambdasNode?, FunctionCallArgumentsExitNode?> {
+        val splitNode = argumentListSplitNodes.pop()?.also { addNewSimpleNode(it) }
+        val exitNode = exitFunctionCallArgumentsNodes.pop()?.also { addNewSimpleNode(it) }
+        return splitNode to exitNode
     }
 
     fun exitFunctionCall(functionCall: FirFunctionCall, callCompleted: Boolean): FunctionCallNode {

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphNodeBuilder.kt

@@ -118,6 +118,15 @@ fun ControlFlowGraphBuilder.createLoopBlockEnterNode(fir: FirLoop): LoopBlockEnt
 fun ControlFlowGraphBuilder.createLoopBlockExitNode(fir: FirLoop): LoopBlockExitNode =
     LoopBlockExitNode(currentGraph, fir, levelCounter)
 
+fun ControlFlowGraphBuilder.createFunctionCallArgumentsEnterNode(fir: FirFunctionCall): FunctionCallArgumentsEnterNode =
+    FunctionCallArgumentsEnterNode(currentGraph, fir, levelCounter)
+
+fun ControlFlowGraphBuilder.createFunctionCallArgumentsExitNode(
+    fir: FirFunctionCall,
+    enterNode: FunctionCallArgumentsEnterNode,
+): FunctionCallArgumentsExitNode =
+    FunctionCallArgumentsExitNode(currentGraph, fir, enterNode, levelCounter)
+
 fun ControlFlowGraphBuilder.createFunctionCallNode(fir: FirFunctionCall): FunctionCallNode =
     FunctionCallNode(currentGraph, fir, levelCounter)
 
@@ -202,7 +211,10 @@ fun ControlFlowGraphBuilder.createEnterSafeCallNode(fir: FirSafeCallExpression):
 fun ControlFlowGraphBuilder.createPostponedLambdaExitNode(fir: FirAnonymousFunctionExpression): PostponedLambdaExitNode =
     PostponedLambdaExitNode(currentGraph, fir, levelCounter)
 
-fun ControlFlowGraphBuilder.createSplitPostponedLambdasNode(fir: FirStatement, lambdas: List<FirAnonymousFunction>): SplitPostponedLambdasNode =
+fun ControlFlowGraphBuilder.createSplitPostponedLambdasNode(
+    fir: FirStatement,
+    lambdas: List<FirAnonymousFunction>,
+): SplitPostponedLambdasNode =
     SplitPostponedLambdasNode(currentGraph, fir, lambdas, levelCounter)
 
 fun ControlFlowGraphBuilder.createMergePostponedLambdaExitsNode(fir: FirElement): MergePostponedLambdaExitsNode =

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt

@@ -178,7 +178,7 @@ open class FirExpressionsResolveTransformer(transformer: FirAbstractBodyResolveT
             when (result) {
                 is FirQualifiedAccessExpression -> {
                     dataFlowAnalyzer.exitQualifiedAccessExpression(result)
-                    result = components.transformQualifiedAccessUsingSmartcastInfo(result)
+                    result = components.transformQualifiedAccessUsingSmartcastInfo(result, ignoreCallArguments = false)
                     if (result is FirSmartCastExpression) {
                         dataFlowAnalyzer.exitSmartCastExpression(result)
                     }

compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNode.kt

@@ -703,6 +703,24 @@ class ResolvedQualifierNode(
     }
 }
 
+class FunctionCallArgumentsEnterNode(owner: ControlFlowGraph, override val fir: FirFunctionCall, level: Int) :
+    CFGNode<FirFunctionCall>(owner, level), EnterNodeMarker {
+    override fun <R, D> accept(visitor: ControlFlowGraphVisitor<R, D>, data: D): R {
+        return visitor.visitFunctionCallArgumentsEnterNode(this, data)
+    }
+}
+
+class FunctionCallArgumentsExitNode(
+    owner: ControlFlowGraph,
+    override val fir: FirFunctionCall,
+    val enterNode: FunctionCallArgumentsEnterNode,
+    level: Int,
+) : CFGNode<FirFunctionCall>(owner, level), ExitNodeMarker {
+    override fun <R, D> accept(visitor: ControlFlowGraphVisitor<R, D>, data: D): R {
+        return visitor.visitFunctionCallArgumentsExitNode(this, data)
+    }
+}
+
 class FunctionCallNode(owner: ControlFlowGraph, override val fir: FirFunctionCall, level: Int)
     : CFGNode<FirFunctionCall>(owner, level) {
     override val isUnion: Boolean

compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt

@@ -57,6 +57,8 @@ fun CFGNode<*>.render(): String =
                     }"
 
                 is VariableAssignmentNode -> "Assignment: ${fir.calleeReference?.let(CfgRenderer::renderElementAsString)}"
+                is FunctionCallArgumentsEnterNode -> "Function call arguments enter"
+                is FunctionCallArgumentsExitNode -> "Function call arguments exit"
                 is FunctionCallNode -> "Function call: ${CfgRenderer.renderElementAsString(fir)}"
                 is DelegatedConstructorCallNode -> "Delegated constructor call: ${CfgRenderer.renderElementAsString(fir)}"
                 is StringConcatenationCallNode -> "String concatenation call: ${CfgRenderer.renderElementAsString(fir)}"

compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphVisitor.kt

@@ -319,6 +319,14 @@ abstract class ControlFlowGraphVisitor<out R, in D> {
         return visitNode(node, data)
     }
 
+    open fun visitFunctionCallArgumentsEnterNode(node: FunctionCallArgumentsEnterNode, data: D): R {
+        return visitNode(node, data)
+    }
+
+    open fun visitFunctionCallArgumentsExitNode(node: FunctionCallArgumentsExitNode, data: D): R {
+        return visitNode(node, data)
+    }
+
     open fun visitFunctionCallNode(node: FunctionCallNode, data: D): R {
         return visitNode(node, data)
     }

compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphVisitorVoid.kt

@@ -239,6 +239,14 @@ abstract class ControlFlowGraphVisitorVoid : ControlFlowGraphVisitor<Unit, Nothi
         visitNode(node)
     }
 
+    open fun visitFunctionCallArgumentsEnterNode(node: FunctionCallArgumentsEnterNode) {
+        visitNode(node)
+    }
+
+    open fun visitFunctionCallArgumentsExitNode(node: FunctionCallArgumentsExitNode) {
+        visitNode(node)
+    }
+
     open fun visitFunctionCallNode(node: FunctionCallNode) {
         visitNode(node)
     }
@@ -512,6 +520,14 @@ abstract class ControlFlowGraphVisitorVoid : ControlFlowGraphVisitor<Unit, Nothi
         visitResolvedQualifierNode(node)
     }
 
+    final override fun visitFunctionCallArgumentsEnterNode(node: FunctionCallArgumentsEnterNode, data: Nothing?) {
+        visitFunctionCallArgumentsEnterNode(node)
+    }
+
+    final override fun visitFunctionCallArgumentsExitNode(node: FunctionCallArgumentsExitNode, data: Nothing?) {
+        visitFunctionCallArgumentsExitNode(node)
+    }
+
     final override fun visitFunctionCallNode(node: FunctionCallNode, data: Nothing?) {
         visitFunctionCallNode(node)
     }

compiler/testData/codegen/box/smartCasts/invokeRecieverSmartcastK1.kt

@@ -0,0 +1,82 @@
+// IGNORE_BACKEND_K2: ANY
+// ISSUE: KT-63709
+
+operator fun String.invoke(unused: String): String = "String.invoke(String)"
+operator fun String.invoke(unused: Any): String = "String.invoke(Any)"
+operator fun Any.invoke(unused: String): String = "Any.invoke(String)"
+
+fun box(): String {
+    var result = ""
+    implicitArgumentCast().let { if (it != "OK") result += "FAIL: implicitArgumentCast(): $it\n" }
+    explicitArgumentCast().let { if (it != "OK") result += "FAIL: explicitArgumentCast(): $it\n" }
+    implicitReceiverCast().let { if (it != "OK") result += "FAIL: implicitReceiverCast(): $it\n" }
+    explicitReceiverCast().let { if (it != "OK") result += "FAIL: explicitReceiverCast(): $it\n" }
+    implicitInvokeExplicitRecieverArgumentCast().let { if (it != "OK") result += "FAIL: implicitInvokeExplicitRecieverArgumentCast(): $it\n" }
+    explicitInvokeImplicitRecieverArgumentCast().let { if (it != "OK") result += "FAIL: explicitInvokeImplicitRecieverArgumentCast(): $it\n" }
+    explicitInvokeExplicitRecieverArgumentCast().let { if (it != "OK") result += "FAIL: explicitInvokeExplicitRecieverArgumentCast(): $it\n" }
+
+    return if (result.length == 0) "OK" else result
+}
+
+fun implicitArgumentCast(): String {
+    val a: Any = ""
+    return when (val result = a(a as String)) {
+        "Any.invoke(String)" -> "OK"
+        else -> result
+    }
+}
+
+fun explicitArgumentCast(): String {
+    val a: Any = ""
+    return when (val result = a.invoke(a as String)) {
+        "Any.invoke(String)" -> "OK"
+        else -> result
+    }
+}
+
+fun implicitReceiverCast(): String {
+    val a: Any = ""
+    return when (val result = (a as String)(a)) {
+        "String.invoke(Any)" -> "OK" // Unique to K1
+        else -> result
+    }
+}
+
+
+fun explicitReceiverCast(): String {
+    val a: Any = ""
+    return when (val result = (a as String).invoke(a)) {
+        "String.invoke(String)" -> "OK"
+        else -> result
+    }
+}
+
+fun implicitInvokeExplicitRecieverArgumentCast(): String {
+    val a: Any = ""
+    with (a) {
+        return when (val result = this(this as String)) {
+            "Any.invoke(String)" -> "OK"
+            else -> result
+        }
+    }
+}
+
+fun explicitInvokeImplicitRecieverArgumentCast(): String {
+    val a: Any = ""
+    with (a) {
+        return when (val result = invoke(this as String)) {
+            "Any.invoke(String)" -> "OK"
+            else -> result
+        }
+    }
+}
+
+fun explicitInvokeExplicitRecieverArgumentCast(): String {
+    val a: Any = ""
+    with (a) {
+        return when (val result = this.invoke(this as String)) {
+            "Any.invoke(String)" -> "OK"
+            else -> result
+        }
+    }
+}

compiler/testData/codegen/box/smartCasts/invokeRecieverSmartcastK2.kt

@@ -0,0 +1,82 @@
+// IGNORE_BACKEND_K1: ANY
+// ISSUE: KT-63709
+
+operator fun String.invoke(unused: String): String = "String.invoke(String)"
+operator fun String.invoke(unused: Any): String = "String.invoke(Any)"
+operator fun Any.invoke(unused: String): String = "Any.invoke(String)"
+
+fun box(): String {
+    var result = ""
+    implicitArgumentCast().let { if (it != "OK") result += "FAIL: implicitArgumentCast(): $it\n" }
+    explicitArgumentCast().let { if (it != "OK") result += "FAIL: explicitArgumentCast(): $it\n" }
+    implicitReceiverCast().let { if (it != "OK") result += "FAIL: implicitReceiverCast(): $it\n" }
+    explicitReceiverCast().let { if (it != "OK") result += "FAIL: explicitReceiverCast(): $it\n" }
+    implicitInvokeExplicitRecieverArgumentCast().let { if (it != "OK") result += "FAIL: implicitInvokeExplicitRecieverArgumentCast(): $it\n" }
+    explicitInvokeImplicitRecieverArgumentCast().let { if (it != "OK") result += "FAIL: explicitInvokeImplicitRecieverArgumentCast(): $it\n" }
+    explicitInvokeExplicitRecieverArgumentCast().let { if (it != "OK") result += "FAIL: explicitInvokeExplicitRecieverArgumentCast(): $it\n" }
+
+    return if (result.length == 0) "OK" else result
+}
+
+fun implicitArgumentCast(): String {
+    val a: Any = ""
+    return when (val result = a(a as String)) {
+        "Any.invoke(String)" -> "OK"
+        else -> result
+    }
+}
+
+fun explicitArgumentCast(): String {
+    val a: Any = ""
+    return when (val result = a.invoke(a as String)) {
+        "Any.invoke(String)" -> "OK"
+        else -> result
+    }
+}
+
+fun implicitReceiverCast(): String {
+    val a: Any = ""
+    return when (val result = (a as String)(a)) {
+        "String.invoke(String)" -> "OK" // Unique to K2
+        else -> result
+    }
+}
+
+
+fun explicitReceiverCast(): String {
+    val a: Any = ""
+    return when (val result = (a as String).invoke(a)) {
+        "String.invoke(String)" -> "OK"
+        else -> result
+    }
+}
+
+fun implicitInvokeExplicitRecieverArgumentCast(): String {
+    val a: Any = ""
+    with (a) {
+        return when (val result = this(this as String)) {
+            "Any.invoke(String)" -> "OK"
+            else -> result
+        }
+    }
+}
+
+fun explicitInvokeImplicitRecieverArgumentCast(): String {
+    val a: Any = ""
+    with (a) {
+        return when (val result = invoke(this as String)) {
+            "Any.invoke(String)" -> "OK"
+            else -> result
+        }
+    }
+}
+
+fun explicitInvokeExplicitRecieverArgumentCast(): String {
+    val a: Any = ""
+    with (a) {
+        return when (val result = this.invoke(this as String)) {
+            "Any.invoke(String)" -> "OK"
+            else -> result
+        }
+    }
+}