[FIR] Add CFG nodes, add multiple subGraphs for CFGOwner

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

@@ -23,17 +23,12 @@ digraph annotatedLocalClass_kt {
         color=red
         5 [label="Enter function foo" style="filled" fillcolor=red];
         subgraph cluster_3 {
-            color=blue
-            23 [label="Enter class Local" style="filled" fillcolor=red];
-            24 [label="Exit class Local" style="filled" fillcolor=red];
-        }
-        subgraph cluster_4 {
             color=blue
             6 [label="Enter block"];
-            subgraph cluster_5 {
+            subgraph cluster_4 {
                 color=blue
                 7 [label="Enter when"];
-                subgraph cluster_6 {
+                subgraph cluster_5 {
                     color=blue
                     8 [label="Enter when branch condition "];
                     9 [label="Access variable R|<local>/b|"];
@@ -41,7 +36,7 @@ digraph annotatedLocalClass_kt {
                 }
                 11 [label="Synthetic else branch"];
                 12 [label="Enter when branch result"];
-                subgraph cluster_7 {
+                subgraph cluster_6 {
                     color=blue
                     13 [label="Enter block"];
                     14 [label="Jump: ^foo Unit"];
@@ -55,6 +50,11 @@ digraph annotatedLocalClass_kt {
             20 [label="Function call: R|/bar|()"];
             21 [label="Exit block"];
         }
+        subgraph cluster_7 {
+            color=blue
+            23 [label="Enter class Local" style="filled" fillcolor=red];
+            24 [label="Exit class Local" style="filled" fillcolor=red];
+        }
         22 [label="Exit function foo" style="filled" fillcolor=red];
     }
     5 -> {6};
@@ -74,6 +74,8 @@ digraph annotatedLocalClass_kt {
     18 -> {19};
     18 -> {25} [color=red];
     19 -> {20};
+    19 -> {25 23} [color=green];
+    19 -> {25 23} [style=dashed];
     20 -> {21};
     21 -> {22};
     23 -> {24} [color=green];

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

@@ -67,11 +67,14 @@ digraph defaultArguments_kt {
     9 -> {10};
     10 -> {11};
     12 -> {13};
+    12 -> {12} [style=dashed];
     13 -> {14};
     14 -> {15};
     16 -> {17};
+    16 -> {16} [style=dashed];
     17 -> {22};
     17 -> {19} [color=red];
+    17 -> {22} [style=dashed];
     18 -> {20} [color=red];
     19 -> {20} [color=green];
     20 -> {21};

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

@@ -139,6 +139,7 @@ digraph flowFromInplaceLambda_kt {
     36 -> {37};
     37 -> {45};
     37 -> {39} [color=red];
+    37 -> {45} [style=dashed];
     38 -> {40} [color=red];
     39 -> {40} [color=green];
     40 -> {41};
@@ -215,6 +216,7 @@ digraph flowFromInplaceLambda_kt {
     52 -> {53};
     53 -> {74};
     53 -> {54} [color=red];
+    53 -> {74} [style=dashed];
     54 -> {55};
     55 -> {56};
     56 -> {57};
@@ -223,6 +225,7 @@ digraph flowFromInplaceLambda_kt {
     59 -> {60};
     60 -> {82};
     60 -> {61} [color=red];
+    60 -> {82} [style=dashed];
     61 -> {62};
     62 -> {63};
     63 -> {64};
@@ -317,11 +320,13 @@ digraph flowFromInplaceLambda_kt {
     92 -> {93};
     93 -> {111};
     93 -> {94} [color=red];
+    93 -> {111} [style=dashed];
     94 -> {95};
     95 -> {96};
     96 -> {97};
     97 -> {120};
     97 -> {98} [color=red];
+    97 -> {120} [style=dashed];
     98 -> {99};
     99 -> {100};
     100 -> {101};
@@ -416,12 +421,14 @@ digraph flowFromInplaceLambda_kt {
     131 -> {132};
     132 -> {133};
     133 -> {134 152};
+    133 -> {152} [style=dashed];
     134 -> {135};
     135 -> {136};
     136 -> {137};
     137 -> {138};
     138 -> {139};
     139 -> {140 160};
+    139 -> {160} [style=dashed];
     140 -> {141};
     141 -> {142};
     142 -> {143};
@@ -496,10 +503,12 @@ digraph flowFromInplaceLambda_kt {
     170 -> {171};
     171 -> {184};
     171 -> {172} [color=red];
+    171 -> {184} [style=dashed];
     172 -> {173};
     173 -> {174};
     174 -> {189};
     174 -> {175} [color=red];
+    174 -> {189} [style=dashed];
     175 -> {176};
     176 -> {177};
     177 -> {178};
@@ -563,6 +572,7 @@ digraph flowFromInplaceLambda_kt {
     194 -> {195};
     195 -> {196};
     196 -> {197 203};
+    196 -> {203} [style=dashed];
     197 -> {198};
     198 -> {199};
     199 -> {200};
@@ -572,6 +582,7 @@ digraph flowFromInplaceLambda_kt {
     204 -> {205};
     205 -> {210};
     205 -> {206} [color=red];
+    205 -> {210} [style=dashed];
     206 -> {207};
     207 -> {208};
     208 -> {209};

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

@@ -8,78 +8,92 @@ digraph initBlock_kt {
         0 [label="Enter class Foo" style="filled" fillcolor=red];
         subgraph cluster_1 {
             color=blue
-            2 [label="Enter init block" style="filled" fillcolor=red];
-            subgraph cluster_2 {
-                color=blue
-                3 [label="Enter block"];
-                4 [label="Const: Int(1)"];
-                5 [label="Variable declaration: lval x: R|kotlin/Int|"];
-                6 [label="Exit block"];
-            }
-            7 [label="Exit init block" style="filled" fillcolor=red];
+            1 [label="Part of class initialization"];
+            2 [label="Exit class Foo" style="filled" fillcolor=red];
         }
-        1 [label="Exit class Foo" style="filled" fillcolor=red];
-    }
-    0 -> {2} [color=green];
-    2 -> {3};
-    3 -> {4};
-    4 -> {5};
-    5 -> {6};
-    6 -> {7};
-    7 -> {1} [color=green];
+        0 -> {1} [color=green];
+        1 -> {2} [style=dotted];
+        1 -> {6} [color=green];
+        1 -> {6} [style=dashed];
 
-    subgraph cluster_3 {
-        color=red
-        8 [label="Enter function <init>" style="filled" fillcolor=red];
-        9 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        10 [label="Exit function <init>" style="filled" fillcolor=red];
-    }
-    8 -> {9};
-    9 -> {10};
+        subgraph cluster_2 {
+            color=red
+            3 [label="Enter function <init>" style="filled" fillcolor=red];
+            4 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+            5 [label="Exit function <init>" style="filled" fillcolor=red];
+        }
+        3 -> {4};
+        4 -> {5};
+
+        subgraph cluster_3 {
+            color=red
+            6 [label="Enter init block" style="filled" fillcolor=red];
+            subgraph cluster_4 {
+                color=blue
+                7 [label="Enter block"];
+                8 [label="Const: Int(1)"];
+                9 [label="Variable declaration: lval x: R|kotlin/Int|"];
+                10 [label="Exit block"];
+            }
+            11 [label="Exit init block" style="filled" fillcolor=red];
+        }
+        6 -> {7};
+        7 -> {8};
+        8 -> {9};
+        9 -> {10};
+        10 -> {11};
+        11 -> {2} [color=green];
 
-    subgraph cluster_4 {
-        color=red
-        11 [label="Enter class Bar" style="filled" fillcolor=red];
         subgraph cluster_5 {
-            color=blue
-            13 [label="Enter init block" style="filled" fillcolor=red];
+            color=red
+            12 [label="Enter class Bar" style="filled" fillcolor=red];
             subgraph cluster_6 {
                 color=blue
-                14 [label="Enter block"];
-                15 [label="Const: Int(1)"];
-                16 [label="Variable declaration: lval x: R|kotlin/Int|"];
-                17 [label="Function call: R|java/lang/Exception.Exception|()"];
-                18 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                19 [label="Stub" style="filled" fillcolor=gray];
-                20 [label="Const: Int(2)" style="filled" fillcolor=gray];
-                21 [label="Variable declaration: lval y: R|kotlin/Int|" style="filled" fillcolor=gray];
-                22 [label="Exit block" style="filled" fillcolor=gray];
+                13 [label="Part of class initialization"];
+                14 [label="Exit class Bar" style="filled" fillcolor=red];
             }
-            23 [label="Exit init block" style="filled" fillcolor=red];
+            12 -> {13} [color=green];
+            13 -> {14} [style=dotted];
+            13 -> {18} [color=green];
+            13 -> {18} [style=dashed];
+
+            subgraph cluster_7 {
+                color=red
+                15 [label="Enter function <init>" style="filled" fillcolor=red];
+                16 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+                17 [label="Exit function <init>" style="filled" fillcolor=red];
+            }
+            15 -> {16};
+            16 -> {17};
+
+            subgraph cluster_8 {
+                color=red
+                18 [label="Enter init block" style="filled" fillcolor=red];
+                subgraph cluster_9 {
+                    color=blue
+                    19 [label="Enter block"];
+                    20 [label="Const: Int(1)"];
+                    21 [label="Variable declaration: lval x: R|kotlin/Int|"];
+                    22 [label="Function call: R|java/lang/Exception.Exception|()"];
+                    23 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                    24 [label="Stub" style="filled" fillcolor=gray];
+                    25 [label="Const: Int(2)" style="filled" fillcolor=gray];
+                    26 [label="Variable declaration: lval y: R|kotlin/Int|" style="filled" fillcolor=gray];
+                    27 [label="Exit block" style="filled" fillcolor=gray];
+                }
+                28 [label="Exit init block" style="filled" fillcolor=red];
+            }
+            18 -> {19};
+            19 -> {20};
+            20 -> {21};
+            21 -> {22};
+            22 -> {23};
+            23 -> {28};
+            23 -> {24} [style=dotted];
+            24 -> {25} [style=dotted];
+            25 -> {26} [style=dotted];
+            26 -> {27} [style=dotted];
+            27 -> {28} [style=dotted];
+            28 -> {14} [color=green];
+
         }
-        12 [label="Exit class Bar" style="filled" fillcolor=red];
-    }
-    11 -> {13} [color=green];
-    13 -> {14};
-    14 -> {15};
-    15 -> {16};
-    16 -> {17};
-    17 -> {18};
-    18 -> {23};
-    18 -> {19} [style=dotted];
-    19 -> {20} [style=dotted];
-    20 -> {21} [style=dotted];
-    21 -> {22} [style=dotted];
-    22 -> {23} [style=dotted];
-    23 -> {12} [color=green];
-
-    subgraph cluster_7 {
-        color=red
-        24 [label="Enter function <init>" style="filled" fillcolor=red];
-        25 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        26 [label="Exit function <init>" style="filled" fillcolor=red];
-    }
-    24 -> {25};
-    25 -> {26};
-
-}

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

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

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

@@ -52,17 +52,19 @@ digraph innerClassInAnonymousObject_kt {
     subgraph cluster_6 {
         color=red
         16 [label="Enter property" style="filled" fillcolor=red];
-        subgraph cluster_7 {
-            color=blue
-            12 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
-            13 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
-        }
         17 [label="Exit anonymous object"];
         18 [label="Exit property" style="filled" fillcolor=red];
     }
+    subgraph cluster_7 {
+        color=blue
+        12 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
+        13 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
+    }
     16 -> {17};
     16 -> {0 5 8} [color=red];
     17 -> {18};
+    17 -> {0 12} [color=green];
+    17 -> {0 12} [style=dashed];
     12 -> {13} [color=green];
 
 }

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

@@ -99,6 +99,7 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
     22 -> {23};
     23 -> {32};
     23 -> {24} [color=red];
+    23 -> {32} [style=dashed];
     24 -> {25};
     25 -> {26};
     26 -> {27};
@@ -171,6 +172,7 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
     41 -> {42};
     42 -> {57};
     42 -> {43} [color=red];
+    42 -> {57} [style=dashed];
     43 -> {44};
     44 -> {45};
     45 -> {46};
@@ -222,6 +224,7 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
     63 -> {64};
     64 -> {72};
     64 -> {65} [color=red];
+    64 -> {72} [style=dashed];
     65 -> {66};
     66 -> {67};
     67 -> {68};

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

@@ -397,6 +397,7 @@ digraph jumps_kt {
     125 -> {126};
     126 -> {131};
     126 -> {127} [color=red];
+    126 -> {131} [style=dashed];
     127 -> {128};
     128 -> {129};
     129 -> {130};

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

@@ -54,6 +54,7 @@ digraph lambdaAsReturnOfLambda_kt {
     }
     16 -> {17};
     17 -> {18 0};
+    17 -> {0} [style=dashed];
     18 -> {19};
     19 -> {20};
     20 -> {21};
@@ -61,6 +62,7 @@ digraph lambdaAsReturnOfLambda_kt {
     0 -> {1};
     1 -> {2};
     2 -> {3 8};
+    2 -> {8} [style=dashed];
     3 -> {4};
     4 -> {7};
     4 -> {5} [style=dotted];

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

@@ -98,6 +98,7 @@ digraph lambdaReturningObject_kt {
     21 -> {22};
     22 -> {23};
     23 -> {24 29};
+    23 -> {29} [style=dashed];
     24 -> {25};
     25 -> {26};
     26 -> {27};

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

@@ -76,6 +76,7 @@ digraph lambdas_kt {
     14 -> {15};
     15 -> {23};
     15 -> {16} [color=red];
+    15 -> {23} [style=dashed];
     16 -> {17};
     17 -> {18};
     18 -> {19};
@@ -146,6 +147,7 @@ digraph lambdas_kt {
     37 -> {38};
     38 -> {39};
     39 -> {40 47};
+    39 -> {47} [style=dashed];
     40 -> {41};
     41 -> {42};
     42 -> {43};
@@ -216,6 +218,7 @@ digraph lambdas_kt {
     62 -> {63};
     63 -> {70};
     63 -> {64} [color=red];
+    63 -> {70} [style=dashed];
     64 -> {65};
     65 -> {66};
     66 -> {69};
@@ -267,6 +270,7 @@ digraph lambdas_kt {
     78 -> {79};
     79 -> {86};
     79 -> {80} [color=red];
+    79 -> {86} [style=dashed];
     80 -> {81};
     81 -> {82};
     82 -> {85};

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

@@ -28,22 +28,12 @@ digraph localClassesWithImplicit_kt {
         color=red
         7 [label="Enter function test" style="filled" fillcolor=red];
         subgraph cluster_3 {
-            color=blue
-            29 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
-            30 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
-        }
-        subgraph cluster_4 {
-            color=blue
-            27 [label="Enter class A" style="filled" fillcolor=red];
-            28 [label="Exit class A" style="filled" fillcolor=red];
-        }
-        subgraph cluster_5 {
             color=blue
             8 [label="Enter block"];
-            subgraph cluster_6 {
+            subgraph cluster_4 {
                 color=blue
                 9 [label="Enter when"];
-                subgraph cluster_7 {
+                subgraph cluster_5 {
                     color=blue
                     10 [label="Enter when branch condition "];
                     11 [label="Access variable R|<local>/a|"];
@@ -52,7 +42,7 @@ digraph localClassesWithImplicit_kt {
                 }
                 14 [label="Synthetic else branch"];
                 15 [label="Enter when branch result"];
-                subgraph cluster_8 {
+                subgraph cluster_6 {
                     color=blue
                     16 [label="Enter block"];
                     17 [label="Jump: ^test Unit"];
@@ -67,6 +57,16 @@ digraph localClassesWithImplicit_kt {
             24 [label="Variable declaration: lval x: R|<anonymous>|"];
             25 [label="Exit block"];
         }
+        subgraph cluster_7 {
+            color=blue
+            29 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
+            30 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
+        }
+        subgraph cluster_8 {
+            color=blue
+            27 [label="Enter class A" style="filled" fillcolor=red];
+            28 [label="Exit class A" style="filled" fillcolor=red];
+        }
         26 [label="Exit function test" style="filled" fillcolor=red];
     }
     7 -> {8};
@@ -88,7 +88,11 @@ digraph localClassesWithImplicit_kt {
     21 -> {31 34 69 87} [color=red];
     22 -> {23};
     22 -> {94 97 132 150} [color=red];
+    22 -> {31 34 69 87 27} [color=green];
+    22 -> {31 34 69 87 27} [style=dashed];
     23 -> {24};
+    23 -> {94 97 132 150 29} [color=green];
+    23 -> {94 97 132 150 29} [style=dashed];
     24 -> {25};
     25 -> {26};
     27 -> {28} [color=green];
@@ -182,6 +186,7 @@ digraph localClassesWithImplicit_kt {
     35 -> {36};
     36 -> {43};
     36 -> {37} [color=red];
+    36 -> {43} [style=dashed];
     37 -> {38};
     38 -> {39};
     39 -> {42};
@@ -255,6 +260,7 @@ digraph localClassesWithImplicit_kt {
     70 -> {71};
     71 -> {78};
     71 -> {72} [color=red];
+    71 -> {78} [style=dashed];
     72 -> {73};
     73 -> {74};
     74 -> {77};
@@ -381,6 +387,7 @@ digraph localClassesWithImplicit_kt {
     98 -> {99};
     99 -> {106};
     99 -> {100} [color=red];
+    99 -> {106} [style=dashed];
     100 -> {101};
     101 -> {102};
     102 -> {105};
@@ -454,6 +461,7 @@ digraph localClassesWithImplicit_kt {
     133 -> {134};
     134 -> {141};
     134 -> {135} [color=red];
+    134 -> {141} [style=dashed];
     135 -> {136};
     136 -> {137};
     137 -> {140};

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

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

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

@@ -48,6 +48,7 @@ digraph postponedLambdas_kt {
     6 -> {7};
     7 -> {13};
     7 -> {8} [color=red];
+    7 -> {13} [style=dashed];
     8 -> {9};
     9 -> {10};
     10 -> {11};

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

@@ -85,106 +85,136 @@ digraph propertiesAndInitBlocks_kt {
 
     subgraph cluster_9 {
         color=red
-        44 [label="Enter function foo" style="filled" fillcolor=red];
+        37 [label="Enter function foo" style="filled" fillcolor=red];
         subgraph cluster_10 {
             color=blue
-            45 [label="Enter block"];
-            46 [label="Const: Int(1)"];
-            47 [label="Const: Int(1)"];
-            48 [label="Function call: Int(1).R|kotlin/Int.plus|(...)"];
-            49 [label="Variable declaration: lval c: R|kotlin/Int|"];
-            50 [label="Function call: R|java/lang/Exception.Exception|()"];
-            51 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-            52 [label="Stub" style="filled" fillcolor=gray];
-            53 [label="Exit block" style="filled" fillcolor=gray];
+            38 [label="Enter block"];
+            39 [label="Const: Int(1)"];
+            40 [label="Const: Int(1)"];
+            41 [label="Function call: Int(1).R|kotlin/Int.plus|(...)"];
+            42 [label="Variable declaration: lval c: R|kotlin/Int|"];
+            43 [label="Function call: R|java/lang/Exception.Exception|()"];
+            44 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+            45 [label="Stub" style="filled" fillcolor=gray];
+            46 [label="Exit block" style="filled" fillcolor=gray];
         }
-        54 [label="Exit function foo" style="filled" fillcolor=red];
+        47 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    44 -> {45};
-    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];
+    37 -> {38};
+    38 -> {39};
+    39 -> {40};
+    40 -> {41};
+    41 -> {42};
+    42 -> {43};
+    43 -> {44};
+    44 -> {47};
+    44 -> {45} [style=dotted];
+    45 -> {46} [style=dotted];
+    46 -> {47} [style=dotted];
 
     subgraph cluster_11 {
         color=red
-        55 [label="Enter function <init>" style="filled" fillcolor=red];
-        56 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        57 [label="Exit function <init>" style="filled" fillcolor=red];
+        48 [label="Enter function <init>" style="filled" fillcolor=red];
+        49 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        50 [label="Exit function <init>" style="filled" fillcolor=red];
     }
-    55 -> {56};
-    56 -> {57};
+    48 -> {49};
+    49 -> {50};
 
     subgraph cluster_12 {
         color=red
-        58 [label="Enter function getter" style="filled" fillcolor=red];
+        51 [label="Enter init block" style="filled" fillcolor=red];
         subgraph cluster_13 {
             color=blue
-            63 [label="Enter class GetterLocalClass" style="filled" fillcolor=red];
-            subgraph cluster_14 {
-                color=blue
-                59 [label="Enter block"];
-                60 [label="Exit local class <getter>"];
-                61 [label="Exit block"];
-            }
-            62 [label="Exit function getter" style="filled" fillcolor=red];
+            52 [label="Enter block"];
+            53 [label="Function call: R|java/lang/Exception.Exception|()"];
+            54 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+            55 [label="Stub" style="filled" fillcolor=gray];
+            56 [label="Const: Int(1)" style="filled" fillcolor=gray];
+            57 [label="Exit block" style="filled" fillcolor=gray];
         }
+        58 [label="Exit init block" style="filled" fillcolor=red];
+    }
+    51 -> {52};
+    52 -> {53};
+    53 -> {54};
+    54 -> {58};
+    54 -> {55} [style=dotted];
+    55 -> {56} [style=dotted];
+    56 -> {57} [style=dotted];
+    57 -> {58} [style=dotted];
+    58 -> {36} [color=green];
+
+    subgraph cluster_14 {
+        color=red
+        59 [label="Enter function getter" style="filled" fillcolor=red];
         subgraph cluster_15 {
             color=blue
-            65 [label="Enter init block" style="filled" fillcolor=red];
-            subgraph cluster_16 {
-                color=blue
-                66 [label="Enter block"];
-                67 [label="Function call: R|java/lang/Exception.Exception|()"];
-                68 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                69 [label="Stub" style="filled" fillcolor=gray];
-                70 [label="Exit block" style="filled" fillcolor=gray];
-            }
-            71 [label="Exit init block" style="filled" fillcolor=red];
+            60 [label="Enter block"];
+            61 [label="Exit local class <getter>"];
+            62 [label="Exit block"];
         }
-        64 [label="Exit class GetterLocalClass" style="filled" fillcolor=red];
+        63 [label="Exit function getter" style="filled" fillcolor=red];
     }
-    58 -> {59};
-    59 -> {60};
-    59 -> {72 65} [color=red];
-    60 -> {61};
-    61 -> {62};
-    63 -> {65} [color=green];
-    65 -> {66};
-    66 -> {67};
-    67 -> {68};
-    68 -> {71};
-    68 -> {69} [style=dotted];
-    69 -> {70} [style=dotted];
-    70 -> {71} [style=dotted];
-    71 -> {64} [color=green];
-
-    subgraph cluster_17 {
-        color=red
-        72 [label="Enter function <init>" style="filled" fillcolor=red];
-        73 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        74 [label="Exit function <init>" style="filled" fillcolor=red];
-    }
-    72 -> {73};
-    73 -> {74};
-
-    subgraph cluster_18 {
-        color=red
-        75 [label="Enter property" style="filled" fillcolor=red];
-        subgraph cluster_19 {
+    subgraph cluster_16 {
+        color=blue
+        64 [label="Enter class GetterLocalClass" style="filled" fillcolor=red];
+        subgraph cluster_17 {
             color=blue
-            34 [label="Enter class InitializerLocalClass" style="filled" fillcolor=red];
-            76 [label="Postponed enter to lambda"];
+            65 [label="Part of class initialization"];
+            66 [label="Exit class GetterLocalClass" style="filled" fillcolor=red];
+        }
+        59 -> {60};
+        60 -> {61};
+        60 -> {67 70} [color=red];
+        61 -> {62};
+        61 -> {67 64} [color=green];
+        61 -> {67 64} [style=dashed];
+        62 -> {63};
+        64 -> {65} [color=green];
+        65 -> {66} [style=dotted];
+        65 -> {70} [color=green];
+        65 -> {70} [style=dashed];
+
+        subgraph cluster_18 {
+            color=red
+            67 [label="Enter function <init>" style="filled" fillcolor=red];
+            68 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+            69 [label="Exit function <init>" style="filled" fillcolor=red];
+        }
+        67 -> {68};
+        68 -> {69};
+
+        subgraph cluster_19 {
+            color=red
+            70 [label="Enter init block" style="filled" fillcolor=red];
             subgraph cluster_20 {
+                color=blue
+                71 [label="Enter block"];
+                72 [label="Function call: R|java/lang/Exception.Exception|()"];
+                73 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                74 [label="Stub" style="filled" fillcolor=gray];
+                75 [label="Exit block" style="filled" fillcolor=gray];
+            }
+            76 [label="Exit init block" style="filled" fillcolor=red];
+        }
+        70 -> {71};
+        71 -> {72};
+        72 -> {73};
+        73 -> {76};
+        73 -> {74} [style=dotted];
+        74 -> {75} [style=dotted];
+        75 -> {76} [style=dotted];
+        76 -> {66} [color=green];
+
+        subgraph cluster_21 {
+            color=red
+            77 [label="Enter property" style="filled" fillcolor=red];
+            78 [label="Postponed enter to lambda"];
+            subgraph cluster_22 {
                 color=blue
                 26 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                subgraph cluster_21 {
+                subgraph cluster_23 {
                     color=blue
                     27 [label="Enter block"];
                     28 [label="Exit local class <anonymous>"];
@@ -193,122 +223,111 @@ digraph propertiesAndInitBlocks_kt {
                     31 [label="Stub" style="filled" fillcolor=gray];
                     32 [label="Exit block" style="filled" fillcolor=gray];
                 }
-                subgraph cluster_22 {
+                subgraph cluster_24 {
                     color=blue
-                    36 [label="Enter init block" style="filled" fillcolor=red];
-                    subgraph cluster_23 {
+                    34 [label="Enter class InitializerLocalClass" style="filled" fillcolor=red];
+                    subgraph cluster_25 {
                         color=blue
-                        37 [label="Enter block"];
-                        38 [label="Function call: R|java/lang/Exception.Exception|()"];
-                        39 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                        40 [label="Stub" style="filled" fillcolor=gray];
-                        41 [label="Const: Int(1)" style="filled" fillcolor=gray];
-                        42 [label="Exit block" style="filled" fillcolor=gray];
+                        35 [label="Part of class initialization"];
+                        36 [label="Exit class InitializerLocalClass" style="filled" fillcolor=red];
                     }
-                    43 [label="Exit init block" style="filled" fillcolor=red];
+                    33 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
                 }
-                35 [label="Exit class InitializerLocalClass" style="filled" fillcolor=red];
+                79 [label="Postponed exit from lambda"];
+                80 [label="Function call: R|/run|(...)"];
+                81 [label="Exit property" style="filled" fillcolor=red];
             }
-            33 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-        }
-        77 [label="Postponed exit from lambda"];
-        78 [label="Function call: R|/run|(...)"];
-        79 [label="Exit property" style="filled" fillcolor=red];
-    }
-    75 -> {76};
-    76 -> {26};
-    76 -> {77} [color=red];
-    77 -> {78};
-    78 -> {79};
-    26 -> {33 27};
-    27 -> {28};
-    27 -> {44 55 36} [color=red];
-    28 -> {29};
-    29 -> {30};
-    30 -> {33};
-    30 -> {31} [style=dotted];
-    31 -> {32} [style=dotted];
-    32 -> {33} [style=dotted];
-    33 -> {77} [color=green];
-    33 -> {26} [color=green style=dashed];
-    34 -> {36} [color=green];
-    36 -> {37};
-    37 -> {38};
-    38 -> {39};
-    39 -> {43};
-    39 -> {40} [style=dotted];
-    40 -> {41} [style=dotted];
-    41 -> {42} [style=dotted];
-    42 -> {43} [style=dotted];
-    43 -> {35} [color=green];
+            77 -> {78};
+            78 -> {26};
+            78 -> {79} [color=red];
+            78 -> {26} [style=dashed];
+            79 -> {80};
+            80 -> {81};
+            26 -> {33 27};
+            27 -> {28};
+            27 -> {37 48 51} [color=red];
+            28 -> {29};
+            28 -> {48 34} [color=green];
+            28 -> {48 34} [style=dashed];
+            29 -> {30};
+            30 -> {33};
+            30 -> {31} [style=dotted];
+            31 -> {32} [style=dotted];
+            32 -> {33} [style=dotted];
+            33 -> {79} [color=green];
+            33 -> {26} [color=green style=dashed];
+            34 -> {35} [color=green];
+            35 -> {36} [style=dotted];
+            35 -> {51} [color=green];
+            35 -> {51} [style=dashed];
 
-    subgraph cluster_24 {
-        color=red
-        80 [label="Enter function getter" style="filled" fillcolor=red];
-        81 [label="Exit function getter" style="filled" fillcolor=red];
-    }
-    80 -> {81};
+            subgraph cluster_26 {
+                color=red
+                82 [label="Enter function getter" style="filled" fillcolor=red];
+                83 [label="Exit function getter" style="filled" fillcolor=red];
+            }
+            82 -> {83};
 
-    subgraph cluster_25 {
-        color=red
-        82 [label="Enter property" style="filled" fillcolor=red];
-        subgraph cluster_26 {
-            color=blue
-            83 [label="Try expression enter"];
             subgraph cluster_27 {
-                color=blue
-                84 [label="Try main block enter"];
+                color=red
+                84 [label="Enter property" style="filled" fillcolor=red];
                 subgraph cluster_28 {
                     color=blue
-                    85 [label="Enter block"];
-                    86 [label="Const: Int(1)"];
-                    87 [label="Exit block"];
+                    85 [label="Try expression enter"];
+                    subgraph cluster_29 {
+                        color=blue
+                        86 [label="Try main block enter"];
+                        subgraph cluster_30 {
+                            color=blue
+                            87 [label="Enter block"];
+                            88 [label="Const: Int(1)"];
+                            89 [label="Exit block"];
+                        }
+                        90 [label="Try main block exit"];
+                    }
+                    subgraph cluster_31 {
+                        color=blue
+                        91 [label="Enter finally"];
+                        subgraph cluster_32 {
+                            color=blue
+                            92 [label="Enter block"];
+                            93 [label="Const: Int(0)"];
+                            94 [label="Exit block"];
+                        }
+                        95 [label="Exit finally"];
+                    }
+                    subgraph cluster_33 {
+                        color=blue
+                        96 [label="Catch enter"];
+                        subgraph cluster_34 {
+                            color=blue
+                            97 [label="Enter block"];
+                            98 [label="Const: Int(2)"];
+                            99 [label="Exit block"];
+                        }
+                        100 [label="Catch exit"];
+                    }
+                    101 [label="Try expression exit"];
                 }
-                88 [label="Try main block exit"];
+                102 [label="Exit property" style="filled" fillcolor=red];
             }
-            subgraph cluster_29 {
-                color=blue
-                89 [label="Enter finally"];
-                subgraph cluster_30 {
-                    color=blue
-                    90 [label="Enter block"];
-                    91 [label="Const: Int(0)"];
-                    92 [label="Exit block"];
-                }
-                93 [label="Exit finally"];
-            }
-            subgraph cluster_31 {
-                color=blue
-                94 [label="Catch enter"];
-                subgraph cluster_32 {
-                    color=blue
-                    95 [label="Enter block"];
-                    96 [label="Const: Int(2)"];
-                    97 [label="Exit block"];
-                }
-                98 [label="Catch exit"];
-            }
-            99 [label="Try expression exit"];
-        }
-        100 [label="Exit property" style="filled" fillcolor=red];
-    }
-    82 -> {83};
-    83 -> {84};
-    84 -> {100 94 89 85};
-    85 -> {86};
-    86 -> {87};
-    87 -> {88};
-    88 -> {99};
-    89 -> {90};
-    90 -> {91};
-    91 -> {92};
-    92 -> {93};
-    93 -> {99};
-    94 -> {100 95};
-    95 -> {96};
-    96 -> {97};
-    97 -> {98};
-    98 -> {99};
-    99 -> {100};
+            84 -> {85};
+            85 -> {86};
+            86 -> {102 96 91 87};
+            87 -> {88};
+            88 -> {89};
+            89 -> {90};
+            90 -> {101};
+            91 -> {92};
+            92 -> {93};
+            93 -> {94};
+            94 -> {95};
+            95 -> {101};
+            96 -> {102 97};
+            97 -> {98};
+            98 -> {99};
+            99 -> {100};
+            100 -> {101};
+            101 -> {102};
 
-}
+        }

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

@@ -94,6 +94,7 @@ digraph returnValuesFromLambda_kt {
     13 -> {14};
     14 -> {21};
     14 -> {16} [color=red];
+    14 -> {21} [style=dashed];
     15 -> {17} [color=red];
     16 -> {17} [color=green];
     17 -> {18};
@@ -152,6 +153,7 @@ digraph returnValuesFromLambda_kt {
     40 -> {41};
     41 -> {48};
     41 -> {43} [color=red];
+    41 -> {48} [style=dashed];
     42 -> {44} [color=red];
     43 -> {44} [color=green];
     44 -> {45};
@@ -199,6 +201,7 @@ digraph returnValuesFromLambda_kt {
     56 -> {57};
     57 -> {65};
     57 -> {59} [color=red];
+    57 -> {65} [style=dashed];
     58 -> {60} [style=dotted];
     59 -> {60} [style=dotted];
     60 -> {64 61} [style=dotted];