Test: FIR CFA: sort edges by style & target node id

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

@@ -86,7 +86,7 @@ digraph initializationInTry_kt {
     12 -> {13};
     13 -> {14};
     14 -> {15};
-    14 -> {24}    [label=onUncaughtException];
+    14 -> {24} [label="onUncaughtException"];
     15 -> {16};
     16 -> {17};
     17 -> {18};
@@ -101,7 +101,7 @@ digraph initializationInTry_kt {
     26 -> {27};
     27 -> {28};
     28 -> {29};
-    28 -> {33}    [label=onUncaughtException];
+    28 -> {33} [label="onUncaughtException"];
     29 -> {30};
     30 -> {31};
     31 -> {32};
@@ -154,7 +154,7 @@ digraph initializationInTry_kt {
     35 -> {36};
     36 -> {37};
     37 -> {38};
-    37 -> {46}    [label=onUncaughtException];
+    37 -> {46} [label="onUncaughtException"];
     38 -> {39};
     39 -> {40};
     40 -> {41};
@@ -168,7 +168,7 @@ digraph initializationInTry_kt {
     48 -> {49};
     49 -> {50};
     50 -> {51};
-    50 -> {55}    [label=onUncaughtException];
+    50 -> {55} [label="onUncaughtException"];
     51 -> {52};
     52 -> {53};
     53 -> {54};

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

@@ -62,7 +62,7 @@ digraph annotatedLocalClass_kt {
     7 -> {8};
     8 -> {9};
     9 -> {10};
-    10 -> {12 11};
+    10 -> {11 12};
     11 -> {18};
     12 -> {13};
     13 -> {14};
@@ -74,8 +74,8 @@ digraph annotatedLocalClass_kt {
     18 -> {19};
     18 -> {25} [color=red];
     19 -> {20};
-    19 -> {25 23} [color=green];
-    19 -> {25 23} [style=dashed];
+    19 -> {23 25} [color=green];
+    19 -> {23 25} [style=dashed];
     20 -> {21};
     21 -> {22};
     23 -> {24} [color=green];

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

@@ -47,11 +47,11 @@ digraph binaryOperations_kt {
     3 -> {4};
     4 -> {5};
     5 -> {6};
-    6 -> {9 7};
+    6 -> {7 9};
     7 -> {8};
     8 -> {9};
     9 -> {10};
-    10 -> {12 11};
+    10 -> {11 12};
     11 -> {17};
     12 -> {13};
     13 -> {14};
@@ -105,11 +105,11 @@ digraph binaryOperations_kt {
     23 -> {24};
     24 -> {25};
     25 -> {26};
-    26 -> {29 27};
+    26 -> {27 29};
     27 -> {28};
     28 -> {29};
     29 -> {30};
-    30 -> {32 31};
+    30 -> {31 32};
     31 -> {37};
     32 -> {33};
     33 -> {34};
@@ -172,15 +172,15 @@ digraph binaryOperations_kt {
     44 -> {45};
     45 -> {46};
     46 -> {47};
-    47 -> {50 48};
+    47 -> {48 50};
     48 -> {49};
     49 -> {50};
     50 -> {51};
-    51 -> {54 52};
+    51 -> {52 54};
     52 -> {53};
     53 -> {54};
     54 -> {55};
-    55 -> {57 56};
+    55 -> {56 57};
     56 -> {62};
     57 -> {58};
     58 -> {59};
@@ -242,16 +242,16 @@ digraph binaryOperations_kt {
     68 -> {69};
     69 -> {70};
     70 -> {71};
-    71 -> {79 72};
+    71 -> {72 79};
     72 -> {73};
     73 -> {74};
     74 -> {75};
-    75 -> {78 76};
+    75 -> {76 78};
     76 -> {77};
     77 -> {78};
     78 -> {79};
     79 -> {80};
-    80 -> {82 81};
+    80 -> {81 82};
     81 -> {87};
     82 -> {83};
     83 -> {84};

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

@@ -47,11 +47,11 @@ digraph booleanOperatorsWithConsts_kt {
     3 -> {4};
     4 -> {5};
     5 -> {6};
-    6 -> {9 7};
+    6 -> {7 9};
     7 -> {8};
     8 -> {9};
     9 -> {10};
-    10 -> {12 11};
+    10 -> {11 12};
     11 -> {17};
     12 -> {13};
     13 -> {14};
@@ -110,7 +110,7 @@ digraph booleanOperatorsWithConsts_kt {
     27 -> {28};
     28 -> {29};
     29 -> {30};
-    30 -> {32 31};
+    30 -> {31 32};
     31 -> {37};
     32 -> {33};
     33 -> {34};
@@ -164,11 +164,11 @@ digraph booleanOperatorsWithConsts_kt {
     43 -> {44};
     44 -> {45};
     45 -> {46};
-    46 -> {49 47};
+    46 -> {47 49};
     47 -> {48};
     48 -> {49};
     49 -> {50};
-    50 -> {52 51};
+    50 -> {51 52};
     51 -> {57};
     52 -> {53};
     53 -> {54};
@@ -227,7 +227,7 @@ digraph booleanOperatorsWithConsts_kt {
     67 -> {68} [style=dotted];
     68 -> {69} [style=dotted];
     69 -> {70};
-    70 -> {72 71};
+    70 -> {71 72};
     71 -> {77};
     72 -> {73};
     73 -> {74};
@@ -281,11 +281,11 @@ digraph booleanOperatorsWithConsts_kt {
     83 -> {84};
     84 -> {85};
     85 -> {86};
-    86 -> {89 87};
+    86 -> {87 89};
     87 -> {88};
     88 -> {89};
     89 -> {90};
-    90 -> {92 91};
+    90 -> {91 92};
     91 -> {97};
     92 -> {93};
     93 -> {94};
@@ -344,7 +344,7 @@ digraph booleanOperatorsWithConsts_kt {
     107 -> {108} [style=dotted];
     108 -> {109} [style=dotted];
     109 -> {110};
-    110 -> {112 111};
+    110 -> {111 112};
     111 -> {117};
     112 -> {113};
     113 -> {114};
@@ -398,11 +398,11 @@ digraph booleanOperatorsWithConsts_kt {
     123 -> {124};
     124 -> {125};
     125 -> {126};
-    126 -> {129 127};
+    126 -> {127 129};
     127 -> {128};
     128 -> {129};
     129 -> {130};
-    130 -> {132 131};
+    130 -> {131 132};
     131 -> {137};
     132 -> {133};
     133 -> {134};
@@ -461,7 +461,7 @@ digraph booleanOperatorsWithConsts_kt {
     147 -> {148};
     148 -> {149};
     149 -> {150};
-    150 -> {152 151};
+    150 -> {151 152};
     151 -> {157};
     152 -> {153};
     153 -> {154};

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

@@ -131,12 +131,12 @@ digraph complex_kt {
     8 -> {9};
     9 -> {10};
     10 -> {11};
-    11 -> {44 12};
+    11 -> {12 44};
     12 -> {13};
     13 -> {14};
     14 -> {15};
     15 -> {16};
-    16 -> {39 17};
+    16 -> {17 39};
     17 -> {18};
     18 -> {19};
     19 -> {20};
@@ -146,9 +146,9 @@ digraph complex_kt {
     23 -> {24};
     24 -> {25};
     25 -> {26};
-    26 -> {36 27};
+    26 -> {27 36};
     27 -> {28};
-    27 -> {52}    [label=onUncaughtException];
+    27 -> {52} [label="onUncaughtException"];
     28 -> {29};
     29 -> {30};
     30 -> {31};
@@ -255,7 +255,7 @@ digraph complex_kt {
     60 -> {61};
     61 -> {62};
     62 -> {63};
-    63 -> {86 64};
+    63 -> {64 86};
     64 -> {65};
     65 -> {66};
     66 -> {67};
@@ -265,7 +265,7 @@ digraph complex_kt {
     70 -> {71};
     71 -> {72};
     72 -> {73};
-    73 -> {75 74};
+    73 -> {74 75};
     74 -> {83};
     75 -> {76};
     76 -> {77};

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

@@ -61,7 +61,7 @@ digraph defaultArguments_kt {
         }
         11 [label="Exit function test" style="filled" fillcolor=red];
     }
-    7 -> {12 16 8};
+    7 -> {8 12 16};
     8 -> {9};
     9 -> {10};
     10 -> {11};
@@ -71,7 +71,7 @@ digraph defaultArguments_kt {
     14 -> {15};
     16 -> {17};
     16 -> {16} [style=dashed];
-    17 -> {21 19};
+    17 -> {19 21};
     17 -> {18} [style=dotted];
     17 -> {21} [style=dashed];
     18 -> {19};

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

@@ -200,10 +200,10 @@ digraph flowFromInplaceLambda_kt {
     91 -> {92};
     92 -> {93};
     93 -> {94};
-    94 -> {99}    [label=onUncaughtException];
+    94 -> {99} [label="onUncaughtException"];
     94 -> {95} [style=dotted];
     95 -> {96} [style=dotted];
-    96 -> {99 97} [style=dotted];
+    96 -> {97 99} [style=dotted];
     97 -> {98} [style=dotted];
     98 -> {99} [style=dotted];
 
@@ -237,7 +237,7 @@ digraph flowFromInplaceLambda_kt {
     }
     100 -> {101};
     101 -> {102};
-    102 -> {110 104};
+    102 -> {104 110};
     102 -> {103} [style=dotted];
     102 -> {110} [style=dashed];
     103 -> {104};
@@ -313,20 +313,20 @@ digraph flowFromInplaceLambda_kt {
     }
     116 -> {117};
     117 -> {118};
-    118 -> {137 120};
+    118 -> {120 137};
     118 -> {119} [style=dotted];
     118 -> {137} [style=dashed];
-    119 -> {121} [color=red];
     119 -> {120} [color=green];
+    119 -> {121} [color=red];
     120 -> {121};
     121 -> {122};
     122 -> {123};
     123 -> {124};
-    124 -> {145 126};
+    124 -> {126 145};
     124 -> {125} [style=dotted];
     124 -> {145} [style=dashed];
-    125 -> {127} [color=red];
     125 -> {126} [color=green];
+    125 -> {127} [color=red];
     126 -> {127};
     127 -> {128};
     128 -> {129};
@@ -417,22 +417,22 @@ digraph flowFromInplaceLambda_kt {
     }
     156 -> {157};
     157 -> {158};
-    158 -> {177 160};
+    158 -> {160 177};
     158 -> {159} [style=dotted];
     158 -> {177} [style=dashed];
-    159 -> {161} [color=red];
-    159 -> {160} [color=green];
     159 -> {158} [color=green style=dashed];
+    159 -> {160} [color=green];
+    159 -> {161} [color=red];
     160 -> {161};
     161 -> {162};
     162 -> {163};
     163 -> {164};
-    164 -> {185 166};
+    164 -> {166 185};
     164 -> {165} [style=dotted];
     164 -> {185} [style=dashed];
-    165 -> {167} [color=red];
-    165 -> {166} [color=green];
     165 -> {164} [color=green style=dashed];
+    165 -> {166} [color=green];
+    165 -> {167} [color=red];
     166 -> {167};
     167 -> {168};
     168 -> {169};
@@ -521,18 +521,18 @@ digraph flowFromInplaceLambda_kt {
     }
     196 -> {197};
     197 -> {198};
-    198 -> {199 216 200};
+    198 -> {199 200 216};
     198 -> {216} [style=dashed];
-    199 -> {201} [color=red];
     199 -> {200} [color=green];
+    199 -> {201} [color=red];
     200 -> {201};
     201 -> {202};
     202 -> {203};
     203 -> {204};
-    204 -> {205 224 206};
+    204 -> {205 206 224};
     204 -> {224} [style=dashed];
-    205 -> {207} [color=red];
     205 -> {206} [color=green];
+    205 -> {207} [color=red];
     206 -> {207};
     207 -> {208};
     208 -> {209};
@@ -619,20 +619,20 @@ digraph flowFromInplaceLambda_kt {
     }
     234 -> {235};
     235 -> {236};
-    236 -> {237 254 238};
+    236 -> {237 238 254};
     236 -> {254} [style=dashed];
-    237 -> {239} [color=red];
-    237 -> {238} [color=green];
     237 -> {236} [color=green style=dashed];
+    237 -> {238} [color=green];
+    237 -> {239} [color=red];
     238 -> {239};
     239 -> {240};
     240 -> {241};
     241 -> {242};
-    242 -> {243 262 244};
+    242 -> {243 244 262};
     242 -> {262} [style=dashed];
-    243 -> {245} [color=red];
-    243 -> {244} [color=green];
     243 -> {242} [color=green style=dashed];
+    243 -> {244} [color=green];
+    243 -> {245} [color=red];
     244 -> {245};
     245 -> {246};
     246 -> {247};
@@ -719,18 +719,18 @@ digraph flowFromInplaceLambda_kt {
     }
     272 -> {273};
     273 -> {274};
-    274 -> {275 292 276};
+    274 -> {275 276 292};
     274 -> {292} [style=dashed];
-    275 -> {277} [color=red];
     275 -> {276} [color=green];
+    275 -> {277} [color=red];
     276 -> {277};
     277 -> {278};
     278 -> {279};
     279 -> {280};
-    280 -> {281 300 282};
+    280 -> {281 282 300};
     280 -> {300} [style=dashed];
-    281 -> {283} [color=red];
     281 -> {282} [color=green];
+    281 -> {283} [color=red];
     282 -> {283};
     283 -> {284};
     284 -> {285};
@@ -820,18 +820,18 @@ digraph flowFromInplaceLambda_kt {
     }
     310 -> {311};
     311 -> {312};
-    312 -> {329 314};
+    312 -> {314 329};
     312 -> {313} [style=dotted];
     312 -> {329} [style=dashed];
-    313 -> {319} [color=red];
     313 -> {314} [color=green];
+    313 -> {319} [color=red];
     314 -> {315};
     315 -> {316};
-    316 -> {341 318};
+    316 -> {318 341};
     316 -> {317} [style=dotted];
     316 -> {341} [style=dashed];
-    317 -> {319} [color=red];
     317 -> {318} [color=green];
+    317 -> {319} [color=red];
     318 -> {319};
     319 -> {320};
     320 -> {321};
@@ -930,20 +930,20 @@ digraph flowFromInplaceLambda_kt {
     }
     353 -> {354};
     354 -> {355};
-    355 -> {372 357};
+    355 -> {357 372};
     355 -> {356} [style=dotted];
     355 -> {372} [style=dashed];
-    356 -> {362} [color=red];
-    356 -> {357} [color=green];
     356 -> {355} [color=green style=dashed];
+    356 -> {357} [color=green];
+    356 -> {362} [color=red];
     357 -> {358};
     358 -> {359};
-    359 -> {384 361};
+    359 -> {361 384};
     359 -> {360} [style=dotted];
     359 -> {384} [style=dashed];
-    360 -> {362} [color=red];
-    360 -> {361} [color=green];
     360 -> {359} [color=green style=dashed];
+    360 -> {361} [color=green];
+    360 -> {362} [color=red];
     361 -> {362};
     362 -> {363};
     363 -> {364};
@@ -1040,16 +1040,16 @@ digraph flowFromInplaceLambda_kt {
     }
     396 -> {397};
     397 -> {398};
-    398 -> {399 413 400};
+    398 -> {399 400 413};
     398 -> {413} [style=dashed];
-    399 -> {405} [color=red];
     399 -> {400} [color=green];
+    399 -> {405} [color=red];
     400 -> {401};
     401 -> {402};
-    402 -> {403 425 404};
+    402 -> {403 404 425};
     402 -> {425} [style=dashed];
-    403 -> {405} [color=red];
     403 -> {404} [color=green];
+    403 -> {405} [color=red];
     404 -> {405};
     405 -> {406};
     406 -> {407};
@@ -1144,18 +1144,18 @@ digraph flowFromInplaceLambda_kt {
     }
     437 -> {438};
     438 -> {439};
-    439 -> {440 454 441};
+    439 -> {440 441 454};
     439 -> {454} [style=dashed];
-    440 -> {446} [color=red];
-    440 -> {441} [color=green];
     440 -> {439} [color=green style=dashed];
+    440 -> {441} [color=green];
+    440 -> {446} [color=red];
     441 -> {442};
     442 -> {443};
-    443 -> {444 466 445};
+    443 -> {444 445 466};
     443 -> {466} [style=dashed];
-    444 -> {446} [color=red];
-    444 -> {445} [color=green];
     444 -> {443} [color=green style=dashed];
+    444 -> {445} [color=green];
+    444 -> {446} [color=red];
     445 -> {446};
     446 -> {447};
     447 -> {448};
@@ -1250,16 +1250,16 @@ digraph flowFromInplaceLambda_kt {
     }
     478 -> {479};
     479 -> {480};
-    480 -> {481 495 482};
+    480 -> {481 482 495};
     480 -> {495} [style=dashed];
-    481 -> {487} [color=red];
     481 -> {482} [color=green];
+    481 -> {487} [color=red];
     482 -> {483};
     483 -> {484};
-    484 -> {485 507 486};
+    484 -> {485 486 507};
     484 -> {507} [style=dashed];
-    485 -> {487} [color=red];
     485 -> {486} [color=green];
+    485 -> {487} [color=red];
     486 -> {487};
     487 -> {488};
     488 -> {489};
@@ -1335,17 +1335,17 @@ digraph flowFromInplaceLambda_kt {
     }
     519 -> {520};
     520 -> {521};
-    521 -> {533 523};
+    521 -> {523 533};
     521 -> {522} [style=dotted];
     521 -> {533} [style=dashed];
-    522 -> {527} [color=red];
     522 -> {523} [color=green];
+    522 -> {527} [color=red];
     523 -> {524};
-    524 -> {538 526};
+    524 -> {526 538};
     524 -> {525} [style=dotted];
     524 -> {538} [style=dashed];
-    525 -> {527} [color=red];
     525 -> {526} [color=green];
+    525 -> {527} [color=red];
     526 -> {527};
     527 -> {528};
     528 -> {529};
@@ -1406,10 +1406,10 @@ digraph flowFromInplaceLambda_kt {
     }
     543 -> {544};
     544 -> {545};
-    545 -> {546 554 547};
+    545 -> {546 547 554};
     545 -> {554} [style=dashed];
-    546 -> {548} [color=red];
     546 -> {547} [color=green];
+    546 -> {548} [color=red];
     547 -> {548};
     548 -> {549};
     549 -> {550};
@@ -1418,11 +1418,11 @@ digraph flowFromInplaceLambda_kt {
     552 -> {553};
     554 -> {555};
     555 -> {556};
-    556 -> {561 558};
+    556 -> {558 561};
     556 -> {557} [style=dotted];
     556 -> {561} [style=dashed];
-    557 -> {548} [color=red];
     557 -> {558} [color=green];
+    557 -> {548} [color=red];
     558 -> {559};
     559 -> {560};
     561 -> {562};

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

@@ -130,19 +130,19 @@ digraph flowFromInplaceLambda2_kt {
     }
     25 -> {26};
     26 -> {27};
-    27 -> {41 29};
+    27 -> {29 41};
     27 -> {28} [style=dotted];
     27 -> {41} [style=dashed];
-    28 -> {35} [color=red];
     28 -> {29} [color=green];
+    28 -> {35} [color=red];
     29 -> {30};
     30 -> {31};
     31 -> {32};
-    32 -> {48 34};
+    32 -> {34 48};
     32 -> {33} [style=dotted];
     32 -> {48} [style=dashed];
-    33 -> {35} [color=red];
     33 -> {34} [color=green];
+    33 -> {35} [color=red];
     34 -> {35};
     35 -> {36};
     36 -> {37};
@@ -215,20 +215,20 @@ digraph flowFromInplaceLambda2_kt {
     }
     55 -> {56};
     56 -> {57};
-    57 -> {72 59};
+    57 -> {59 72};
     57 -> {58} [style=dotted];
     57 -> {72} [style=dashed];
-    58 -> {66} [color=red];
     58 -> {59} [color=green];
+    58 -> {66} [color=red];
     59 -> {60};
     60 -> {61};
     61 -> {62};
     62 -> {63};
-    63 -> {79 65};
+    63 -> {65 79};
     63 -> {64} [style=dotted];
     63 -> {79} [style=dashed];
-    64 -> {66} [color=red];
     64 -> {65} [color=green];
+    64 -> {66} [color=red];
     65 -> {66};
     66 -> {67};
     67 -> {68};
@@ -331,17 +331,17 @@ digraph flowFromInplaceLambda2_kt {
     }
     86 -> {87};
     87 -> {88};
-    88 -> {118 90};
+    88 -> {90 118};
     88 -> {89} [style=dotted];
     88 -> {118} [style=dashed];
-    89 -> {112} [color=red];
     89 -> {90} [color=green];
+    89 -> {112} [color=red];
     90 -> {91};
     91 -> {92};
     92 -> {93};
     93 -> {94};
     94 -> {95};
-    95 -> {103 96};
+    95 -> {96 103};
     96 -> {97};
     97 -> {98};
     98 -> {99};
@@ -355,11 +355,11 @@ digraph flowFromInplaceLambda2_kt {
     106 -> {107};
     107 -> {108};
     108 -> {109};
-    109 -> {125 111};
+    109 -> {111 125};
     109 -> {110} [style=dotted];
     109 -> {125} [style=dashed];
-    110 -> {112} [color=red];
     110 -> {111} [color=green];
+    110 -> {112} [color=red];
     111 -> {112};
     112 -> {113};
     113 -> {114};
@@ -506,44 +506,44 @@ digraph flowFromInplaceLambda2_kt {
     138 -> {139};
     139 -> {140};
     140 -> {141};
-    141 -> {143 142};
+    141 -> {142 143};
     142 -> {177};
     143 -> {144};
     144 -> {145};
     145 -> {146};
     146 -> {147};
     147 -> {148};
-    148 -> {158 149};
+    148 -> {149 158};
     149 -> {150};
     150 -> {151};
     151 -> {152};
     152 -> {153};
-    153 -> {187 155};
+    153 -> {155 187};
     153 -> {154} [style=dotted];
     153 -> {187} [style=dashed];
-    154 -> {171} [color=red];
     154 -> {155} [color=green];
+    154 -> {171} [color=red];
     155 -> {156};
     156 -> {157};
     157 -> {165};
     158 -> {159};
     159 -> {160};
-    160 -> {180 162};
+    160 -> {162 180};
     160 -> {161} [style=dotted];
     160 -> {180} [style=dashed];
-    161 -> {171} [color=red];
     161 -> {162} [color=green];
+    161 -> {171} [color=red];
     162 -> {163};
     163 -> {164};
     164 -> {165};
-    165 -> {171 166};
+    165 -> {166 171};
     166 -> {167};
     167 -> {168};
-    168 -> {192 170};
+    168 -> {170 192};
     168 -> {169} [style=dotted];
     168 -> {192} [style=dashed];
-    169 -> {172} [color=red];
     169 -> {170} [color=green];
+    169 -> {172} [color=red];
     170 -> {172};
     171 -> {172} [color=red];
     172 -> {173};
@@ -626,19 +626,19 @@ digraph flowFromInplaceLambda2_kt {
     201 -> {202};
     202 -> {203 207};
     203 -> {204};
-    204 -> {218 206};
+    204 -> {206 218};
     204 -> {205} [style=dotted];
     204 -> {218} [style=dashed];
-    205 -> {212} [color=red];
     205 -> {206} [color=green];
+    205 -> {212} [color=red];
     206 -> {207};
-    207 -> {212 208};
+    207 -> {208 212};
     208 -> {209};
-    209 -> {225 211};
+    209 -> {211 225};
     209 -> {210} [style=dotted];
     209 -> {225} [style=dashed];
-    210 -> {213} [color=red];
     210 -> {211} [color=green];
+    210 -> {213} [color=red];
     211 -> {213};
     212 -> {213} [color=red];
     213 -> {214};
@@ -757,37 +757,37 @@ digraph flowFromInplaceLambda2_kt {
     232 -> {233};
     233 -> {234};
     234 -> {235};
-    235 -> {245 236};
+    235 -> {236 245};
     236 -> {237};
     237 -> {238};
     238 -> {239};
     239 -> {240};
-    240 -> {271 242};
+    240 -> {242 271};
     240 -> {241} [style=dotted];
     240 -> {271} [style=dashed];
-    241 -> {258} [color=red];
     241 -> {242} [color=green];
+    241 -> {258} [color=red];
     242 -> {243};
     243 -> {244};
     244 -> {252};
     245 -> {246};
     246 -> {247};
-    247 -> {264 249};
+    247 -> {249 264};
     247 -> {248} [style=dotted];
     247 -> {264} [style=dashed];
-    248 -> {258} [color=red];
     248 -> {249} [color=green];
+    248 -> {258} [color=red];
     249 -> {250};
     250 -> {251};
     251 -> {252};
-    252 -> {258 253};
+    252 -> {253 258};
     253 -> {254};
     254 -> {255};
-    255 -> {278 257};
+    255 -> {257 278};
     255 -> {256} [style=dotted];
     255 -> {278} [style=dashed];
-    256 -> {259} [color=red];
     256 -> {257} [color=green];
+    256 -> {259} [color=red];
     257 -> {259};
     258 -> {259} [color=red];
     259 -> {260};
@@ -897,23 +897,23 @@ digraph flowFromInplaceLambda2_kt {
     291 -> {292};
     292 -> {293};
     293 -> {294};
-    294 -> {296 295};
+    294 -> {295 296};
     295 -> {312};
     296 -> {297};
     297 -> {298};
-    298 -> {315 300};
+    298 -> {300 315};
     298 -> {299} [style=dotted];
     298 -> {315} [style=dashed];
-    299 -> {306} [color=red];
     299 -> {300} [color=green];
+    299 -> {306} [color=red];
     300 -> {301};
     301 -> {302};
     302 -> {303};
-    303 -> {322 305};
+    303 -> {305 322};
     303 -> {304} [style=dotted];
     303 -> {322} [style=dashed];
-    304 -> {306} [color=red];
     304 -> {305} [color=green];
+    304 -> {306} [color=red];
     305 -> {306};
     306 -> {307};
     307 -> {308};

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

@@ -138,7 +138,7 @@ digraph flowFromInplaceLambda3_kt {
     64 -> {65};
     65 -> {66};
     66 -> {67};
-    67 -> {68 78 69};
+    67 -> {68 69 78};
     67 -> {78} [style=dashed];
     68 -> {69};
     68 -> {67} [color=green style=dashed];
@@ -199,7 +199,7 @@ digraph flowFromInplaceLambda3_kt {
     89 -> {90};
     90 -> {91};
     91 -> {92};
-    92 -> {93 100 94};
+    92 -> {93 94 100};
     92 -> {100} [style=dashed];
     93 -> {94};
     93 -> {92} [color=green style=dashed];
@@ -260,7 +260,7 @@ digraph flowFromInplaceLambda3_kt {
     111 -> {112};
     112 -> {113};
     113 -> {114};
-    114 -> {125 116};
+    114 -> {116 125};
     114 -> {115} [style=dotted];
     114 -> {125} [style=dashed];
     115 -> {116};
@@ -325,7 +325,7 @@ digraph flowFromInplaceLambda3_kt {
     136 -> {137};
     137 -> {138};
     138 -> {139};
-    139 -> {150 141};
+    139 -> {141 150};
     139 -> {140} [style=dotted];
     139 -> {150} [style=dashed];
     140 -> {141};
@@ -389,7 +389,7 @@ digraph flowFromInplaceLambda3_kt {
     161 -> {162};
     162 -> {163};
     163 -> {164};
-    164 -> {165 175 166};
+    164 -> {165 166 175};
     164 -> {175} [style=dashed];
     165 -> {166};
     166 -> {167};

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

@@ -125,12 +125,12 @@ digraph flowFromTwoInplaceLambdas_kt {
     33 -> {34};
     34 -> {35};
     35 -> {36};
-    36 -> {38 37};
+    36 -> {37 38};
     37 -> {49};
     38 -> {39};
     39 -> {40};
-    40 -> {52 59 43};
-    40 -> {42 41} [style=dotted];
+    40 -> {43 52 59};
+    40 -> {41 42} [style=dotted];
     40 -> {52 59} [style=dashed];
     41 -> {43};
     42 -> {43};
@@ -234,12 +234,12 @@ digraph flowFromTwoInplaceLambdas_kt {
     73 -> {74};
     74 -> {75};
     75 -> {76};
-    76 -> {78 77};
+    76 -> {77 78};
     77 -> {89};
     78 -> {79};
     79 -> {80};
-    80 -> {92 99 83};
-    80 -> {82 81} [style=dotted];
+    80 -> {83 92 99};
+    80 -> {81 82} [style=dotted];
     80 -> {92 99} [style=dashed];
     81 -> {83};
     82 -> {83};
@@ -325,8 +325,8 @@ digraph flowFromTwoInplaceLambdas_kt {
     110 -> {111};
     111 -> {112};
     112 -> {113};
-    113 -> {127 134 116};
-    113 -> {115 114} [style=dotted];
+    113 -> {116 127 134};
+    113 -> {114 115} [style=dotted];
     113 -> {127 134} [style=dashed];
     114 -> {116};
     115 -> {116};
@@ -413,8 +413,8 @@ digraph flowFromTwoInplaceLambdas_kt {
     144 -> {145};
     145 -> {146};
     146 -> {147};
-    147 -> {161 168 150};
-    147 -> {149 148} [style=dotted];
+    147 -> {150 161 168};
+    147 -> {148 149} [style=dotted];
     147 -> {161 168} [style=dashed];
     148 -> {150};
     149 -> {150};
@@ -519,8 +519,8 @@ digraph flowFromTwoInplaceLambdas_kt {
     182 -> {183};
     183 -> {184};
     184 -> {185};
-    185 -> {197 207 188};
-    185 -> {187 186} [style=dotted];
+    185 -> {188 197 207};
+    185 -> {186 187} [style=dotted];
     185 -> {197 207} [style=dashed];
     186 -> {188};
     187 -> {188};
@@ -611,8 +611,8 @@ digraph flowFromTwoInplaceLambdas_kt {
     220 -> {221};
     221 -> {222};
     222 -> {223};
-    223 -> {237 244 226};
-    223 -> {225 224} [style=dotted];
+    223 -> {226 237 244};
+    223 -> {224 225} [style=dotted];
     223 -> {237 244} [style=dashed];
     224 -> {226};
     225 -> {226};
@@ -687,8 +687,8 @@ digraph flowFromTwoInplaceLambdas_kt {
     251 -> {252};
     252 -> {253};
     253 -> {254};
-    254 -> {262 270 257};
-    254 -> {256 255} [style=dotted];
+    254 -> {257 262 270};
+    254 -> {255 256} [style=dotted];
     254 -> {262 270} [style=dashed];
     255 -> {257};
     256 -> {257};
@@ -780,8 +780,8 @@ digraph flowFromTwoInplaceLambdas_kt {
     278 -> {279};
     279 -> {280};
     280 -> {281};
-    281 -> {301 307 284};
-    281 -> {283 282} [style=dotted];
+    281 -> {284 301 307};
+    281 -> {282 283} [style=dotted];
     281 -> {301 307} [style=dashed];
     282 -> {284};
     283 -> {284};
@@ -790,7 +790,7 @@ digraph flowFromTwoInplaceLambdas_kt {
     286 -> {287};
     287 -> {288};
     288 -> {289};
-    289 -> {291 290};
+    289 -> {290 291};
     290 -> {298};
     291 -> {292};
     292 -> {293};

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

@@ -38,8 +38,8 @@ digraph initBlock_kt {
         11 [label="Exit class Foo" style="filled" fillcolor=red];
     }
     9 -> {10} [color=green];
-    10 -> {11} [style=dotted];
     10 -> {3} [color=green];
+    10 -> {11} [style=dotted];
     10 -> {3} [style=dashed];
 
     subgraph cluster_4 {
@@ -73,7 +73,7 @@ digraph initBlock_kt {
     17 -> {18};
     18 -> {19};
     19 -> {20};
-    20 -> {25}    [label=onUncaughtException];
+    20 -> {25} [label="onUncaughtException"];
     20 -> {21} [style=dotted];
     21 -> {22} [style=dotted];
     22 -> {23} [style=dotted];
@@ -88,8 +88,8 @@ digraph initBlock_kt {
         28 [label="Exit class Bar" style="filled" fillcolor=red];
     }
     26 -> {27} [color=green];
-    27 -> {28} [style=dotted];
     27 -> {15} [color=green];
+    27 -> {28} [style=dotted];
     27 -> {15} [style=dashed];
 
 }

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

@@ -62,7 +62,7 @@ digraph initBlockAndInPlaceLambda_kt {
     9 -> {10};
     10 -> {11 15};
     11 -> {12};
-    12 -> {19 14};
+    12 -> {14 19};
     12 -> {13} [style=dotted];
     12 -> {19} [style=dashed];
     13 -> {14};
@@ -86,8 +86,8 @@ digraph initBlockAndInPlaceLambda_kt {
         28 [label="Exit class C" style="filled" fillcolor=red];
     }
     26 -> {27} [color=green];
-    27 -> {28} [style=dotted];
     27 -> {7} [color=green];
+    27 -> {28} [style=dotted];
     27 -> {7} [style=dashed];
 
 }

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

@@ -57,8 +57,8 @@ digraph innerClassInAnonymousObject_kt {
     }
     14 -> {15};
     14 -> {0 3 6} [color=red];
-    15 -> {16} [color=red];
     15 -> {12} [color=green];
+    15 -> {16} [color=red];
     15 -> {12} [style=dashed];
     16 -> {17};
     16 -> {0} [color=green];

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

@@ -21,10 +21,10 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
     0 -> {1};
     1 -> {2};
     2 -> {3};
-    3 -> {8}    [label=onUncaughtException];
+    3 -> {8} [label="onUncaughtException"];
     3 -> {4} [style=dotted];
     4 -> {5} [style=dotted];
-    5 -> {8 6} [style=dotted];
+    5 -> {6 8} [style=dotted];
     6 -> {7} [style=dotted];
     7 -> {8} [style=dotted];
 
@@ -89,7 +89,7 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
     11 -> {12};
     12 -> {13};
     13 -> {14};
-    14 -> {22 15};
+    14 -> {15 22};
     15 -> {16};
     16 -> {17};
     17 -> {18};
@@ -99,11 +99,11 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
     21 -> {29};
     22 -> {23};
     23 -> {24};
-    24 -> {33 26};
+    24 -> {26 33};
     24 -> {25} [style=dotted];
     24 -> {33} [style=dashed];
-    25 -> {29} [color=red];
     25 -> {26} [color=green];
+    25 -> {29} [color=red];
     26 -> {27};
     27 -> {28};
     28 -> {29};
@@ -173,16 +173,16 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
     40 -> {41 48};
     41 -> {42};
     42 -> {43};
-    43 -> {58 45};
+    43 -> {45 58};
     43 -> {44} [style=dotted];
     43 -> {58} [style=dashed];
-    44 -> {54} [color=red];
     44 -> {45} [color=green];
+    44 -> {54} [color=red];
     45 -> {46};
     46 -> {47};
-    47 -> {54 48};
+    47 -> {48 54};
     48 -> {49};
-    48 -> {57}    [label=onUncaughtException];
+    48 -> {57} [label="onUncaughtException"];
     49 -> {50};
     50 -> {51};
     51 -> {52};
@@ -225,11 +225,11 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
     }
     63 -> {64};
     64 -> {65};
-    65 -> {72 67};
+    65 -> {67 72};
     65 -> {66} [style=dotted];
     65 -> {72} [style=dashed];
-    66 -> {68} [color=red];
     66 -> {67} [color=green];
+    66 -> {68} [color=red];
     67 -> {68};
     68 -> {69};
     69 -> {70};

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

@@ -63,7 +63,7 @@ digraph jumps_kt {
     4 -> {5};
     5 -> {6};
     6 -> {7};
-    7 -> {16 8};
+    7 -> {8 16};
     8 -> {9};
     9 -> {10};
     10 -> {11};
@@ -75,7 +75,7 @@ digraph jumps_kt {
     16 -> {17};
     17 -> {18};
     18 -> {19};
-    19 -> {31}    [label=onUncaughtException];
+    19 -> {31} [label="onUncaughtException"];
     19 -> {20} [style=dotted];
     20 -> {21} [style=dotted];
     21 -> {22} [style=dotted];
@@ -145,7 +145,7 @@ digraph jumps_kt {
     36 -> {37};
     37 -> {38};
     38 -> {39};
-    39 -> {48 40};
+    39 -> {40 48};
     40 -> {41};
     41 -> {42};
     42 -> {43};
@@ -278,8 +278,8 @@ digraph jumps_kt {
     90 -> {91} [style=dotted];
     91 -> {92} [style=dotted];
     92 -> {93} [style=dotted];
-    93 -> {94} [style=dotted];
     93 -> {83} [color=green style=dotted];
+    93 -> {94} [style=dotted];
     94 -> {95};
     95 -> {96};
     96 -> {97};
@@ -343,18 +343,18 @@ digraph jumps_kt {
     102 -> {103};
     103 -> {104};
     104 -> {105};
-    105 -> {122 106};
+    105 -> {106 122};
     106 -> {107};
     107 -> {108};
     108 -> {109};
     109 -> {110};
     110 -> {111};
-    111 -> {113 112};
+    111 -> {112 113};
     112 -> {119};
     113 -> {114};
     114 -> {115};
-    115 -> {116} [style=dotted];
     115 -> {103} [color=green style=dashed];
+    115 -> {116} [style=dotted];
     116 -> {117} [style=dotted];
     117 -> {118} [style=dotted];
     118 -> {119} [style=dotted];
@@ -407,7 +407,7 @@ digraph jumps_kt {
     }
     130 -> {131};
     131 -> {132};
-    132 -> {133 137 134};
+    132 -> {133 134 137};
     132 -> {137} [style=dashed];
     133 -> {134};
     133 -> {132} [color=green style=dashed];

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

@@ -40,7 +40,7 @@ digraph lambdaAsReturnOfLambda_kt {
         17 [label="Exit property" style="filled" fillcolor=red];
     }
     13 -> {14};
-    14 -> {15 0 16};
+    14 -> {0 15 16};
     14 -> {0} [style=dashed];
     15 -> {16};
     16 -> {17};

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

@@ -63,10 +63,10 @@ digraph lambdaReturningObject_kt {
     }
     13 -> {14};
     14 -> {15};
-    15 -> {20}    [label=onUncaughtException];
+    15 -> {20} [label="onUncaughtException"];
     15 -> {16} [style=dotted];
     16 -> {17} [style=dotted];
-    17 -> {20 18} [style=dotted];
+    17 -> {18 20} [style=dotted];
     18 -> {19} [style=dotted];
     19 -> {20} [style=dotted];
 
@@ -97,10 +97,10 @@ digraph lambdaReturningObject_kt {
     }
     21 -> {22};
     22 -> {23};
-    23 -> {24 29 25};
+    23 -> {24 25 29};
     23 -> {29} [style=dashed];
-    24 -> {26} [color=red];
     24 -> {25} [color=green];
+    24 -> {26} [color=red];
     25 -> {26};
     26 -> {27};
     27 -> {28};

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

@@ -71,11 +71,11 @@ digraph lambdas_kt {
     8 -> {9};
     9 -> {10};
     10 -> {11};
-    11 -> {13 12};
+    11 -> {12 13};
     12 -> {20};
     13 -> {14};
     14 -> {15};
-    15 -> {16 23 17};
+    15 -> {16 17 23};
     15 -> {23} [style=dashed];
     16 -> {17};
     16 -> {15} [color=green style=dashed];
@@ -143,11 +143,11 @@ digraph lambdas_kt {
     33 -> {34};
     34 -> {35};
     35 -> {36};
-    36 -> {38 37};
+    36 -> {37 38};
     37 -> {44};
     38 -> {39};
     39 -> {40};
-    40 -> {47 41};
+    40 -> {41 47};
     40 -> {47} [style=dashed];
     41 -> {42};
     42 -> {43};
@@ -217,7 +217,7 @@ digraph lambdas_kt {
     }
     62 -> {63};
     63 -> {64};
-    64 -> {65 71 66};
+    64 -> {65 66 71};
     64 -> {71} [style=dashed];
     65 -> {66};
     65 -> {64} [color=green style=dashed];
@@ -268,7 +268,7 @@ digraph lambdas_kt {
     }
     78 -> {79};
     79 -> {80};
-    80 -> {81 87 82};
+    80 -> {81 82 87};
     80 -> {87} [style=dashed];
     81 -> {82};
     81 -> {80} [color=green style=dashed];

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

@@ -77,7 +77,7 @@ digraph localClassesWithImplicit_kt {
     10 -> {11};
     11 -> {12};
     12 -> {13};
-    13 -> {15 14};
+    13 -> {14 15};
     14 -> {21};
     15 -> {16};
     16 -> {17};
@@ -89,11 +89,11 @@ digraph localClassesWithImplicit_kt {
     21 -> {22};
     21 -> {33 36 73 92} [color=red];
     22 -> {23};
+    22 -> {29 33 36 73 92} [color=green];
     22 -> {99 102 139 158} [color=red];
-    22 -> {33 36 73 92 29} [color=green];
-    22 -> {33 36 73 92 29} [style=dashed];
-    23 -> {24} [color=red];
+    22 -> {29 33 36 73 92} [style=dashed];
     23 -> {31} [color=green];
+    23 -> {24} [color=red];
     23 -> {31} [style=dashed];
     24 -> {25};
     24 -> {99 102 139 158} [color=green];
@@ -193,7 +193,7 @@ digraph localClassesWithImplicit_kt {
     }
     36 -> {37};
     37 -> {38};
-    38 -> {39 45 40};
+    38 -> {39 40 45};
     38 -> {45} [style=dashed];
     39 -> {40};
     39 -> {38} [color=green style=dashed];
@@ -211,7 +211,7 @@ digraph localClassesWithImplicit_kt {
     51 -> {52};
     52 -> {53};
     53 -> {54};
-    54 -> {62 55};
+    54 -> {55 62};
     55 -> {56};
     56 -> {57};
     57 -> {58};
@@ -269,7 +269,7 @@ digraph localClassesWithImplicit_kt {
     }
     73 -> {74};
     74 -> {75};
-    75 -> {76 82 77};
+    75 -> {76 77 82};
     75 -> {82} [style=dashed];
     76 -> {77};
     76 -> {75} [color=green style=dashed];
@@ -398,7 +398,7 @@ digraph localClassesWithImplicit_kt {
     }
     102 -> {103};
     103 -> {104};
-    104 -> {105 111 106};
+    104 -> {105 106 111};
     104 -> {111} [style=dashed];
     105 -> {106};
     105 -> {104} [color=green style=dashed];
@@ -416,7 +416,7 @@ digraph localClassesWithImplicit_kt {
     117 -> {118};
     118 -> {119};
     119 -> {120};
-    120 -> {128 121};
+    120 -> {121 128};
     121 -> {122};
     122 -> {123};
     123 -> {124};
@@ -474,7 +474,7 @@ digraph localClassesWithImplicit_kt {
     }
     139 -> {140};
     140 -> {141};
-    141 -> {142 148 143};
+    141 -> {142 143 148};
     141 -> {148} [style=dashed];
     142 -> {143};
     142 -> {141} [color=green style=dashed];

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

@@ -44,7 +44,7 @@ digraph loops_kt {
     2 -> {3};
     3 -> {4};
     4 -> {5};
-    5 -> {13 6};
+    5 -> {6 13};
     6 -> {7};
     7 -> {8};
     8 -> {9};
@@ -174,7 +174,7 @@ digraph loops_kt {
     45 -> {46};
     46 -> {47};
     47 -> {48};
-    48 -> {59 49};
+    48 -> {49 59};
     49 -> {50};
     50 -> {51};
     51 -> {52};
@@ -305,7 +305,7 @@ digraph loops_kt {
     88 -> {89};
     89 -> {90};
     90 -> {91};
-    91 -> {93 92};
+    91 -> {92 93};
     92 -> {99};
     93 -> {94};
     94 -> {95};
@@ -413,8 +413,8 @@ digraph loops_kt {
     128 -> {129};
     129 -> {130};
     130 -> {131};
-    131 -> {132} [style=dotted];
     131 -> {124} [color=green style=dashed];
+    131 -> {132} [style=dotted];
     132 -> {133} [style=dotted];
     133 -> {134} [style=dotted];
     134 -> {135} [style=dotted];
@@ -480,7 +480,7 @@ digraph loops_kt {
     141 -> {142};
     142 -> {143};
     143 -> {144};
-    144 -> {146 145};
+    144 -> {145 146};
     145 -> {152};
     146 -> {147};
     147 -> {148};
@@ -494,8 +494,8 @@ digraph loops_kt {
     154 -> {155};
     155 -> {156};
     156 -> {157};
-    157 -> {158} [style=dotted];
     157 -> {139} [color=green style=dashed];
+    157 -> {158} [style=dotted];
     158 -> {159};
     159 -> {160};
     160 -> {161};

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

@@ -53,11 +53,11 @@ digraph postponedLambdaInConstructor_kt {
     }
     5 -> {6};
     6 -> {7};
-    7 -> {12 9};
+    7 -> {9 12};
     7 -> {8} [style=dotted];
     7 -> {12} [style=dashed];
-    8 -> {10} [color=red];
     8 -> {9} [color=green];
+    8 -> {10} [color=red];
     9 -> {10};
     10 -> {11};
     12 -> {13};
@@ -104,8 +104,8 @@ digraph postponedLambdaInConstructor_kt {
         32 [label="Exit class B" style="filled" fillcolor=red];
     }
     30 -> {31} [color=green];
-    31 -> {32} [style=dotted];
     31 -> {22} [color=green];
+    31 -> {32} [style=dotted];
     31 -> {22} [style=dashed];
 
 }

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

@@ -150,7 +150,7 @@ digraph postponedLambdaInReturn_kt {
     29 -> {30};
     30 -> {31};
     31 -> {32};
-    32 -> {40 34};
+    32 -> {34 40};
     32 -> {33} [style=dotted];
     32 -> {40} [style=dashed];
     33 -> {34};
@@ -164,7 +164,7 @@ digraph postponedLambdaInReturn_kt {
     42 -> {43};
     43 -> {44};
     44 -> {45};
-    45 -> {55 46};
+    45 -> {46 55};
     46 -> {47};
     47 -> {48};
     48 -> {49};
@@ -297,7 +297,7 @@ digraph postponedLambdaInReturn_kt {
     }
     75 -> {76};
     76 -> {77};
-    77 -> {85 79};
+    77 -> {79 85};
     77 -> {78} [style=dotted];
     77 -> {85} [style=dashed];
     78 -> {79};
@@ -327,9 +327,9 @@ digraph postponedLambdaInReturn_kt {
     99 -> {100} [style=dotted];
     100 -> {101} [style=dotted];
     101 -> {102} [style=dotted];
-    102 -> {108 103} [style=dotted];
+    102 -> {103 108} [style=dotted];
     103 -> {104};
-    103 -> {84}    [label=onUncaughtException];
+    103 -> {84} [label="onUncaughtException"];
     104 -> {105};
     105 -> {106};
     106 -> {107};
@@ -339,8 +339,8 @@ digraph postponedLambdaInReturn_kt {
     110 -> {88} [color=green style=dashed];
     111 -> {112} [style=dotted];
     112 -> {113} [style=dotted];
+    113 -> {84} [style=dotted label="onUncaughtException"];
     113 -> {114} [style=dotted];
-    113 -> {84} [style=dotted]    [label=onUncaughtException];
     114 -> {115} [style=dotted];
     115 -> {116} [style=dotted];
     116 -> {78};
@@ -443,7 +443,7 @@ digraph postponedLambdaInReturn_kt {
     125 -> {126};
     126 -> {127};
     127 -> {128};
-    128 -> {137 130};
+    128 -> {130 137};
     128 -> {129} [style=dotted];
     128 -> {137} [style=dashed];
     129 -> {130};
@@ -459,7 +459,7 @@ digraph postponedLambdaInReturn_kt {
     140 -> {141};
     141 -> {142};
     142 -> {143};
-    143 -> {153 144};
+    143 -> {144 153};
     144 -> {145};
     145 -> {146};
     146 -> {147};

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

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

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

@@ -100,7 +100,7 @@ digraph propertiesAndInitBlocks_kt {
     39 -> {40};
     40 -> {41};
     41 -> {42};
-    42 -> {45}    [label=onUncaughtException];
+    42 -> {45} [label="onUncaughtException"];
     42 -> {43} [style=dotted];
     43 -> {44} [style=dotted];
     44 -> {45} [style=dotted];
@@ -131,7 +131,7 @@ digraph propertiesAndInitBlocks_kt {
     49 -> {50};
     50 -> {51};
     51 -> {52};
-    52 -> {56}    [label=onUncaughtException];
+    52 -> {56} [label="onUncaughtException"];
     52 -> {53} [style=dotted];
     53 -> {54} [style=dotted];
     54 -> {55} [style=dotted];
@@ -159,12 +159,12 @@ digraph propertiesAndInitBlocks_kt {
     58 -> {59};
     58 -> {65 68} [color=red];
     59 -> {60};
-    59 -> {65 62} [color=green];
-    59 -> {65 62} [style=dashed];
+    59 -> {62 65} [color=green];
+    59 -> {62 65} [style=dashed];
     60 -> {61};
     62 -> {63} [color=green];
-    63 -> {64} [style=dotted];
     63 -> {68} [color=green];
+    63 -> {64} [style=dotted];
     63 -> {68} [style=dashed];
 
     subgraph cluster_16 {
@@ -192,7 +192,7 @@ digraph propertiesAndInitBlocks_kt {
     68 -> {69};
     69 -> {70};
     70 -> {71};
-    71 -> {74}    [label=onUncaughtException];
+    71 -> {74} [label="onUncaughtException"];
     71 -> {72} [style=dotted];
     72 -> {73} [style=dotted];
     73 -> {74} [style=dotted];
@@ -227,7 +227,7 @@ digraph propertiesAndInitBlocks_kt {
         79 [label="Exit property" style="filled" fillcolor=red];
     }
     75 -> {76};
-    76 -> {77 24 78};
+    76 -> {24 77 78};
     76 -> {24} [style=dashed];
     77 -> {78};
     77 -> {76} [color=green style=dashed];
@@ -236,17 +236,17 @@ digraph propertiesAndInitBlocks_kt {
     25 -> {26};
     25 -> {35 46 49} [color=red];
     26 -> {27};
-    26 -> {46 32} [color=green];
-    26 -> {46 32} [style=dashed];
+    26 -> {32 46} [color=green];
+    26 -> {32 46} [style=dashed];
     27 -> {28};
-    28 -> {79}    [label=onUncaughtException];
+    28 -> {79} [label="onUncaughtException"];
     28 -> {29} [style=dotted];
     29 -> {30} [style=dotted];
     30 -> {31} [style=dotted];
     31 -> {77} [style=dotted];
     32 -> {33} [color=green];
-    33 -> {34} [style=dotted];
     33 -> {49} [color=green];
+    33 -> {34} [style=dotted];
     33 -> {49} [style=dashed];
 
     subgraph cluster_23 {
@@ -295,14 +295,14 @@ digraph propertiesAndInitBlocks_kt {
     }
     80 -> {81};
     81 -> {82 87};
-    81 -> {93}    [label=onUncaughtException];
+    81 -> {93} [label="onUncaughtException"];
     82 -> {83};
     83 -> {84};
     84 -> {85};
     85 -> {86};
-    86 -> {93 87};
+    86 -> {87 93};
     87 -> {88};
-    87 -> {93}    [label=onUncaughtException];
+    87 -> {93} [label="onUncaughtException"];
     88 -> {89};
     89 -> {90};
     90 -> {91};
@@ -313,7 +313,7 @@ digraph propertiesAndInitBlocks_kt {
     95 -> {96};
     96 -> {97};
     97 -> {98};
-    97 -> {99}    [label=onUncaughtException];
+    97 -> {99} [label="onUncaughtException"];
     98 -> {99};
 
 }

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

@@ -91,7 +91,7 @@ digraph returnValuesFromLambda_kt {
     }
     12 -> {13};
     13 -> {14};
-    14 -> {20 16};
+    14 -> {16 20};
     14 -> {15} [style=dotted];
     14 -> {20} [style=dashed];
     15 -> {16};
@@ -103,7 +103,7 @@ digraph returnValuesFromLambda_kt {
     22 -> {23};
     23 -> {24};
     24 -> {25};
-    25 -> {27 26};
+    25 -> {26 27};
     26 -> {34};
     27 -> {28};
     28 -> {29};
@@ -147,7 +147,7 @@ digraph returnValuesFromLambda_kt {
     }
     38 -> {39};
     39 -> {40};
-    40 -> {46 42};
+    40 -> {42 46};
     40 -> {41} [style=dotted];
     40 -> {46} [style=dashed];
     41 -> {42};
@@ -196,8 +196,8 @@ digraph returnValuesFromLambda_kt {
     55 -> {56 57} [style=dotted];
     55 -> {62} [style=dashed];
     56 -> {57} [style=dotted];
+    57 -> {61} [style=dotted label="onUncaughtException"];
     57 -> {58} [style=dotted];
-    57 -> {61} [style=dotted]    [label=onUncaughtException];
     58 -> {59} [style=dotted];
     59 -> {60} [style=dotted];
     60 -> {61} [style=dotted];

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

@@ -53,7 +53,7 @@ digraph safeCalls_kt {
     9 -> {10};
     10 -> {11 16};
     11 -> {12};
-    12 -> {16 13};
+    12 -> {13 16};
     13 -> {14};
     14 -> {15};
     15 -> {17};
@@ -82,7 +82,7 @@ digraph safeCalls_kt {
     21 -> {22};
     22 -> {23 27};
     23 -> {24};
-    24 -> {27 25};
+    24 -> {25 27};
     25 -> {26};
     26 -> {28};
     27 -> {28};
@@ -140,7 +140,7 @@ digraph safeCalls_kt {
     40 -> {41};
     41 -> {42};
     42 -> {43};
-    43 -> {45 44};
+    43 -> {44 45};
     44 -> {52};
     45 -> {46};
     46 -> {47};

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

@@ -58,15 +58,15 @@ digraph tryCatch_kt {
     }
     0 -> {1};
     1 -> {2};
-    2 -> {3 16 9};
+    2 -> {3 9 16};
     3 -> {4};
     4 -> {5};
     5 -> {6};
     6 -> {7};
     7 -> {8};
-    8 -> {23 16 9};
+    8 -> {9 16 23};
     9 -> {10};
-    9 -> {25}    [label=onUncaughtException];
+    9 -> {25} [label="onUncaughtException"];
     10 -> {11};
     11 -> {12};
     12 -> {13};
@@ -74,7 +74,7 @@ digraph tryCatch_kt {
     14 -> {15};
     15 -> {23};
     16 -> {17};
-    16 -> {25}    [label=onUncaughtException];
+    16 -> {25} [label="onUncaughtException"];
     17 -> {18};
     18 -> {19};
     19 -> {20};
@@ -130,9 +130,9 @@ digraph tryCatch_kt {
     30 -> {31};
     31 -> {32};
     32 -> {33};
-    33 -> {40 34};
+    33 -> {34 40};
     34 -> {35};
-    34 -> {43}    [label=onUncaughtException];
+    34 -> {43} [label="onUncaughtException"];
     35 -> {36};
     36 -> {37};
     37 -> {38};
@@ -272,13 +272,13 @@ digraph tryCatch_kt {
     49 -> {91} [style=dotted];
     50 -> {51};
     51 -> {52};
-    52 -> {53 95 84};
+    52 -> {53 84 95};
     53 -> {54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
     57 -> {58};
-    58 -> {60 59};
+    58 -> {59 60};
     59 -> {66};
     60 -> {61};
     61 -> {62};
@@ -294,7 +294,7 @@ digraph tryCatch_kt {
     70 -> {71};
     71 -> {72};
     72 -> {73};
-    73 -> {75 74};
+    73 -> {74 75};
     74 -> {81};
     75 -> {76};
     76 -> {77};
@@ -305,9 +305,9 @@ digraph tryCatch_kt {
     80 -> {81} [style=dotted];
     81 -> {82};
     82 -> {83};
-    83 -> {102 95 84};
+    83 -> {84 95 102};
     84 -> {85};
-    84 -> {107}    [label=onUncaughtException];
+    84 -> {107} [label="onUncaughtException"];
     85 -> {86};
     86 -> {87};
     87 -> {91};
@@ -320,11 +320,11 @@ digraph tryCatch_kt {
     93 -> {94};
     94 -> {107};
     95 -> {96};
-    95 -> {107}    [label=onUncaughtException];
+    95 -> {107} [label="onUncaughtException"];
     96 -> {97};
     97 -> {98};
-    98 -> {99} [style=dotted];
     98 -> {47} [color=green style=dashed];
+    98 -> {99} [style=dotted];
     99 -> {100} [style=dotted];
     100 -> {101} [style=dotted];
     101 -> {102} [style=dotted];

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

@@ -59,13 +59,13 @@ digraph variableInitializedInTryBlock_kt {
     1 -> {2};
     2 -> {3};
     3 -> {4};
-    3 -> {21}    [label=onUncaughtException];
+    3 -> {21} [label="onUncaughtException"];
     4 -> {5};
     5 -> {6};
     6 -> {7};
-    7 -> {11 8};
+    7 -> {8 11};
     8 -> {9};
-    9 -> {21}    [label="return@/test"];
+    9 -> {21} [label="return@/test"];
     9 -> {10} [style=dotted];
     10 -> {12} [style=dotted];
     11 -> {12};
@@ -83,7 +83,7 @@ digraph variableInitializedInTryBlock_kt {
     23 -> {24};
     24 -> {25};
     25 -> {26};
-    25 -> {30}    [label="return@/test"];
+    25 -> {30} [label="return@/test"];
     26 -> {27};
     27 -> {28};
     28 -> {29};

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

@@ -92,21 +92,21 @@ digraph when_kt {
     4 -> {5};
     5 -> {6};
     6 -> {7};
-    7 -> {40 8};
+    7 -> {8 40};
     8 -> {9};
     9 -> {10};
     10 -> {11};
     11 -> {12};
     12 -> {13};
     13 -> {14};
-    14 -> {35 15};
+    14 -> {15 35};
     15 -> {16};
     16 -> {17};
     17 -> {18};
     18 -> {19};
     19 -> {20};
     20 -> {21};
-    21 -> {29 22};
+    21 -> {22 29};
     22 -> {23};
     23 -> {24};
     24 -> {25};
@@ -199,13 +199,13 @@ digraph when_kt {
     57 -> {58};
     58 -> {59};
     59 -> {60};
-    60 -> {65 61};
+    60 -> {61 65};
     61 -> {62};
     62 -> {63};
     63 -> {64};
     64 -> {65};
     65 -> {66};
-    66 -> {68 67};
+    66 -> {67 68};
     67 -> {75};
     68 -> {69};
     69 -> {70};

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

@@ -37,7 +37,7 @@ digraph classCallInLambda_kt {
     0 -> {1};
     1 -> {2};
     2 -> {3};
-    3 -> {10 5};
+    3 -> {5 10};
     3 -> {4} [style=dotted];
     3 -> {10} [style=dashed];
     4 -> {5};

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

@@ -66,7 +66,7 @@ digraph elvisReturnSimple_kt {
     4 -> {5};
     5 -> {6};
     6 -> {7};
-    7 -> {15 8};
+    7 -> {8 15};
     8 -> {9};
     9 -> {10};
     10 -> {11};

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

@@ -119,7 +119,7 @@ digraph exhaustiveWhenAndDNNType_kt {
     24 -> {25};
     25 -> {26};
     26 -> {27};
-    27 -> {39 28};
+    27 -> {28 39};
     28 -> {29};
     29 -> {30};
     30 -> {31};
@@ -212,7 +212,7 @@ digraph exhaustiveWhenAndDNNType_kt {
     60 -> {61};
     61 -> {62};
     62 -> {63};
-    63 -> {75 64};
+    63 -> {64 75};
     64 -> {65};
     65 -> {66};
     66 -> {67};
@@ -303,7 +303,7 @@ digraph exhaustiveWhenAndDNNType_kt {
     95 -> {96};
     96 -> {97};
     97 -> {98};
-    98 -> {110 99};
+    98 -> {99 110};
     99 -> {100};
     100 -> {101};
     101 -> {102};

compiler/fir/analysis-tests/testData/resolve/problems/secondaryConstructorCfg.dot

@@ -90,14 +90,14 @@ digraph secondaryConstructorCfg_kt {
         31 [label="Exit class B" style="filled" fillcolor=red];
     }
     27 -> {28} [color=green];
-    28 -> {29} [style=dotted];
     28 -> {3} [color=green];
+    28 -> {29} [style=dotted];
     28 -> {3} [style=dashed];
-    29 -> {30} [style=dotted];
     29 -> {6} [color=green];
+    29 -> {30} [style=dotted];
     29 -> {6} [style=dashed];
-    30 -> {31} [style=dotted];
     30 -> {18} [color=green];
+    30 -> {31} [style=dotted];
     30 -> {18} [style=dashed];
 
 }

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

@@ -87,7 +87,7 @@ digraph bangbang_kt {
     18 -> {19};
     19 -> {20};
     20 -> {21};
-    21 -> {23 22};
+    21 -> {22 23};
     22 -> {30};
     23 -> {24};
     24 -> {25};
@@ -155,11 +155,11 @@ digraph bangbang_kt {
     41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {47 45};
+    44 -> {45 47};
     45 -> {46};
     46 -> {47};
     47 -> {48};
-    48 -> {50 49};
+    48 -> {49 50};
     49 -> {57};
     50 -> {51};
     51 -> {52};
@@ -224,13 +224,13 @@ digraph bangbang_kt {
     66 -> {67};
     67 -> {68};
     68 -> {69};
-    69 -> {74 70};
+    69 -> {70 74};
     70 -> {71};
     71 -> {72};
     72 -> {73};
     73 -> {74};
     74 -> {75};
-    75 -> {77 76};
+    75 -> {76 77};
     76 -> {84};
     77 -> {78};
     78 -> {79};
@@ -297,11 +297,11 @@ digraph bangbang_kt {
     94 -> {95};
     95 -> {96};
     96 -> {97};
-    97 -> {100 98};
+    97 -> {98 100};
     98 -> {99};
     99 -> {100};
     100 -> {101};
-    101 -> {103 102};
+    101 -> {102 103};
     102 -> {110};
     103 -> {104};
     104 -> {105};
@@ -365,13 +365,13 @@ digraph bangbang_kt {
     119 -> {120};
     120 -> {121};
     121 -> {122};
-    122 -> {127 123};
+    122 -> {123 127};
     123 -> {124};
     124 -> {125};
     125 -> {126};
     126 -> {127};
     127 -> {128};
-    128 -> {130 129};
+    128 -> {129 130};
     129 -> {136};
     130 -> {131};
     131 -> {132};

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

@@ -108,13 +108,13 @@ digraph booleanOperators_kt {
     18 -> {19};
     19 -> {20};
     20 -> {21};
-    21 -> {26 22};
+    21 -> {22 26};
     22 -> {23};
     23 -> {24};
     24 -> {25};
     25 -> {26};
     26 -> {27};
-    27 -> {29 28};
+    27 -> {28 29};
     28 -> {42};
     29 -> {30};
     30 -> {31};
@@ -187,12 +187,12 @@ digraph booleanOperators_kt {
     49 -> {50};
     50 -> {51};
     51 -> {52};
-    52 -> {56 53};
+    52 -> {53 56};
     53 -> {54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
-    57 -> {59 58};
+    57 -> {58 59};
     58 -> {72};
     59 -> {60};
     60 -> {61};
@@ -251,7 +251,7 @@ digraph booleanOperators_kt {
     79 -> {80};
     80 -> {81};
     81 -> {82};
-    82 -> {84 83};
+    82 -> {83 84};
     83 -> {91};
     84 -> {85};
     85 -> {86};
@@ -316,7 +316,7 @@ digraph booleanOperators_kt {
     98 -> {99};
     99 -> {100};
     100 -> {101};
-    101 -> {108 102};
+    101 -> {102 108};
     102 -> {103};
     103 -> {104};
     104 -> {105};
@@ -324,7 +324,7 @@ digraph booleanOperators_kt {
     106 -> {107};
     107 -> {108};
     108 -> {109};
-    109 -> {111 110};
+    109 -> {110 111};
     110 -> {117};
     111 -> {112};
     112 -> {113};
@@ -387,13 +387,13 @@ digraph booleanOperators_kt {
     126 -> {127};
     127 -> {128};
     128 -> {129};
-    129 -> {134 130};
+    129 -> {130 134};
     130 -> {131};
     131 -> {132};
     132 -> {133};
     133 -> {134};
     134 -> {135};
-    135 -> {137 136};
+    135 -> {136 137};
     136 -> {144};
     137 -> {138};
     138 -> {139};
@@ -446,7 +446,7 @@ digraph booleanOperators_kt {
     151 -> {152};
     152 -> {153};
     153 -> {154};
-    154 -> {156 155};
+    154 -> {155 156};
     155 -> {163};
     156 -> {157};
     157 -> {158};
@@ -505,11 +505,11 @@ digraph booleanOperators_kt {
     170 -> {171};
     171 -> {172};
     172 -> {173};
-    173 -> {176 174};
+    173 -> {174 176};
     174 -> {175};
     175 -> {176};
     176 -> {177};
-    177 -> {179 178};
+    177 -> {178 179};
     178 -> {185};
     179 -> {180};
     180 -> {181};
@@ -572,7 +572,7 @@ digraph booleanOperators_kt {
     196 -> {197};
     197 -> {198};
     198 -> {199};
-    199 -> {201 200};
+    199 -> {200 201};
     200 -> {207};
     201 -> {202};
     202 -> {203};
@@ -630,11 +630,11 @@ digraph booleanOperators_kt {
     214 -> {215};
     215 -> {216};
     216 -> {217};
-    217 -> {220 218};
+    217 -> {218 220};
     218 -> {219};
     219 -> {220};
     220 -> {221};
-    221 -> {223 222};
+    221 -> {222 223};
     222 -> {229};
     223 -> {224};
     224 -> {225};
@@ -697,7 +697,7 @@ digraph booleanOperators_kt {
     240 -> {241} [style=dotted];
     241 -> {242} [style=dotted];
     242 -> {243};
-    243 -> {245 244};
+    243 -> {244 245};
     244 -> {251};
     245 -> {246};
     246 -> {247};
@@ -760,7 +760,7 @@ digraph booleanOperators_kt {
     262 -> {263} [style=dotted];
     263 -> {264} [style=dotted];
     264 -> {265};
-    265 -> {267 266};
+    265 -> {266 267};
     266 -> {273};
     267 -> {268};
     268 -> {269};
@@ -819,11 +819,11 @@ digraph booleanOperators_kt {
     280 -> {281};
     281 -> {282};
     282 -> {283};
-    283 -> {286 284};
+    283 -> {284 286};
     284 -> {285};
     285 -> {286};
     286 -> {287};
-    287 -> {289 288};
+    287 -> {288 289};
     288 -> {296};
     289 -> {290};
     290 -> {291};
@@ -888,7 +888,7 @@ digraph booleanOperators_kt {
     307 -> {308};
     308 -> {309};
     309 -> {310};
-    310 -> {312 311};
+    310 -> {311 312};
     311 -> {319};
     312 -> {313};
     313 -> {314};
@@ -948,11 +948,11 @@ digraph booleanOperators_kt {
     326 -> {327};
     327 -> {328};
     328 -> {329};
-    329 -> {332 330};
+    329 -> {330 332};
     330 -> {331};
     331 -> {332};
     332 -> {333};
-    333 -> {335 334};
+    333 -> {334 335};
     334 -> {342};
     335 -> {336};
     336 -> {337};

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

@@ -75,7 +75,7 @@ digraph equalsToBoolean_kt {
     10 -> {11};
     11 -> {12};
     12 -> {13};
-    13 -> {22 14};
+    13 -> {14 22};
     14 -> {15};
     15 -> {16};
     16 -> {17};
@@ -152,7 +152,7 @@ digraph equalsToBoolean_kt {
     38 -> {39};
     39 -> {40};
     40 -> {41};
-    41 -> {51 42};
+    41 -> {42 51};
     42 -> {43};
     43 -> {44};
     44 -> {45};
@@ -229,7 +229,7 @@ digraph equalsToBoolean_kt {
     66 -> {67};
     67 -> {68};
     68 -> {69};
-    69 -> {79 70};
+    69 -> {70 79};
     70 -> {71};
     71 -> {72};
     72 -> {73};
@@ -306,7 +306,7 @@ digraph equalsToBoolean_kt {
     94 -> {95};
     95 -> {96};
     96 -> {97};
-    97 -> {106 98};
+    97 -> {98 106};
     98 -> {99};
     99 -> {100};
     100 -> {101};
@@ -383,7 +383,7 @@ digraph equalsToBoolean_kt {
     122 -> {123};
     123 -> {124};
     124 -> {125};
-    125 -> {135 126};
+    125 -> {126 135};
     126 -> {127};
     127 -> {128};
     128 -> {129};
@@ -460,7 +460,7 @@ digraph equalsToBoolean_kt {
     150 -> {151};
     151 -> {152};
     152 -> {153};
-    153 -> {162 154};
+    153 -> {154 162};
     154 -> {155};
     155 -> {156};
     156 -> {157};
@@ -537,7 +537,7 @@ digraph equalsToBoolean_kt {
     178 -> {179};
     179 -> {180};
     180 -> {181};
-    181 -> {190 182};
+    181 -> {182 190};
     182 -> {183};
     183 -> {184};
     184 -> {185};
@@ -614,7 +614,7 @@ digraph equalsToBoolean_kt {
     206 -> {207};
     207 -> {208};
     208 -> {209};
-    209 -> {219 210};
+    209 -> {210 219};
     210 -> {211};
     211 -> {212};
     212 -> {213};

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

@@ -49,10 +49,10 @@ digraph jumpFromRhsOfOperator_kt {
     7 -> {8};
     8 -> {9};
     9 -> {10};
-    10 -> {15 11};
+    10 -> {11 15};
     11 -> {12};
     12 -> {13};
-    13 -> {20}    [label=onUncaughtException];
+    13 -> {20} [label="onUncaughtException"];
     13 -> {14} [style=dotted];
     14 -> {15} [style=dotted];
     15 -> {16};
@@ -93,10 +93,10 @@ digraph jumpFromRhsOfOperator_kt {
     24 -> {25};
     25 -> {26};
     26 -> {27};
-    27 -> {32 28};
+    27 -> {28 32};
     28 -> {29};
     29 -> {30};
-    30 -> {37}    [label=onUncaughtException];
+    30 -> {37} [label="onUncaughtException"];
     30 -> {31} [style=dotted];
     31 -> {32} [style=dotted];
     32 -> {33};
@@ -160,14 +160,14 @@ digraph jumpFromRhsOfOperator_kt {
     43 -> {44};
     44 -> {45};
     45 -> {46};
-    46 -> {51 47};
+    46 -> {47 51};
     47 -> {48};
     48 -> {49};
-    49 -> {66}    [label=onUncaughtException];
+    49 -> {66} [label="onUncaughtException"];
     49 -> {50} [style=dotted];
     50 -> {51} [style=dotted];
     51 -> {52};
-    52 -> {54 53};
+    52 -> {53 54};
     53 -> {61};
     54 -> {55};
     55 -> {56};
@@ -237,14 +237,14 @@ digraph jumpFromRhsOfOperator_kt {
     72 -> {73};
     73 -> {74};
     74 -> {75};
-    75 -> {80 76};
+    75 -> {76 80};
     76 -> {77};
     77 -> {78};
-    78 -> {95}    [label=onUncaughtException];
+    78 -> {95} [label="onUncaughtException"];
     78 -> {79} [style=dotted];
     79 -> {80} [style=dotted];
     80 -> {81};
-    81 -> {83 82};
+    81 -> {82 83};
     82 -> {90};
     83 -> {84};
     84 -> {85};
@@ -291,10 +291,10 @@ digraph jumpFromRhsOfOperator_kt {
     99 -> {100};
     100 -> {101};
     101 -> {102};
-    102 -> {107 103};
+    102 -> {103 107};
     103 -> {104};
     104 -> {105};
-    105 -> {112}    [label=onUncaughtException];
+    105 -> {112} [label="onUncaughtException"];
     105 -> {106} [style=dotted];
     106 -> {107} [style=dotted];
     107 -> {108};
@@ -335,10 +335,10 @@ digraph jumpFromRhsOfOperator_kt {
     116 -> {117};
     117 -> {118};
     118 -> {119};
-    119 -> {124 120};
+    119 -> {120 124};
     120 -> {121};
     121 -> {122};
-    122 -> {129}    [label=onUncaughtException];
+    122 -> {129} [label="onUncaughtException"];
     122 -> {123} [style=dotted];
     123 -> {124} [style=dotted];
     124 -> {125};
@@ -402,14 +402,14 @@ digraph jumpFromRhsOfOperator_kt {
     135 -> {136};
     136 -> {137};
     137 -> {138};
-    138 -> {143 139};
+    138 -> {139 143};
     139 -> {140};
     140 -> {141};
-    141 -> {158}    [label=onUncaughtException];
+    141 -> {158} [label="onUncaughtException"];
     141 -> {142} [style=dotted];
     142 -> {143} [style=dotted];
     143 -> {144};
-    144 -> {146 145};
+    144 -> {145 146};
     145 -> {153};
     146 -> {147};
     147 -> {148};
@@ -479,14 +479,14 @@ digraph jumpFromRhsOfOperator_kt {
     164 -> {165};
     165 -> {166};
     166 -> {167};
-    167 -> {172 168};
+    167 -> {168 172};
     168 -> {169};
     169 -> {170};
-    170 -> {187}    [label=onUncaughtException];
+    170 -> {187} [label="onUncaughtException"];
     170 -> {171} [style=dotted];
     171 -> {172} [style=dotted];
     172 -> {173};
-    173 -> {175 174};
+    173 -> {174 175};
     174 -> {182};
     175 -> {176};
     176 -> {177};

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

@@ -77,7 +77,7 @@ digraph boundSmartcasts_kt {
     13 -> {14};
     14 -> {15};
     15 -> {16};
-    16 -> {18 17};
+    16 -> {17 18};
     17 -> {28};
     18 -> {19};
     19 -> {20};
@@ -138,7 +138,7 @@ digraph boundSmartcasts_kt {
     36 -> {37};
     37 -> {38};
     38 -> {39};
-    39 -> {41 40};
+    39 -> {40 41};
     40 -> {51};
     41 -> {42};
     42 -> {43};
@@ -224,7 +224,7 @@ digraph boundSmartcasts_kt {
     59 -> {60};
     60 -> {61};
     61 -> {62};
-    62 -> {64 63};
+    62 -> {63 64};
     63 -> {71};
     64 -> {65};
     65 -> {66};
@@ -240,7 +240,7 @@ digraph boundSmartcasts_kt {
     75 -> {76};
     76 -> {77};
     77 -> {78};
-    78 -> {80 79};
+    78 -> {79 80};
     79 -> {90};
     80 -> {81};
     81 -> {82};
@@ -319,7 +319,7 @@ digraph boundSmartcasts_kt {
     107 -> {108};
     108 -> {109};
     109 -> {110};
-    110 -> {112 111};
+    110 -> {111 112};
     111 -> {122};
     112 -> {113};
     113 -> {114};
@@ -360,8 +360,8 @@ digraph boundSmartcasts_kt {
         133 [label="Exit class D" style="filled" fillcolor=red];
     }
     131 -> {132} [color=green];
-    132 -> {133} [style=dotted];
     132 -> {128} [color=green];
+    132 -> {133} [style=dotted];
     132 -> {128} [style=dashed];
 
     subgraph cluster_30 {
@@ -412,7 +412,7 @@ digraph boundSmartcasts_kt {
     139 -> {140};
     140 -> {141};
     141 -> {142};
-    142 -> {146 143};
+    142 -> {143 146};
     143 -> {144};
     144 -> {161};
     144 -> {145} [style=dotted];

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

@@ -29,8 +29,8 @@ digraph boundSmartcastsInBranches_kt {
         8 [label="Exit class A" style="filled" fillcolor=red];
     }
     6 -> {7} [color=green];
-    7 -> {8} [style=dotted];
     7 -> {3} [color=green];
+    7 -> {8} [style=dotted];
     7 -> {3} [style=dashed];
 
     subgraph cluster_3 {
@@ -118,7 +118,7 @@ digraph boundSmartcastsInBranches_kt {
     18 -> {19};
     19 -> {20};
     20 -> {21};
-    21 -> {48 22};
+    21 -> {22 48};
     22 -> {23};
     23 -> {24};
     24 -> {25};
@@ -129,14 +129,14 @@ digraph boundSmartcastsInBranches_kt {
     29 -> {30};
     30 -> {31};
     31 -> {32};
-    32 -> {34 33};
+    32 -> {33 34};
     33 -> {42};
     34 -> {35};
     35 -> {36};
     36 -> {37};
     37 -> {38};
-    38 -> {39} [style=dotted];
     38 -> {18} [color=green style=dashed];
+    38 -> {39} [style=dotted];
     39 -> {40} [style=dotted];
     40 -> {41} [style=dotted];
     41 -> {42} [style=dotted];
@@ -204,7 +204,7 @@ digraph boundSmartcastsInBranches_kt {
     55 -> {56};
     56 -> {57};
     57 -> {58};
-    58 -> {67 59};
+    58 -> {59 67};
     59 -> {60};
     60 -> {61};
     61 -> {62};
@@ -281,7 +281,7 @@ digraph boundSmartcastsInBranches_kt {
     82 -> {83};
     83 -> {84};
     84 -> {85};
-    85 -> {96 86};
+    85 -> {86 96};
     86 -> {87};
     87 -> {88};
     88 -> {89};
@@ -361,7 +361,7 @@ digraph boundSmartcastsInBranches_kt {
     111 -> {112};
     112 -> {113};
     113 -> {114};
-    114 -> {126 115};
+    114 -> {115 126};
     115 -> {116};
     116 -> {117};
     117 -> {118};
@@ -444,7 +444,7 @@ digraph boundSmartcastsInBranches_kt {
     141 -> {142};
     142 -> {143};
     143 -> {144};
-    144 -> {153 145};
+    144 -> {145 153};
     145 -> {146};
     146 -> {147};
     147 -> {148};
@@ -529,7 +529,7 @@ digraph boundSmartcastsInBranches_kt {
     173 -> {174};
     174 -> {175};
     175 -> {176};
-    176 -> {185 177};
+    176 -> {177 185};
     177 -> {178};
     178 -> {179};
     179 -> {180};
@@ -784,7 +784,7 @@ digraph boundSmartcastsInBranches_kt {
     222 -> {223};
     223 -> {224};
     224 -> {225};
-    225 -> {227 226};
+    225 -> {226 227};
     226 -> {238};
     227 -> {228};
     228 -> {229};
@@ -803,7 +803,7 @@ digraph boundSmartcastsInBranches_kt {
     241 -> {242};
     242 -> {243};
     243 -> {244};
-    244 -> {246 245};
+    244 -> {245 246};
     245 -> {257};
     246 -> {247};
     247 -> {248};
@@ -822,7 +822,7 @@ digraph boundSmartcastsInBranches_kt {
     260 -> {261};
     261 -> {262};
     262 -> {263};
-    263 -> {265 264};
+    263 -> {264 265};
     264 -> {276};
     265 -> {266};
     266 -> {267};
@@ -843,7 +843,7 @@ digraph boundSmartcastsInBranches_kt {
     281 -> {282};
     282 -> {283};
     283 -> {284};
-    284 -> {286 285};
+    284 -> {285 286};
     285 -> {298};
     286 -> {287};
     287 -> {288};
@@ -864,14 +864,14 @@ digraph boundSmartcastsInBranches_kt {
     302 -> {303};
     303 -> {304};
     304 -> {305};
-    305 -> {307 306};
+    305 -> {306 307};
     306 -> {319};
     307 -> {308};
     308 -> {309};
     309 -> {310};
     310 -> {311};
     311 -> {312};
-    312 -> {341}    [label=onUncaughtException];
+    312 -> {341} [label="onUncaughtException"];
     312 -> {313} [style=dotted];
     313 -> {314} [style=dotted];
     314 -> {315} [style=dotted];
@@ -885,7 +885,7 @@ digraph boundSmartcastsInBranches_kt {
     322 -> {323};
     323 -> {324};
     324 -> {325};
-    325 -> {327 326};
+    325 -> {326 327};
     326 -> {339};
     327 -> {328};
     328 -> {329};
@@ -1113,7 +1113,7 @@ digraph boundSmartcastsInBranches_kt {
     352 -> {353};
     353 -> {354};
     354 -> {355};
-    355 -> {357 356};
+    355 -> {356 357};
     356 -> {370};
     357 -> {358};
     358 -> {359};
@@ -1134,7 +1134,7 @@ digraph boundSmartcastsInBranches_kt {
     373 -> {374};
     374 -> {375};
     375 -> {376};
-    376 -> {378 377};
+    376 -> {377 378};
     377 -> {391};
     378 -> {379};
     379 -> {380};
@@ -1155,7 +1155,7 @@ digraph boundSmartcastsInBranches_kt {
     394 -> {395};
     395 -> {396};
     396 -> {397};
-    397 -> {399 398};
+    397 -> {398 399};
     398 -> {412};
     399 -> {400};
     400 -> {401};
@@ -1178,7 +1178,7 @@ digraph boundSmartcastsInBranches_kt {
     417 -> {418};
     418 -> {419};
     419 -> {420};
-    420 -> {422 421};
+    420 -> {421 422};
     421 -> {435};
     422 -> {423};
     423 -> {424};
@@ -1200,14 +1200,14 @@ digraph boundSmartcastsInBranches_kt {
     439 -> {440};
     440 -> {441};
     441 -> {442};
-    442 -> {444 443};
+    442 -> {443 444};
     443 -> {456};
     444 -> {445};
     445 -> {446};
     446 -> {447};
     447 -> {448};
     448 -> {449};
-    449 -> {479}    [label=onUncaughtException];
+    449 -> {479} [label="onUncaughtException"];
     449 -> {450} [style=dotted];
     450 -> {451} [style=dotted];
     451 -> {452} [style=dotted];
@@ -1221,7 +1221,7 @@ digraph boundSmartcastsInBranches_kt {
     459 -> {460};
     460 -> {461};
     461 -> {462};
-    462 -> {464 463};
+    462 -> {463 464};
     463 -> {477};
     464 -> {465};
     465 -> {466};
@@ -1326,7 +1326,7 @@ digraph boundSmartcastsInBranches_kt {
     487 -> {488};
     488 -> {489};
     489 -> {490};
-    490 -> {500 491};
+    490 -> {491 500};
     491 -> {492};
     492 -> {493};
     493 -> {494};
@@ -1351,7 +1351,7 @@ digraph boundSmartcastsInBranches_kt {
     512 -> {513};
     513 -> {514};
     514 -> {515};
-    515 -> {517 516};
+    515 -> {516 517};
     516 -> {524};
     517 -> {518};
     518 -> {519};

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

@@ -45,8 +45,8 @@ digraph functionCallBound_kt {
         13 [label="Exit class Sub" style="filled" fillcolor=red];
     }
     11 -> {12} [color=green];
-    12 -> {13} [style=dotted];
     12 -> {8} [color=green];
+    12 -> {13} [style=dotted];
     12 -> {8} [style=dashed];
 
     subgraph cluster_5 {
@@ -141,7 +141,7 @@ digraph functionCallBound_kt {
     29 -> {30};
     30 -> {31};
     31 -> {32};
-    32 -> {40 33};
+    32 -> {33 40};
     33 -> {34};
     34 -> {35};
     35 -> {36};

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

@@ -69,7 +69,7 @@ digraph casts_kt {
     12 -> {13};
     13 -> {14};
     14 -> {15};
-    15 -> {17 16};
+    15 -> {16 17};
     16 -> {24};
     17 -> {18};
     18 -> {19};
@@ -200,12 +200,12 @@ digraph casts_kt {
     33 -> {34};
     34 -> {35};
     35 -> {36};
-    36 -> {40 37};
+    36 -> {37 40};
     37 -> {38};
     38 -> {39};
     39 -> {40};
     40 -> {41};
-    41 -> {43 42};
+    41 -> {42 43};
     42 -> {50};
     43 -> {44};
     44 -> {45};
@@ -221,14 +221,14 @@ digraph casts_kt {
     54 -> {55};
     55 -> {56};
     56 -> {57};
-    57 -> {63 58};
+    57 -> {58 63};
     58 -> {59};
     59 -> {60};
     60 -> {61};
     61 -> {62};
     62 -> {63};
     63 -> {64};
-    64 -> {66 65};
+    64 -> {65 66};
     65 -> {73};
     66 -> {67};
     67 -> {68};
@@ -244,12 +244,12 @@ digraph casts_kt {
     77 -> {78};
     78 -> {79};
     79 -> {80};
-    80 -> {84 81};
+    80 -> {81 84};
     81 -> {82};
     82 -> {83};
     83 -> {84};
     84 -> {85};
-    85 -> {87 86};
+    85 -> {86 87};
     86 -> {93};
     87 -> {88};
     88 -> {89};
@@ -360,7 +360,7 @@ digraph casts_kt {
     103 -> {104};
     104 -> {105};
     105 -> {106};
-    106 -> {115 107};
+    106 -> {107 115};
     107 -> {108};
     108 -> {109};
     109 -> {110};
@@ -385,7 +385,7 @@ digraph casts_kt {
     128 -> {129};
     129 -> {130};
     130 -> {131};
-    131 -> {141 132};
+    131 -> {132 141};
     132 -> {133};
     133 -> {134};
     134 -> {135};

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

@@ -66,14 +66,14 @@ digraph elvis_kt {
     9 -> {10};
     10 -> {11};
     11 -> {12};
-    12 -> {16 13};
+    12 -> {13 16};
     13 -> {14};
     14 -> {29};
     14 -> {15} [style=dotted];
     15 -> {17} [style=dotted];
     16 -> {17};
     17 -> {18};
-    18 -> {20 19};
+    18 -> {19 20};
     19 -> {27};
     20 -> {21};
     21 -> {22};
@@ -157,7 +157,7 @@ digraph elvis_kt {
     33 -> {34};
     34 -> {35};
     35 -> {36};
-    36 -> {38 37};
+    36 -> {37 38};
     37 -> {45};
     38 -> {39};
     39 -> {40};
@@ -172,7 +172,7 @@ digraph elvis_kt {
     47 -> {48};
     48 -> {49};
     49 -> {50};
-    50 -> {52 51};
+    50 -> {51 52};
     51 -> {59};
     52 -> {53};
     53 -> {54};
@@ -185,7 +185,7 @@ digraph elvis_kt {
     59 -> {60};
     60 -> {61};
     61 -> {62};
-    62 -> {66 63};
+    62 -> {63 66};
     63 -> {64};
     64 -> {65};
     65 -> {67};

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

@@ -55,7 +55,7 @@ digraph returns_kt {
     3 -> {4};
     4 -> {5};
     5 -> {6};
-    6 -> {13 7};
+    6 -> {7 13};
     7 -> {8};
     8 -> {9};
     9 -> {10};
@@ -129,7 +129,7 @@ digraph returns_kt {
     28 -> {29};
     29 -> {30};
     30 -> {31};
-    31 -> {40 32};
+    31 -> {32 40};
     32 -> {33};
     33 -> {34};
     34 -> {35};
@@ -272,11 +272,11 @@ digraph returns_kt {
     68 -> {69};
     69 -> {70};
     70 -> {71};
-    71 -> {91 72};
+    71 -> {72 91};
     72 -> {73};
     73 -> {74};
     74 -> {75};
-    75 -> {84 76};
+    75 -> {76 84};
     76 -> {77};
     77 -> {78};
     78 -> {79};
@@ -374,11 +374,11 @@ digraph returns_kt {
     113 -> {114};
     114 -> {115};
     115 -> {116};
-    116 -> {129 117};
+    116 -> {117 129};
     117 -> {118};
     118 -> {119};
     119 -> {120};
-    120 -> {122 121};
+    120 -> {121 122};
     121 -> {136};
     122 -> {123};
     123 -> {124};
@@ -494,7 +494,7 @@ digraph returns_kt {
     165 -> {166};
     166 -> {167};
     167 -> {168};
-    168 -> {172 169};
+    168 -> {169 172};
     169 -> {170};
     170 -> {179};
     170 -> {171} [style=dotted];
@@ -502,7 +502,7 @@ digraph returns_kt {
     172 -> {173};
     173 -> {174};
     174 -> {175};
-    175 -> {176 180 177};
+    175 -> {176 177 180};
     175 -> {180} [style=dashed];
     176 -> {177};
     177 -> {178};

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

@@ -44,7 +44,7 @@ digraph simpleIf_kt {
     3 -> {4};
     4 -> {5};
     5 -> {6};
-    6 -> {8 7};
+    6 -> {7 8};
     7 -> {15};
     8 -> {9};
     9 -> {10};
@@ -103,7 +103,7 @@ digraph simpleIf_kt {
     25 -> {26};
     26 -> {27};
     27 -> {28};
-    28 -> {30 29};
+    28 -> {29 30};
     29 -> {37};
     30 -> {31};
     31 -> {32};
@@ -185,12 +185,12 @@ digraph simpleIf_kt {
     45 -> {46};
     46 -> {47};
     47 -> {48};
-    48 -> {70 49};
+    48 -> {49 70};
     49 -> {50};
     50 -> {51};
     51 -> {52};
     52 -> {53};
-    53 -> {66 54};
+    53 -> {54 66};
     54 -> {55};
     55 -> {56};
     56 -> {57};

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

@@ -84,7 +84,7 @@ digraph smartcastFromArgument_kt {
     14 -> {15};
     15 -> {16};
     16 -> {17};
-    17 -> {21 18};
+    17 -> {18 21};
     18 -> {19};
     19 -> {35};
     19 -> {20} [style=dotted];
@@ -92,7 +92,7 @@ digraph smartcastFromArgument_kt {
     21 -> {22};
     22 -> {23};
     23 -> {24};
-    24 -> {26 25};
+    24 -> {25 26};
     25 -> {33};
     26 -> {27};
     27 -> {28};

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

@@ -166,11 +166,11 @@ digraph when_kt {
     11 -> {12};
     12 -> {13};
     13 -> {14};
-    14 -> {27 15};
+    14 -> {15 27};
     15 -> {16};
     16 -> {17};
     17 -> {18};
-    18 -> {20 19};
+    18 -> {19 20};
     19 -> {34};
     20 -> {21};
     21 -> {22};
@@ -191,17 +191,17 @@ digraph when_kt {
     36 -> {37};
     37 -> {38};
     38 -> {39};
-    39 -> {82 40};
+    39 -> {40 82};
     40 -> {41};
     41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {75 45};
+    44 -> {45 75};
     45 -> {46};
     46 -> {47};
     47 -> {48};
     48 -> {49};
-    49 -> {62 50};
+    49 -> {50 62};
     50 -> {51};
     51 -> {52};
     52 -> {53};
@@ -377,11 +377,11 @@ digraph when_kt {
     93 -> {94};
     94 -> {95};
     95 -> {96};
-    96 -> {109 97};
+    96 -> {97 109};
     97 -> {98};
     98 -> {99};
     99 -> {100};
-    100 -> {102 101};
+    100 -> {101 102};
     101 -> {116};
     102 -> {103};
     103 -> {104};
@@ -403,15 +403,15 @@ digraph when_kt {
     119 -> {120};
     120 -> {121};
     121 -> {122};
-    122 -> {163 123};
+    122 -> {123 163};
     123 -> {124};
     124 -> {125};
     125 -> {126};
-    126 -> {156 127};
+    126 -> {127 156};
     127 -> {128};
     128 -> {129};
     129 -> {130};
-    130 -> {143 131};
+    130 -> {131 143};
     131 -> {132};
     132 -> {133};
     133 -> {134};
@@ -614,11 +614,11 @@ digraph when_kt {
     175 -> {176};
     176 -> {177};
     177 -> {178};
-    178 -> {194 179};
+    178 -> {179 194};
     179 -> {180};
     180 -> {181};
     181 -> {182};
-    182 -> {184 183};
+    182 -> {183 184};
     183 -> {204};
     184 -> {185};
     185 -> {186};
@@ -647,15 +647,15 @@ digraph when_kt {
     208 -> {209};
     209 -> {210};
     210 -> {211};
-    211 -> {270 212};
+    211 -> {212 270};
     212 -> {213};
     213 -> {214};
     214 -> {215};
-    215 -> {260 216};
+    215 -> {216 260};
     216 -> {217};
     217 -> {218};
     218 -> {219};
-    219 -> {238 220};
+    219 -> {220 238};
     220 -> {221};
     221 -> {222};
     222 -> {223};
@@ -761,7 +761,7 @@ digraph when_kt {
     283 -> {284};
     284 -> {285};
     285 -> {286};
-    286 -> {288 287};
+    286 -> {287 288};
     287 -> {295};
     288 -> {289};
     289 -> {290};

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

@@ -72,12 +72,12 @@ digraph whenSubjectExpression_kt {
     4 -> {5};
     5 -> {6};
     6 -> {7};
-    7 -> {27 8};
+    7 -> {8 27};
     8 -> {9};
     9 -> {10};
     10 -> {11};
     11 -> {12};
-    12 -> {22 13};
+    12 -> {13 22};
     13 -> {14};
     14 -> {15};
     15 -> {16};
@@ -171,12 +171,12 @@ digraph whenSubjectExpression_kt {
     40 -> {41};
     41 -> {42};
     42 -> {43};
-    43 -> {63 44};
+    43 -> {44 63};
     44 -> {45};
     45 -> {46};
     46 -> {47};
     47 -> {48};
-    48 -> {58 49};
+    48 -> {49 58};
     49 -> {50};
     50 -> {51};
     51 -> {52};

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

@@ -86,7 +86,7 @@ digraph equalsAndIdentity_kt {
     8 -> {9};
     9 -> {10};
     10 -> {11};
-    11 -> {13 12};
+    11 -> {12 13};
     12 -> {22};
     13 -> {14};
     14 -> {15};
@@ -103,7 +103,7 @@ digraph equalsAndIdentity_kt {
     25 -> {26};
     26 -> {27};
     27 -> {28};
-    28 -> {30 29};
+    28 -> {29 30};
     29 -> {39};
     30 -> {31};
     31 -> {32};
@@ -184,7 +184,7 @@ digraph equalsAndIdentity_kt {
     46 -> {47};
     47 -> {48};
     48 -> {49};
-    49 -> {51 50};
+    49 -> {50 51};
     50 -> {59};
     51 -> {52};
     52 -> {53};
@@ -200,7 +200,7 @@ digraph equalsAndIdentity_kt {
     62 -> {63};
     63 -> {64};
     64 -> {65};
-    65 -> {67 66};
+    65 -> {66 67};
     66 -> {75};
     67 -> {68};
     68 -> {69};
@@ -309,7 +309,7 @@ digraph equalsAndIdentity_kt {
     82 -> {83};
     83 -> {84};
     84 -> {85};
-    85 -> {87 86};
+    85 -> {86 87};
     86 -> {93};
     87 -> {88};
     88 -> {89};
@@ -325,7 +325,7 @@ digraph equalsAndIdentity_kt {
     97 -> {98};
     98 -> {99};
     99 -> {100};
-    100 -> {102 101};
+    100 -> {101 102};
     101 -> {112};
     102 -> {103};
     103 -> {104};
@@ -344,7 +344,7 @@ digraph equalsAndIdentity_kt {
     116 -> {117};
     117 -> {118};
     118 -> {119};
-    119 -> {121 120};
+    119 -> {120 121};
     120 -> {131};
     121 -> {122};
     122 -> {123};

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

@@ -103,12 +103,12 @@ digraph incorrectSmartcastToNothing_kt {
     8 -> {9};
     9 -> {10};
     10 -> {11};
-    11 -> {31 12};
+    11 -> {12 31};
     12 -> {13};
     13 -> {14};
     14 -> {15};
     15 -> {16};
-    16 -> {26 17};
+    16 -> {17 26};
     17 -> {18};
     18 -> {19};
     19 -> {20};
@@ -127,13 +127,13 @@ digraph incorrectSmartcastToNothing_kt {
     32 -> {33};
     33 -> {34 38};
     34 -> {35};
-    35 -> {46 37};
+    35 -> {37 46};
     35 -> {36} [style=dotted];
     35 -> {46} [style=dashed];
-    36 -> {41} [color=red];
     36 -> {37} [color=green];
+    36 -> {41} [color=red];
     37 -> {38};
-    38 -> {41 39};
+    38 -> {39 41};
     39 -> {40};
     40 -> {42};
     41 -> {42} [color=red];

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

@@ -83,11 +83,11 @@ digraph inPlaceLambdas_kt {
     11 -> {12};
     12 -> {13};
     13 -> {14};
-    14 -> {16 15};
+    14 -> {15 16};
     15 -> {23};
     16 -> {17};
     17 -> {18};
-    18 -> {26 20};
+    18 -> {20 26};
     18 -> {19} [style=dotted];
     18 -> {26} [style=dashed];
     19 -> {20};
@@ -134,7 +134,7 @@ digraph inPlaceLambdas_kt {
     }
     33 -> {34};
     34 -> {35};
-    35 -> {43 37};
+    35 -> {37 43};
     35 -> {36} [style=dotted];
     35 -> {43} [style=dashed];
     36 -> {37};
@@ -208,11 +208,11 @@ digraph inPlaceLambdas_kt {
     52 -> {53};
     53 -> {54};
     54 -> {55};
-    55 -> {57 56};
+    55 -> {56 57};
     56 -> {67};
     57 -> {58};
     58 -> {59};
-    59 -> {70 61};
+    59 -> {61 70};
     59 -> {60} [style=dotted];
     59 -> {70} [style=dashed];
     60 -> {61};

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

@@ -56,7 +56,7 @@ digraph lambdaInWhenBranch_kt {
         }
         14 [label="Exit function copy" style="filled" fillcolor=red];
     }
-    13 -> {15 14};
+    13 -> {14 15};
     15 -> {16};
     15 -> {15} [style=dashed];
     16 -> {17};
@@ -68,8 +68,8 @@ digraph lambdaInWhenBranch_kt {
         20 [label="Exit class SubClass1" style="filled" fillcolor=red];
     }
     18 -> {19} [color=green];
-    19 -> {20} [style=dotted];
     19 -> {8} [color=green];
+    19 -> {20} [style=dotted];
     19 -> {8} [style=dashed];
 
     subgraph cluster_8 {
@@ -203,7 +203,7 @@ digraph lambdaInWhenBranch_kt {
     32 -> {33};
     33 -> {34};
     34 -> {35};
-    35 -> {45 36};
+    35 -> {36 45};
     36 -> {37};
     37 -> {38};
     38 -> {39};
@@ -216,11 +216,11 @@ digraph lambdaInWhenBranch_kt {
     45 -> {46};
     46 -> {47};
     47 -> {48};
-    48 -> {82 50};
+    48 -> {50 82};
     48 -> {49} [style=dotted];
     48 -> {82} [style=dashed];
-    49 -> {53} [color=red];
     49 -> {50} [color=green];
+    49 -> {53} [color=red];
     50 -> {51};
     51 -> {52};
     52 -> {53};
@@ -232,7 +232,7 @@ digraph lambdaInWhenBranch_kt {
     58 -> {59};
     59 -> {60};
     60 -> {61};
-    61 -> {71 62};
+    61 -> {62 71};
     62 -> {63};
     63 -> {64};
     64 -> {65};

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

@@ -42,7 +42,7 @@ digraph smartcastOnLambda_kt {
     4 -> {5};
     5 -> {6};
     6 -> {7};
-    7 -> {9 8};
+    7 -> {8 9};
     8 -> {14};
     9 -> {10};
     10 -> {11};

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

@@ -86,12 +86,12 @@ digraph dataFlowInfoFromWhileCondition_kt {
     14 -> {15};
     15 -> {16};
     16 -> {17};
-    17 -> {21 18};
+    17 -> {18 21};
     18 -> {19};
     19 -> {20};
     20 -> {21};
     21 -> {22};
-    22 -> {30 23};
+    22 -> {23 30};
     23 -> {24};
     24 -> {25};
     25 -> {26};

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

@@ -88,7 +88,7 @@ digraph endlessLoops_kt {
     14 -> {15};
     15 -> {16};
     16 -> {17};
-    17 -> {19 18};
+    17 -> {18 19};
     18 -> {25};
     19 -> {20};
     20 -> {21};
@@ -175,7 +175,7 @@ digraph endlessLoops_kt {
     42 -> {43};
     43 -> {44};
     44 -> {45};
-    45 -> {47 46};
+    45 -> {46 47};
     46 -> {55};
     47 -> {48};
     48 -> {49};
@@ -287,7 +287,7 @@ digraph endlessLoops_kt {
     74 -> {75};
     75 -> {76};
     76 -> {77};
-    77 -> {79 78};
+    77 -> {78 79};
     78 -> {85};
     79 -> {80};
     80 -> {81};
@@ -300,7 +300,7 @@ digraph endlessLoops_kt {
     86 -> {87};
     87 -> {88};
     88 -> {89};
-    89 -> {91 90};
+    89 -> {90 91};
     90 -> {97};
     91 -> {92};
     92 -> {93};
@@ -388,7 +388,7 @@ digraph endlessLoops_kt {
     114 -> {115};
     115 -> {116};
     116 -> {117};
-    117 -> {119 118};
+    117 -> {118 119};
     118 -> {127};
     119 -> {120};
     120 -> {121};
@@ -475,7 +475,7 @@ digraph endlessLoops_kt {
     142 -> {143};
     143 -> {144};
     144 -> {145};
-    145 -> {147 146};
+    145 -> {146 147};
     146 -> {155};
     147 -> {148};
     148 -> {149};
@@ -491,8 +491,8 @@ digraph endlessLoops_kt {
     157 -> {158};
     158 -> {159};
     159 -> {160};
-    160 -> {161} [style=dotted];
     160 -> {140} [color=green style=dashed];
+    160 -> {161} [style=dotted];
     161 -> {162};
     162 -> {163};
     163 -> {164};
@@ -566,7 +566,7 @@ digraph endlessLoops_kt {
     174 -> {175};
     175 -> {176};
     176 -> {177};
-    177 -> {179 178};
+    177 -> {178 179};
     178 -> {185};
     179 -> {180};
     180 -> {181};
@@ -580,8 +580,8 @@ digraph endlessLoops_kt {
     187 -> {188};
     188 -> {189};
     189 -> {190};
-    190 -> {191} [style=dotted];
     190 -> {170} [color=green style=dashed];
+    190 -> {191} [style=dotted];
     191 -> {192};
     192 -> {193};
     193 -> {194};
@@ -635,8 +635,8 @@ digraph endlessLoops_kt {
     205 -> {206};
     206 -> {207};
     207 -> {208};
-    208 -> {209} [style=dotted];
     208 -> {200} [color=green style=dashed];
+    208 -> {209} [style=dotted];
     209 -> {210} [style=dotted];
     210 -> {211} [style=dotted];
     211 -> {212} [style=dotted];

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

@@ -154,12 +154,12 @@ digraph multipleCasts_kt {
     41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {48 45};
+    44 -> {45 48};
     45 -> {46};
     46 -> {47};
     47 -> {48};
     48 -> {49};
-    49 -> {51 50};
+    49 -> {50 51};
     50 -> {61};
     51 -> {52};
     52 -> {53};

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

@@ -99,8 +99,8 @@ digraph nullability_kt {
         29 [label="Exit class QImpl" style="filled" fillcolor=red];
     }
     27 -> {28} [color=green];
-    28 -> {29} [style=dotted];
     28 -> {17} [color=green];
+    28 -> {29} [style=dotted];
     28 -> {17} [style=dashed];
 
     subgraph cluster_12 {
@@ -150,8 +150,8 @@ digraph nullability_kt {
         45 [label="Exit class QImplMutable" style="filled" fillcolor=red];
     }
     43 -> {44} [color=green];
-    44 -> {45} [style=dotted];
     44 -> {33} [color=green];
+    44 -> {45} [style=dotted];
     44 -> {33} [style=dashed];
 
     subgraph cluster_17 {
@@ -269,7 +269,7 @@ digraph nullability_kt {
     69 -> {70};
     70 -> {71};
     71 -> {72};
-    72 -> {82 73};
+    72 -> {73 82};
     73 -> {74};
     74 -> {75};
     75 -> {76};
@@ -348,7 +348,7 @@ digraph nullability_kt {
     98 -> {99};
     99 -> {100};
     100 -> {101};
-    101 -> {111 102};
+    101 -> {102 111};
     102 -> {103};
     103 -> {104};
     104 -> {105};
@@ -393,7 +393,7 @@ digraph nullability_kt {
     123 -> {124};
     124 -> {125};
     125 -> {126};
-    126 -> {130 127};
+    126 -> {127 130};
     127 -> {128};
     128 -> {136};
     128 -> {129} [style=dotted];
@@ -454,7 +454,7 @@ digraph nullability_kt {
     144 -> {145};
     145 -> {146};
     146 -> {147};
-    147 -> {149 148};
+    147 -> {148 149};
     148 -> {155};
     149 -> {150};
     150 -> {151};
@@ -530,9 +530,9 @@ digraph nullability_kt {
     164 -> {165};
     165 -> {166 172};
     166 -> {167};
-    167 -> {172 168};
+    167 -> {168 172};
     168 -> {169};
-    169 -> {173 170};
+    169 -> {170 173};
     170 -> {171};
     171 -> {174};
     172 -> {173};
@@ -540,7 +540,7 @@ digraph nullability_kt {
     174 -> {175};
     175 -> {176};
     176 -> {177};
-    177 -> {179 178};
+    177 -> {178 179};
     178 -> {198};
     179 -> {180};
     180 -> {181};
@@ -609,9 +609,9 @@ digraph nullability_kt {
     202 -> {203};
     203 -> {204 213};
     204 -> {205};
-    205 -> {213 206};
+    205 -> {206 213};
     206 -> {207};
-    207 -> {214 208};
+    207 -> {208 214};
     208 -> {209};
     209 -> {210};
     210 -> {211};
@@ -699,9 +699,9 @@ digraph nullability_kt {
     239 -> {240};
     240 -> {241 247};
     241 -> {242};
-    242 -> {247 243};
+    242 -> {243 247};
     243 -> {244};
-    244 -> {248 245};
+    244 -> {245 248};
     245 -> {246};
     246 -> {249};
     247 -> {248};
@@ -709,7 +709,7 @@ digraph nullability_kt {
     249 -> {250};
     250 -> {251};
     251 -> {252};
-    252 -> {254 253};
+    252 -> {253 254};
     253 -> {270};
     254 -> {255};
     255 -> {256};
@@ -771,7 +771,7 @@ digraph nullability_kt {
     277 -> {278};
     278 -> {279};
     279 -> {280};
-    280 -> {282 281};
+    280 -> {281 282};
     281 -> {289};
     282 -> {283};
     283 -> {284};
@@ -904,7 +904,7 @@ digraph nullability_kt {
     296 -> {297};
     297 -> {298};
     298 -> {299};
-    299 -> {301 300};
+    299 -> {300 301};
     300 -> {308};
     301 -> {302};
     302 -> {303};
@@ -921,7 +921,7 @@ digraph nullability_kt {
     313 -> {314};
     314 -> {315};
     315 -> {316};
-    316 -> {318 317};
+    316 -> {317 318};
     317 -> {325};
     318 -> {319};
     319 -> {320};
@@ -938,7 +938,7 @@ digraph nullability_kt {
     330 -> {331};
     331 -> {332};
     332 -> {333};
-    333 -> {335 334};
+    333 -> {334 335};
     334 -> {342};
     335 -> {336};
     336 -> {337};
@@ -955,7 +955,7 @@ digraph nullability_kt {
     347 -> {348};
     348 -> {349};
     349 -> {350};
-    350 -> {352 351};
+    350 -> {351 352};
     351 -> {359};
     352 -> {353};
     353 -> {354};
@@ -1086,7 +1086,7 @@ digraph nullability_kt {
     368 -> {369};
     369 -> {370};
     370 -> {371};
-    371 -> {373 372};
+    371 -> {372 373};
     372 -> {379};
     373 -> {374};
     374 -> {375};
@@ -1102,7 +1102,7 @@ digraph nullability_kt {
     384 -> {385};
     385 -> {386};
     386 -> {387};
-    387 -> {389 388};
+    387 -> {388 389};
     388 -> {395};
     389 -> {390};
     390 -> {391};
@@ -1118,7 +1118,7 @@ digraph nullability_kt {
     400 -> {401};
     401 -> {402};
     402 -> {403};
-    403 -> {405 404};
+    403 -> {404 405};
     404 -> {411};
     405 -> {406};
     406 -> {407};
@@ -1134,7 +1134,7 @@ digraph nullability_kt {
     416 -> {417};
     417 -> {418};
     418 -> {419};
-    419 -> {421 420};
+    419 -> {420 421};
     420 -> {427};
     421 -> {422};
     422 -> {423};
@@ -1248,9 +1248,9 @@ digraph nullability_kt {
     435 -> {436};
     436 -> {437 443};
     437 -> {438};
-    438 -> {443 439};
+    438 -> {439 443};
     439 -> {440};
-    440 -> {444 441};
+    440 -> {441 444};
     441 -> {442};
     442 -> {445};
     443 -> {444};
@@ -1258,7 +1258,7 @@ digraph nullability_kt {
     445 -> {446};
     446 -> {447};
     447 -> {448};
-    448 -> {450 449};
+    448 -> {449 450};
     449 -> {500};
     450 -> {451};
     451 -> {452};
@@ -1292,7 +1292,7 @@ digraph nullability_kt {
     479 -> {480};
     480 -> {481};
     481 -> {482};
-    482 -> {484 483};
+    482 -> {483 484};
     483 -> {497};
     484 -> {485};
     485 -> {486};
@@ -1374,9 +1374,9 @@ digraph nullability_kt {
     506 -> {507};
     507 -> {508 514};
     508 -> {509};
-    509 -> {514 510};
+    509 -> {510 514};
     510 -> {511};
-    511 -> {515 512};
+    511 -> {512 515};
     512 -> {513};
     513 -> {516};
     514 -> {515};
@@ -1384,7 +1384,7 @@ digraph nullability_kt {
     516 -> {517};
     517 -> {518};
     518 -> {519};
-    519 -> {521 520};
+    519 -> {520 521};
     520 -> {540};
     521 -> {522};
     522 -> {523};
@@ -1469,9 +1469,9 @@ digraph nullability_kt {
     546 -> {547};
     547 -> {548 554};
     548 -> {549};
-    549 -> {554 550};
+    549 -> {550 554};
     550 -> {551};
-    551 -> {555 552};
+    551 -> {552 555};
     552 -> {553};
     553 -> {556};
     554 -> {555};
@@ -1479,7 +1479,7 @@ digraph nullability_kt {
     556 -> {557};
     557 -> {558};
     558 -> {559};
-    559 -> {561 560};
+    559 -> {560 561};
     560 -> {580};
     561 -> {562};
     562 -> {563};
@@ -1547,7 +1547,7 @@ digraph nullability_kt {
     588 -> {589};
     589 -> {590};
     590 -> {591};
-    591 -> {593 592};
+    591 -> {592 593};
     592 -> {601};
     593 -> {594};
     594 -> {595};

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

@@ -84,11 +84,11 @@ digraph implicitReceiverAsWhenSubject_kt {
     4 -> {5};
     5 -> {6};
     6 -> {7};
-    7 -> {24 8};
+    7 -> {8 24};
     8 -> {9};
     9 -> {10};
     10 -> {11};
-    11 -> {19 12};
+    11 -> {12 19};
     12 -> {13};
     13 -> {14};
     14 -> {15};
@@ -205,11 +205,11 @@ digraph implicitReceiverAsWhenSubject_kt {
     41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {64 45};
+    44 -> {45 64};
     45 -> {46};
     46 -> {47};
     47 -> {48};
-    48 -> {56 49};
+    48 -> {49 56};
     49 -> {50};
     50 -> {51};
     51 -> {52};

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

@@ -134,7 +134,7 @@ digraph implicitReceivers_kt {
     25 -> {26};
     26 -> {27};
     27 -> {28};
-    28 -> {38 29};
+    28 -> {29 38};
     29 -> {30};
     30 -> {31};
     31 -> {32};
@@ -215,7 +215,7 @@ digraph implicitReceivers_kt {
     55 -> {56};
     56 -> {57};
     57 -> {58};
-    58 -> {69 59};
+    58 -> {59 69};
     59 -> {60};
     60 -> {61};
     61 -> {62};
@@ -304,7 +304,7 @@ digraph implicitReceivers_kt {
     82 -> {83};
     83 -> {84};
     84 -> {85};
-    85 -> {90 87};
+    85 -> {87 90};
     85 -> {86} [style=dotted];
     85 -> {90} [style=dashed];
     86 -> {87};
@@ -313,18 +313,18 @@ digraph implicitReceivers_kt {
     90 -> {91};
     91 -> {92};
     92 -> {93};
-    93 -> {98 95};
+    93 -> {95 98};
     93 -> {94} [style=dotted];
     93 -> {98} [style=dashed];
-    94 -> {87} [color=red];
     94 -> {95} [color=green];
+    94 -> {87} [color=red];
     95 -> {96};
     96 -> {97};
     97 -> {86};
     98 -> {99};
     99 -> {100};
     100 -> {101};
-    101 -> {110 103};
+    101 -> {103 110};
     101 -> {102} [style=dotted];
     101 -> {110} [style=dashed];
     102 -> {103};
@@ -436,12 +436,12 @@ digraph implicitReceivers_kt {
     123 -> {124};
     124 -> {125};
     125 -> {126};
-    126 -> {158 127};
+    126 -> {127 158};
     127 -> {128};
     128 -> {129};
     129 -> {130};
     130 -> {131};
-    131 -> {146 132};
+    131 -> {132 146};
     132 -> {133};
     133 -> {134};
     134 -> {135};
@@ -564,11 +564,11 @@ digraph implicitReceivers_kt {
     180 -> {181};
     181 -> {182};
     182 -> {183};
-    183 -> {200 184};
+    183 -> {184 200};
     184 -> {185};
     185 -> {186};
     186 -> {187};
-    187 -> {195 188};
+    187 -> {188 195};
     188 -> {189};
     189 -> {190};
     190 -> {191};

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

@@ -44,7 +44,7 @@ digraph thisOfExtensionProperty_kt {
     6 -> {7};
     7 -> {8};
     8 -> {9};
-    9 -> {12 10};
+    9 -> {10 12};
     10 -> {11};
     11 -> {12};
     12 -> {13};
@@ -82,7 +82,7 @@ digraph thisOfExtensionProperty_kt {
     19 -> {20};
     20 -> {21};
     21 -> {22};
-    22 -> {27 23};
+    22 -> {23 27};
     23 -> {24};
     24 -> {25};
     25 -> {26};

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

@@ -64,8 +64,8 @@ digraph assignSafeCall_kt {
         19 [label="Exit class A" style="filled" fillcolor=red];
     }
     17 -> {18} [color=green];
-    18 -> {19} [style=dotted];
     18 -> {10} [color=green];
+    18 -> {19} [style=dotted];
     18 -> {10} [style=dashed];
 
     subgraph cluster_7 {
@@ -119,7 +119,7 @@ digraph assignSafeCall_kt {
     29 -> {30};
     30 -> {31};
     31 -> {32};
-    32 -> {34 33};
+    32 -> {33 34};
     33 -> {41};
     34 -> {35};
     35 -> {36};
@@ -182,7 +182,7 @@ digraph assignSafeCall_kt {
     53 -> {54};
     54 -> {55};
     55 -> {56};
-    56 -> {58 57};
+    56 -> {57 58};
     57 -> {65};
     58 -> {59};
     59 -> {60};
@@ -222,7 +222,7 @@ digraph assignSafeCall_kt {
     69 -> {70};
     70 -> {71};
     71 -> {72};
-    72 -> {76 73};
+    72 -> {73 76};
     73 -> {74};
     74 -> {85};
     74 -> {75} [style=dotted];
@@ -309,7 +309,7 @@ digraph assignSafeCall_kt {
     101 -> {102};
     102 -> {103};
     103 -> {104};
-    104 -> {106 105};
+    104 -> {105 106};
     105 -> {113};
     106 -> {107};
     107 -> {108};
@@ -372,7 +372,7 @@ digraph assignSafeCall_kt {
     125 -> {126};
     126 -> {127};
     127 -> {128};
-    128 -> {130 129};
+    128 -> {129 130};
     129 -> {137};
     130 -> {131};
     131 -> {132};
@@ -412,7 +412,7 @@ digraph assignSafeCall_kt {
     141 -> {142};
     142 -> {143};
     143 -> {144};
-    144 -> {148 145};
+    144 -> {145 148};
     145 -> {146};
     146 -> {157};
     146 -> {147} [style=dotted];

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

@@ -84,7 +84,7 @@ digraph safeCallAndEqualityToBool_kt {
     14 -> {15};
     15 -> {16};
     16 -> {17};
-    17 -> {26 18};
+    17 -> {18 26};
     18 -> {19};
     19 -> {20};
     20 -> {21};
@@ -163,7 +163,7 @@ digraph safeCallAndEqualityToBool_kt {
     43 -> {44};
     44 -> {45};
     45 -> {46};
-    46 -> {55 47};
+    46 -> {47 55};
     47 -> {48};
     48 -> {49};
     49 -> {50};
@@ -242,7 +242,7 @@ digraph safeCallAndEqualityToBool_kt {
     72 -> {73};
     73 -> {74};
     74 -> {75};
-    75 -> {85 76};
+    75 -> {76 85};
     76 -> {77};
     77 -> {78};
     78 -> {79};
@@ -321,7 +321,7 @@ digraph safeCallAndEqualityToBool_kt {
     101 -> {102};
     102 -> {103};
     103 -> {104};
-    104 -> {114 105};
+    104 -> {105 114};
     105 -> {106};
     106 -> {107};
     107 -> {108};

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

@@ -180,14 +180,14 @@ digraph safeCalls_kt {
     49 -> {50};
     50 -> {51};
     51 -> {52};
-    52 -> {62 53};
+    52 -> {53 62};
     53 -> {54};
     54 -> {55};
     55 -> {56};
     56 -> {57};
-    57 -> {63 58};
+    57 -> {58 63};
     58 -> {59};
-    59 -> {60 69 61};
+    59 -> {60 61 69};
     59 -> {69} [style=dashed];
     60 -> {61};
     61 -> {64};
@@ -227,7 +227,7 @@ digraph safeCalls_kt {
     77 -> {78};
     78 -> {79 83};
     79 -> {80};
-    80 -> {83 81};
+    80 -> {81 83};
     81 -> {82};
     82 -> {84};
     83 -> {84};
@@ -295,9 +295,9 @@ digraph safeCalls_kt {
     97 -> {98 99} [style=dotted];
     97 -> {112} [style=dashed];
     98 -> {99} [style=dotted];
+    99 -> {111} [style=dotted label="onUncaughtException"];
     99 -> {100} [style=dotted];
-    99 -> {111} [style=dotted]    [label=onUncaughtException];
-    100 -> {106 101} [style=dotted];
+    100 -> {101 106} [style=dotted];
     101 -> {102} [style=dotted];
     102 -> {103} [style=dotted];
     103 -> {104} [style=dotted];

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

@@ -40,10 +40,10 @@ digraph smartCastInInit_kt {
     }
     6 -> {7};
     7 -> {8};
-    8 -> {13}    [label=onUncaughtException];
+    8 -> {13} [label="onUncaughtException"];
     8 -> {9} [style=dotted];
     9 -> {10} [style=dotted];
-    10 -> {13 11} [style=dotted];
+    10 -> {11 13} [style=dotted];
     11 -> {12} [style=dotted];
     12 -> {13} [style=dotted];
 
@@ -88,8 +88,8 @@ digraph smartCastInInit_kt {
         28 [label="Exit class Main" style="filled" fillcolor=red];
     }
     26 -> {27} [color=green];
-    27 -> {28} [style=dotted];
     27 -> {17} [color=green];
+    27 -> {28} [style=dotted];
     27 -> {17} [style=dashed];
 
 }

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

@@ -40,11 +40,11 @@ digraph smartcastInByClause_kt {
         12 [label="Exit class A" style="filled" fillcolor=red];
     }
     9 -> {10} [color=green];
-    10 -> {11} [style=dotted];
     10 -> {3} [color=green];
+    10 -> {11} [style=dotted];
     10 -> {3} [style=dashed];
-    11 -> {12} [style=dotted];
     11 -> {6} [color=green];
+    11 -> {12} [style=dotted];
     11 -> {6} [style=dashed];
 
     subgraph cluster_4 {
@@ -80,8 +80,8 @@ digraph smartcastInByClause_kt {
         23 [label="Exit class Derived" style="filled" fillcolor=red];
     }
     21 -> {22} [color=green];
-    22 -> {23} [style=dotted];
     22 -> {18} [color=green];
+    22 -> {23} [style=dotted];
     22 -> {18} [style=dashed];
 
     subgraph cluster_8 {
@@ -143,7 +143,7 @@ digraph smartcastInByClause_kt {
     27 -> {28};
     28 -> {29};
     29 -> {30};
-    30 -> {35 31};
+    30 -> {31 35};
     31 -> {32};
     32 -> {33};
     33 -> {48};
@@ -157,8 +157,8 @@ digraph smartcastInByClause_kt {
     40 -> {41};
     41 -> {42};
     41 -> {53 56 62 67} [color=red];
-    42 -> {43} [color=red];
     42 -> {49} [color=green];
+    42 -> {43} [color=red];
     42 -> {49} [style=dashed];
     43 -> {44};
     43 -> {53 67} [color=green];
@@ -169,11 +169,11 @@ digraph smartcastInByClause_kt {
     46 -> {47} [style=dotted];
     47 -> {48} [style=dotted];
     49 -> {50} [color=green];
-    50 -> {51} [style=dotted];
     50 -> {56} [color=green];
+    50 -> {51} [style=dotted];
     50 -> {56} [style=dashed];
-    51 -> {52} [style=dotted];
     51 -> {62} [color=green];
+    51 -> {52} [style=dotted];
     51 -> {62} [style=dashed];
     52 -> {43} [color=green];
 

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

@@ -21,10 +21,10 @@ digraph smartcastToNothing_kt {
     0 -> {1};
     1 -> {2};
     2 -> {3};
-    3 -> {8}    [label=onUncaughtException];
+    3 -> {8} [label="onUncaughtException"];
     3 -> {4} [style=dotted];
     4 -> {5} [style=dotted];
-    5 -> {8 6} [style=dotted];
+    5 -> {6 8} [style=dotted];
     6 -> {7} [style=dotted];
     7 -> {8} [style=dotted];
 
@@ -109,10 +109,10 @@ digraph smartcastToNothing_kt {
     30 -> {31};
     31 -> {32};
     32 -> {33};
-    33 -> {38}    [label=onUncaughtException];
+    33 -> {38} [label="onUncaughtException"];
     33 -> {34} [style=dotted];
     34 -> {35} [style=dotted];
-    35 -> {38 36} [style=dotted];
+    35 -> {36 38} [style=dotted];
     36 -> {37} [style=dotted];
     37 -> {38} [style=dotted];
 
@@ -153,11 +153,11 @@ digraph smartcastToNothing_kt {
         51 [label="Exit class A" style="filled" fillcolor=red];
     }
     48 -> {49} [color=green];
-    49 -> {50} [style=dotted];
     49 -> {42} [color=green];
+    49 -> {50} [style=dotted];
     49 -> {42} [style=dashed];
-    50 -> {51} [style=dotted];
     50 -> {45} [color=green];
+    50 -> {51} [style=dotted];
     50 -> {45} [style=dashed];
 
     subgraph cluster_14 {
@@ -262,29 +262,29 @@ digraph smartcastToNothing_kt {
     61 -> {62};
     62 -> {63};
     63 -> {64};
-    64 -> {90 65};
+    64 -> {65 90};
     65 -> {66};
     66 -> {67};
     67 -> {68};
-    68 -> {99}    [label=onUncaughtException];
+    68 -> {99} [label="onUncaughtException"];
     68 -> {69} [style=dotted];
     69 -> {70} [style=dotted];
     70 -> {71} [style=dotted];
+    71 -> {99} [style=dotted label="onUncaughtException"];
     71 -> {72} [style=dotted];
-    71 -> {99} [style=dotted]    [label=onUncaughtException];
     72 -> {73} [style=dotted];
     73 -> {74} [style=dotted];
     74 -> {75} [style=dotted];
     75 -> {76} [style=dotted];
+    76 -> {99} [style=dotted label="onUncaughtException"];
     76 -> {77} [style=dotted];
-    76 -> {99} [style=dotted]    [label=onUncaughtException];
     77 -> {78} [style=dotted];
     78 -> {79} [style=dotted];
-    79 -> {81 80} [style=dotted];
+    79 -> {80 81} [style=dotted];
     80 -> {87} [style=dotted];
     81 -> {82} [style=dotted];
     82 -> {83} [style=dotted];
-    83 -> {90 84} [style=dotted];
+    83 -> {84 90} [style=dotted];
     84 -> {85} [style=dotted];
     85 -> {86} [style=dotted];
     86 -> {87} [style=dotted];
@@ -295,7 +295,7 @@ digraph smartcastToNothing_kt {
     91 -> {92};
     92 -> {93 97};
     93 -> {94};
-    94 -> {100 96};
+    94 -> {96 100};
     94 -> {95} [style=dotted];
     94 -> {100} [style=dashed];
     95 -> {96};
@@ -376,7 +376,7 @@ digraph smartcastToNothing_kt {
     109 -> {110};
     110 -> {111};
     111 -> {112};
-    112 -> {114 113};
+    112 -> {113 114};
     113 -> {124};
     114 -> {115};
     115 -> {116};
@@ -393,12 +393,12 @@ digraph smartcastToNothing_kt {
     126 -> {127};
     127 -> {128};
     128 -> {129};
-    129 -> {131 130};
+    129 -> {130 131};
     130 -> {140};
     131 -> {132};
     132 -> {133};
     133 -> {134};
-    134 -> {142}    [label=onUncaughtException];
+    134 -> {142} [label="onUncaughtException"];
     134 -> {135} [style=dotted];
     135 -> {136} [style=dotted];
     136 -> {137} [style=dotted];

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

@@ -29,8 +29,8 @@ digraph overridenOpenVal_kt {
         8 [label="Exit class A" style="filled" fillcolor=red];
     }
     6 -> {7} [color=green];
-    7 -> {8} [style=dotted];
     7 -> {3} [color=green];
+    7 -> {8} [style=dotted];
     7 -> {3} [style=dashed];
 
     subgraph cluster_3 {
@@ -83,7 +83,7 @@ digraph overridenOpenVal_kt {
     16 -> {17};
     17 -> {18};
     18 -> {19};
-    19 -> {21 20};
+    19 -> {20 21};
     20 -> {28};
     21 -> {22};
     22 -> {23};
@@ -144,7 +144,7 @@ digraph overridenOpenVal_kt {
     37 -> {38};
     38 -> {39};
     39 -> {40};
-    40 -> {42 41};
+    40 -> {41 42};
     41 -> {50};
     42 -> {43};
     43 -> {44};

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

@@ -89,7 +89,7 @@ digraph delayedAssignment_kt {
     12 -> {13};
     13 -> {14};
     14 -> {15};
-    15 -> {24 16};
+    15 -> {16 24};
     16 -> {17};
     17 -> {18};
     18 -> {19};

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

@@ -78,7 +78,7 @@ digraph smartcastAfterReassignment_kt {
     17 -> {18};
     18 -> {19};
     19 -> {20};
-    20 -> {22 21};
+    20 -> {21 22};
     21 -> {28};
     22 -> {23};
     23 -> {24};

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

@@ -88,7 +88,7 @@ digraph complexPostponedCfg_kt {
     6 -> {7};
     7 -> {8};
     8 -> {9};
-    9 -> {18 11};
+    9 -> {11 18};
     9 -> {10} [style=dotted];
     9 -> {18} [style=dashed];
     10 -> {11};
@@ -104,8 +104,8 @@ digraph complexPostponedCfg_kt {
     20 -> {22 25};
     20 -> {21} [style=dotted];
     20 -> {25} [style=dashed];
-    21 -> {11} [color=red];
     21 -> {22} [color=green];
+    21 -> {11} [color=red];
     22 -> {23};
     23 -> {24};
     24 -> {10};
@@ -116,7 +116,7 @@ digraph complexPostponedCfg_kt {
     29 -> {30};
     30 -> {31};
     31 -> {32};
-    32 -> {37 34};
+    32 -> {34 37};
     32 -> {33} [style=dotted];
     32 -> {37} [style=dashed];
     33 -> {34};

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

@@ -34,7 +34,7 @@ digraph callsInPlace_kt {
     0 -> {1};
     1 -> {2};
     2 -> {3};
-    3 -> {10 5};
+    3 -> {5 10};
     3 -> {4} [style=dotted];
     3 -> {10} [style=dashed];
     4 -> {5};
@@ -77,7 +77,7 @@ digraph callsInPlace_kt {
     16 -> {17};
     17 -> {18};
     18 -> {19};
-    19 -> {20 24 21};
+    19 -> {20 21 24};
     19 -> {24} [style=dashed];
     20 -> {21};
     20 -> {19} [color=green style=dashed];
@@ -117,7 +117,7 @@ digraph callsInPlace_kt {
     29 -> {30};
     30 -> {31};
     31 -> {32};
-    32 -> {33 37 34};
+    32 -> {33 34 37};
     32 -> {37} [style=dashed];
     33 -> {34};
     33 -> {32} [color=green style=dashed];
@@ -161,7 +161,7 @@ digraph callsInPlace_kt {
     42 -> {43};
     43 -> {44};
     44 -> {45};
-    45 -> {50 47};
+    45 -> {47 50};
     45 -> {46} [style=dotted];
     45 -> {50} [style=dashed];
     46 -> {47};
@@ -209,7 +209,7 @@ digraph callsInPlace_kt {
     59 -> {60};
     60 -> {61};
     61 -> {62};
-    62 -> {67 64};
+    62 -> {64 67};
     62 -> {63} [style=dotted];
     62 -> {67} [style=dashed];
     63 -> {64};
@@ -281,7 +281,7 @@ digraph callsInPlace_kt {
     }
     82 -> {83};
     83 -> {84};
-    84 -> {86 85 90 95 87};
+    84 -> {85 86 87 90 95};
     84 -> {90 95} [style=dashed];
     85 -> {87};
     85 -> {84} [color=green style=dashed];
@@ -338,7 +338,7 @@ digraph callsInPlace_kt {
     }
     100 -> {101};
     101 -> {102};
-    102 -> {104 103 108 113 105};
+    102 -> {103 104 105 108 113};
     102 -> {108 113} [style=dashed];
     103 -> {105};
     103 -> {102} [color=green style=dashed];
@@ -399,7 +399,7 @@ digraph callsInPlace_kt {
     }
     123 -> {124};
     124 -> {125};
-    125 -> {126 130 127};
+    125 -> {126 127 130};
     125 -> {130} [style=dashed];
     126 -> {127};
     127 -> {128};

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

@@ -115,7 +115,7 @@ digraph conditionalEffects_kt {
     32 -> {33};
     33 -> {34};
     34 -> {35};
-    35 -> {40 36};
+    35 -> {36 40};
     36 -> {37};
     37 -> {38};
     38 -> {39};
@@ -185,7 +185,7 @@ digraph conditionalEffects_kt {
     52 -> {53};
     53 -> {54};
     54 -> {55};
-    55 -> {64 56};
+    55 -> {56 64};
     56 -> {57};
     57 -> {58};
     58 -> {59};
@@ -269,7 +269,7 @@ digraph conditionalEffects_kt {
     81 -> {82};
     82 -> {83};
     83 -> {84};
-    84 -> {97 85};
+    84 -> {85 97};
     85 -> {86};
     86 -> {87};
     87 -> {88};

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

@@ -37,8 +37,8 @@ digraph inAnonymousObject_kt {
     2 -> {3};
     3 -> {4};
     3 -> {37 40 43 49} [color=red];
-    4 -> {5} [color=red];
     4 -> {13} [color=green];
+    4 -> {5} [color=red];
     4 -> {13} [style=dashed];
     5 -> {6};
     5 -> {37 49} [color=green];
@@ -50,11 +50,11 @@ digraph inAnonymousObject_kt {
     10 -> {11};
     11 -> {12};
     13 -> {14} [color=green];
-    14 -> {15} [style=dotted];
     14 -> {40} [color=green];
+    14 -> {15} [style=dotted];
     14 -> {40} [style=dashed];
-    15 -> {16} [style=dotted];
     15 -> {43} [color=green];
+    15 -> {16} [style=dotted];
     15 -> {43} [style=dashed];
     16 -> {5} [color=green];
 

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

@@ -35,18 +35,18 @@ digraph inLocalClass_kt {
     3 -> {4};
     3 -> {38 41 47 53} [color=red];
     4 -> {5};
-    4 -> {41 53 10} [color=green];
-    4 -> {41 53 10} [style=dashed];
+    4 -> {10 41 53} [color=green];
+    4 -> {10 41 53} [style=dashed];
     5 -> {6};
     6 -> {7};
     7 -> {8};
     8 -> {9};
     10 -> {11} [color=green];
-    11 -> {12} [style=dotted];
     11 -> {38} [color=green];
+    11 -> {12} [style=dotted];
     11 -> {38} [style=dashed];
-    12 -> {13} [style=dotted];
     12 -> {47} [color=green];
+    12 -> {13} [style=dotted];
     12 -> {47} [style=dashed];
 
     subgraph cluster_4 {

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

@@ -38,7 +38,7 @@ digraph inLocalFunction_kt {
     1 -> {2};
     2 -> {3};
     3 -> {4};
-    4 -> {9 5};
+    4 -> {5 9};
     4 -> {9} [style=dashed];
     5 -> {6};
     6 -> {7};

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

@@ -78,7 +78,7 @@ digraph toLocalVariables_kt {
     8 -> {9};
     9 -> {10};
     10 -> {11};
-    11 -> {21 12};
+    11 -> {12 21};
     12 -> {13};
     13 -> {14};
     14 -> {15};

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

@@ -80,7 +80,7 @@ digraph atLeastOnce_kt {
     30 -> {31};
     31 -> {32};
     32 -> {33};
-    33 -> {40 35};
+    33 -> {35 40};
     33 -> {34} [style=dotted];
     33 -> {40} [style=dashed];
     34 -> {35};
@@ -127,7 +127,7 @@ digraph atLeastOnce_kt {
     46 -> {47};
     47 -> {48};
     48 -> {49};
-    49 -> {56 51};
+    49 -> {51 56};
     49 -> {50} [style=dotted];
     49 -> {56} [style=dashed];
     50 -> {51};

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

@@ -80,7 +80,7 @@ digraph atMostOnce_kt {
     30 -> {31};
     31 -> {32};
     32 -> {33};
-    33 -> {34 40 35};
+    33 -> {34 35 40};
     33 -> {40} [style=dashed];
     34 -> {35};
     35 -> {36};
@@ -125,7 +125,7 @@ digraph atMostOnce_kt {
     46 -> {47};
     47 -> {48};
     48 -> {49};
-    49 -> {50 56 51};
+    49 -> {50 51 56};
     49 -> {56} [style=dashed];
     50 -> {51};
     51 -> {52};

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

@@ -71,7 +71,7 @@ digraph contractsUsage_kt {
     20 -> {21};
     21 -> {22};
     22 -> {23};
-    23 -> {25 24};
+    23 -> {24 25};
     24 -> {31};
     25 -> {26};
     26 -> {27};
@@ -131,7 +131,7 @@ digraph contractsUsage_kt {
     46 -> {47};
     47 -> {48};
     48 -> {49};
-    49 -> {51 50};
+    49 -> {50 51};
     50 -> {61};
     51 -> {52};
     52 -> {53};

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

@@ -80,7 +80,7 @@ digraph exactlyOnce_kt {
     30 -> {31};
     31 -> {32};
     32 -> {33};
-    33 -> {40 35};
+    33 -> {35 40};
     33 -> {34} [style=dotted];
     33 -> {40} [style=dashed];
     34 -> {35};
@@ -126,7 +126,7 @@ digraph exactlyOnce_kt {
     46 -> {47};
     47 -> {48};
     48 -> {49};
-    49 -> {56 51};
+    49 -> {51 56};
     49 -> {50} [style=dotted];
     49 -> {56} [style=dashed];
     50 -> {51};

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

@@ -50,7 +50,7 @@ digraph flow_kt {
     4 -> {5};
     5 -> {6};
     6 -> {7};
-    7 -> {9 8};
+    7 -> {8 9};
     8 -> {17};
     9 -> {10};
     10 -> {11};
@@ -218,7 +218,7 @@ digraph flow_kt {
     34 -> {35};
     35 -> {36};
     36 -> {37};
-    37 -> {67 38};
+    37 -> {38 67};
     38 -> {39};
     39 -> {40};
     40 -> {41};
@@ -226,7 +226,7 @@ digraph flow_kt {
     42 -> {43};
     43 -> {44};
     44 -> {45};
-    45 -> {58 46};
+    45 -> {46 58};
     46 -> {47};
     47 -> {48};
     48 -> {49};
@@ -261,7 +261,7 @@ digraph flow_kt {
     76 -> {77};
     77 -> {78};
     78 -> {79};
-    79 -> {89 80};
+    79 -> {80 89};
     80 -> {81};
     81 -> {82};
     82 -> {83};
@@ -287,8 +287,8 @@ digraph flow_kt {
     102 -> {103};
     103 -> {104};
     104 -> {105};
-    105 -> {106} [style=dotted];
     105 -> {97} [color=green style=dashed];
+    105 -> {106} [style=dotted];
     106 -> {107} [style=dotted];
     107 -> {108} [style=dotted];
 

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

@@ -45,7 +45,7 @@ digraph inPlaceLambda_kt {
     4 -> {5};
     5 -> {6};
     6 -> {7};
-    7 -> {9 8};
+    7 -> {8 9};
     8 -> {14};
     9 -> {10};
     10 -> {11};
@@ -90,7 +90,7 @@ digraph inPlaceLambda_kt {
     27 -> {28};
     28 -> {29};
     29 -> {30};
-    30 -> {31 35 32};
+    30 -> {31 32 35};
     30 -> {35} [style=dashed];
     31 -> {32};
     32 -> {33};

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

@@ -76,7 +76,7 @@ digraph simple_kt {
     22 -> {23};
     23 -> {24};
     24 -> {25};
-    25 -> {27 26};
+    25 -> {26 27};
     26 -> {32};
     27 -> {28};
     28 -> {29};

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

@@ -80,7 +80,7 @@ digraph unknown_kt {
     30 -> {31};
     31 -> {32};
     32 -> {33};
-    33 -> {34 40 35};
+    33 -> {34 35 40};
     33 -> {40} [style=dashed];
     34 -> {35};
     34 -> {33} [color=green style=dashed];
@@ -126,7 +126,7 @@ digraph unknown_kt {
     46 -> {47};
     47 -> {48};
     48 -> {49};
-    49 -> {50 56 51};
+    49 -> {50 51 56};
     49 -> {56} [style=dashed];
     50 -> {51};
     50 -> {49} [color=green style=dashed];

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

@@ -37,10 +37,10 @@ digraph delegateWithAnonymousObject_kt {
     5 -> {6};
     6 -> {7};
     7 -> {8};
-    8 -> {13}    [label=onUncaughtException];
+    8 -> {13} [label="onUncaughtException"];
     8 -> {9} [style=dotted];
     9 -> {10} [style=dotted];
-    10 -> {13 11} [style=dotted];
+    10 -> {11 13} [style=dotted];
     11 -> {12} [style=dotted];
     12 -> {13} [style=dotted];
 
@@ -104,8 +104,8 @@ digraph delegateWithAnonymousObject_kt {
     26 -> {27};
     27 -> {28};
     27 -> {35 38 45} [color=red];
-    28 -> {29} [color=red];
     28 -> {33} [color=green];
+    28 -> {29} [color=red];
     28 -> {33} [style=dashed];
     29 -> {30};
     29 -> {35 38 45} [color=green];
@@ -231,8 +231,8 @@ digraph delegateWithAnonymousObject_kt {
     71 -> {72};
     72 -> {73 74};
     72 -> {26} [style=dashed];
-    73 -> {77} [color=red];
     73 -> {74} [color=green];
+    73 -> {77} [color=red];
     74 -> {75};
     75 -> {76};
     76 -> {77};
@@ -246,8 +246,8 @@ digraph delegateWithAnonymousObject_kt {
         81 [label="Exit class IssuesListUserProfile" style="filled" fillcolor=red];
     }
     79 -> {80} [color=green];
-    80 -> {81} [style=dotted];
     80 -> {71} [color=green];
+    80 -> {81} [style=dotted];
     80 -> {71} [style=dashed];
 
 }

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

@@ -35,12 +35,12 @@ digraph plusAssignWithLambdaInRhs_kt {
     0 -> {1};
     1 -> {2};
     2 -> {3};
-    3 -> {11}    [label=onUncaughtException];
+    3 -> {11} [label="onUncaughtException"];
     3 -> {4} [style=dotted];
     4 -> {5} [style=dotted];
     5 -> {6} [style=dotted];
     6 -> {7} [style=dotted];
-    7 -> {8 12 9} [style=dotted];
+    7 -> {8 9 12} [style=dotted];
     7 -> {12} [style=dashed];
     8 -> {9} [style=dotted];
     9 -> {10} [style=dotted];
@@ -76,8 +76,8 @@ digraph plusAssignWithLambdaInRhs_kt {
         25 [label="Exit class A" style="filled" fillcolor=red];
     }
     23 -> {24} [color=green];
-    24 -> {25} [style=dotted];
     24 -> {20} [color=green];
+    24 -> {25} [style=dotted];
     24 -> {20} [style=dashed];
 
     subgraph cluster_7 {
@@ -133,7 +133,7 @@ digraph plusAssignWithLambdaInRhs_kt {
     27 -> {28};
     28 -> {29};
     29 -> {30};
-    30 -> {31 37 32};
+    30 -> {31 32 37};
     30 -> {37} [style=dashed];
     31 -> {32};
     32 -> {33};
@@ -144,7 +144,7 @@ digraph plusAssignWithLambdaInRhs_kt {
     37 -> {38};
     38 -> {39};
     39 -> {40};
-    40 -> {41 45 42};
+    40 -> {41 42 45};
     40 -> {45} [style=dashed];
     41 -> {42};
     42 -> {43};

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

@@ -101,11 +101,11 @@ finally {
     11 -> {12};
     12 -> {13};
     13 -> {14};
-    13 -> {22}    [label=onUncaughtException];
+    13 -> {22} [label="onUncaughtException"];
     14 -> {15};
     15 -> {16};
     16 -> {17};
-    17 -> {18 31 19};
+    17 -> {18 19 31};
     17 -> {31} [style=dashed];
     18 -> {19};
     18 -> {17} [color=green style=dashed];
@@ -116,7 +116,7 @@ finally {
     23 -> {24};
     24 -> {25};
     25 -> {26};
-    25 -> {30}    [label=onUncaughtException];
+    25 -> {30} [label="onUncaughtException"];
     26 -> {27};
     27 -> {30};
     27 -> {28} [style=dotted];
@@ -191,11 +191,11 @@ finally {
     36 -> {37};
     37 -> {38};
     38 -> {39};
-    38 -> {47}    [label=onUncaughtException];
+    38 -> {47} [label="onUncaughtException"];
     39 -> {40};
     40 -> {41};
     41 -> {42};
-    42 -> {43 56 44};
+    42 -> {43 44 56};
     42 -> {56} [style=dashed];
     43 -> {44};
     44 -> {45};
@@ -205,7 +205,7 @@ finally {
     48 -> {49};
     49 -> {50};
     50 -> {51};
-    50 -> {55}    [label=onUncaughtException];
+    50 -> {55} [label="onUncaughtException"];
     51 -> {52};
     52 -> {55};
     52 -> {53} [style=dotted];

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

@@ -26,17 +26,6 @@ class FirControlFlowGraphRenderVisitor(
         private const val BLUE = "blue"
 
         private val DIGIT_REGEX = """\d""".toRegex()
-
-        private val EDGE_STYLE = EnumMap(
-            mapOf(
-                EdgeKind.Forward to "",
-                EdgeKind.DeadForward to "[style=dotted]",
-                EdgeKind.CfgForward to "[color=green]",
-                EdgeKind.DfgForward to "[color=red]",
-                EdgeKind.CfgBackward to "[color=green style=dashed]",
-                EdgeKind.DeadBackward to "[color=green style=dotted]"
-            )
-        )
     }
 
     private val printer = Printer(builder)
@@ -116,56 +105,35 @@ class FirControlFlowGraphRenderVisitor(
         }
     }
 
+    private val Edge.style: String?
+        get() = listOfNotNull(
+            when {
+                !kind.usedInDfa && !kind.usedInDeadDfa -> "color=green"
+                !kind.usedInCfa -> "color=red"
+                else -> null
+            },
+            when {
+                kind.isDead -> "style=dotted"
+                kind.isBack -> "style=dashed"
+                else -> null
+            },
+            label.label?.let { "label=\"$it\"" }
+        ).ifEmpty { null }?.joinToString(prefix = "[", separator = " ", postfix = "]")
+
     private fun Printer.renderEdges(graph: ControlFlowGraph) {
         for (node in graph.nodes) {
-            if (node.followingNodes.isEmpty()) continue
-
-            fun renderEdges(kind: EdgeKind) {
-                val edges = node.followingNodes.filter { node.outgoingEdges.getValue(it).kind == kind }
-                if (edges.isEmpty()) return
-
-                fun renderEdgesWithoutLabel(edges: List<CFGNode<*>>) {
-                    print(
-                        indices.getValue(node),
-                        EDGE,
-                        edges.joinToString(prefix = "{", postfix = "}", separator = " ") { indices.getValue(it).toString() }
-                    )
-                    EDGE_STYLE.getValue(kind).takeIf { it.isNotBlank() }?.let { printWithNoIndent(" $it") }
-                    printlnWithNoIndent(";")
-                }
-
-                if (edges.any { node.outgoingEdges[it]?.label?.label != null }) {
-                    val edgeGroups = edges.groupBy { node.outgoingEdges[it]?.label?.label != null }
-                    edgeGroups[false]?.let { renderEdgesWithoutLabel(it) }
-                    for (edge in edgeGroups[true]!!) {
-                        print(
-                            indices.getValue(node),
-                            EDGE,
-                            "{", indices.getValue(edge), "}"
-                        )
-                        EDGE_STYLE.getValue(kind).takeIf { it.isNotBlank() }?.let { printWithNoIndent(" $it") }
-                        print("[label=${node.outgoingEdges[edge]!!.label}]")
-                        printlnWithNoIndent(";")
-                    }
-                } else {
-                    renderEdgesWithoutLabel(edges)
-                }
-            }
-
-            for (kind in EdgeKind.values()) {
-                renderEdges(kind)
+            for ((style, group) in node.followingNodes.groupBy { node.outgoingEdges.getValue(it).style }.entries.sortedBy { it.key }) {
+                val mappedGroup = group.map { indices.getValue(it) }.sorted()
+                print(indices.getValue(node), EDGE, mappedGroup.joinToString(prefix = "{", postfix = "}", separator = " "))
+                style?.let { printWithNoIndent(" $it") }
+                printlnWithNoIndent(";")
             }
 
             if (node is CFGNodeWithSubgraphs<*>) {
-                val subNodes = node.subGraphs
+                val subNodes = node.subGraphs.mapNotNull { indices[it.enterNode] }.sorted()
                 if (subNodes.isNotEmpty()) {
-                    print(
-                        indices.getValue(node),
-                        EDGE,
-                        subNodes.mapNotNull { indices[it.enterNode] }.joinToString(prefix = "{", postfix = "}", separator = " ")
-                    )
-                    printWithNoIndent(" [style=dashed]")
-                    printlnWithNoIndent(";")
+                    print(indices.getValue(node), EDGE, subNodes.joinToString(prefix = "{", postfix = "}", separator = " "))
+                    printlnWithNoIndent(" [style=dashed];")
                 }
             }
         }

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

@@ -148,13 +148,13 @@ object UncaughtExceptionPath : EdgeLabel(label = "onUncaughtException")
 
 class LoopPath(
     firLoopJump: FirLoopJump
-) : EdgeLabel("\"" + (if (firLoopJump is FirBreakExpression) "break" else "continue") +
-                      (firLoopJump.target.labeledElement.label?.let { "@${it.name}" } ?: "") + "\"")
+) : EdgeLabel((if (firLoopJump is FirBreakExpression) "break" else "continue") +
+                      (firLoopJump.target.labeledElement.label?.let { "@${it.name}" } ?: ""))
 
 // TODO: Label `return`ing edge with this.
 class ReturnPath(
     returnTargetSymbol: FirFunctionSymbol<*>
-) : EdgeLabel(label = "\"return@${returnTargetSymbol.callableId}\"")
+) : EdgeLabel(label = "return@${returnTargetSymbol.callableId}")
 
 enum class EdgeKind(
     val usedInDfa: Boolean, // propagate flow to alive nodes

compiler/testData/codegen/box/smartCasts/kt44814.dot

@@ -83,14 +83,14 @@ digraph kt44814_kt {
         26 [label="Exit class FirPsiSourceElement [1]" style="filled" fillcolor=red];
     }
     22 -> {23} [color=green];
-    23 -> {24} [style=dotted];
     23 -> {13} [color=green];
+    23 -> {24} [style=dotted];
     23 -> {13} [style=dashed];
-    24 -> {25} [style=dotted];
     24 -> {16} [color=green];
+    24 -> {25} [style=dotted];
     24 -> {16} [style=dashed];
-    25 -> {26} [style=dotted];
     25 -> {19} [color=green];
+    25 -> {26} [style=dotted];
     25 -> {19} [style=dashed];
 
     subgraph cluster_9 {
@@ -130,11 +130,11 @@ digraph kt44814_kt {
         39 [label="Exit class FirLightSourceElement [1]" style="filled" fillcolor=red];
     }
     36 -> {37} [color=green];
-    37 -> {38} [style=dotted];
     37 -> {30} [color=green];
+    37 -> {38} [style=dotted];
     37 -> {30} [style=dashed];
-    38 -> {39} [style=dotted];
     38 -> {33} [color=green];
+    38 -> {39} [style=dotted];
     38 -> {33} [style=dashed];
 
     subgraph cluster_13 {
@@ -181,7 +181,7 @@ digraph kt44814_kt {
         51 [label="Delegated constructor call: super<R|kotlin/Any|>() [2]" style="filled" fillcolor=yellow];
         52 [label="Exit function <init> [2]" style="filled" fillcolor=red];
     }
-    50 -> {53 51};
+    50 -> {51 53};
     51 -> {52};
     53 -> {54};
     53 -> {53} [style=dashed];
@@ -238,11 +238,11 @@ digraph kt44814_kt {
         73 [label="Exit class LighterASTNode [1]" style="filled" fillcolor=red];
     }
     70 -> {71} [color=green];
-    71 -> {72} [style=dotted];
     71 -> {56} [color=green];
+    71 -> {72} [style=dotted];
     71 -> {56} [style=dashed];
-    72 -> {73} [style=dotted];
     72 -> {66} [color=green];
+    72 -> {73} [style=dotted];
     72 -> {66} [style=dashed];
 
     subgraph cluster_24 {
@@ -280,8 +280,8 @@ digraph kt44814_kt {
         85 [label="Exit class Companion [2]" style="filled" fillcolor=red];
     }
     83 -> {84} [color=green];
-    84 -> {85} [style=dotted];
     84 -> {80} [color=green];
+    84 -> {85} [style=dotted];
     84 -> {80} [style=dashed];
 
     subgraph cluster_28 {
@@ -349,8 +349,8 @@ digraph kt44814_kt {
         106 [label="Exit class KtModifierListOwner [1]" style="filled" fillcolor=red];
     }
     104 -> {105} [color=green];
-    105 -> {106} [style=dotted];
     105 -> {101} [color=green];
+    105 -> {106} [style=dotted];
     105 -> {101} [style=dashed];
 
     subgraph cluster_36 {
@@ -432,8 +432,8 @@ digraph kt44814_kt {
         133 [label="Exit class FirLightModifier [2]" style="filled" fillcolor=red];
     }
     131 -> {132} [color=green];
-    132 -> {133} [style=dotted];
     132 -> {128} [color=green];
+    132 -> {133} [style=dotted];
     132 -> {128} [style=dashed];
 
     subgraph cluster_44 {
@@ -444,11 +444,11 @@ digraph kt44814_kt {
         137 [label="Exit class FirModifier [1]" style="filled" fillcolor=red];
     }
     134 -> {135} [color=green];
-    135 -> {136} [style=dotted];
     135 -> {110} [color=green];
+    135 -> {136} [style=dotted];
     135 -> {110} [style=dashed];
-    136 -> {137} [style=dotted];
     136 -> {113} [color=green];
+    136 -> {137} [style=dotted];
     136 -> {113} [style=dashed];
 
     subgraph cluster_45 {
@@ -496,8 +496,8 @@ digraph kt44814_kt {
         152 [label="Exit class FirPsiModifierList [2]" style="filled" fillcolor=red];
     }
     150 -> {151} [color=green];
-    151 -> {152} [style=dotted];
     151 -> {147} [color=green];
+    151 -> {152} [style=dotted];
     151 -> {147} [style=dashed];
 
     subgraph cluster_50 {
@@ -537,11 +537,11 @@ digraph kt44814_kt {
         165 [label="Exit class FirLightModifierList [2]" style="filled" fillcolor=red];
     }
     162 -> {163} [color=green];
-    163 -> {164} [style=dotted];
     163 -> {156} [color=green];
+    163 -> {164} [style=dotted];
     163 -> {156} [style=dashed];
-    164 -> {165} [style=dotted];
     164 -> {159} [color=green];
+    164 -> {165} [style=dotted];
     164 -> {159} [style=dashed];
 
     subgraph cluster_54 {
@@ -698,11 +698,11 @@ digraph kt44814_kt {
     174 -> {175};
     175 -> {176};
     176 -> {177};
-    177 -> {222 178};
+    177 -> {178 222};
     178 -> {179};
     179 -> {180};
     180 -> {181};
-    181 -> {207 182};
+    181 -> {182 207};
     182 -> {183};
     183 -> {184};
     184 -> {185};
@@ -712,12 +712,12 @@ digraph kt44814_kt {
     188 -> {189};
     189 -> {190};
     190 -> {191};
-    191 -> {192 238 193};
+    191 -> {192 193 238};
     191 -> {238} [style=dashed];
     192 -> {193};
     192 -> {191} [color=green style=dashed];
     193 -> {194};
-    194 -> {199 195};
+    194 -> {195 199};
     195 -> {196};
     196 -> {197};
     197 -> {231};
@@ -736,16 +736,16 @@ digraph kt44814_kt {
     209 -> {210};
     210 -> {211 217};
     211 -> {212};
-    212 -> {217 213};
+    212 -> {213 217};
     213 -> {214};
-    214 -> {232 216};
+    214 -> {216 232};
     214 -> {215} [style=dotted];
     214 -> {232} [style=dashed];
-    215 -> {221} [color=red];
     215 -> {216} [color=green];
+    215 -> {221} [color=red];
     216 -> {218};
     217 -> {218};
-    218 -> {221 219};
+    218 -> {219 221};
     219 -> {220};
     220 -> {227};
     221 -> {227} [color=red];
@@ -854,7 +854,7 @@ digraph kt44814_kt {
     261 -> {262};
     262 -> {263};
     263 -> {264};
-    264 -> {272 265};
+    264 -> {265 272};
     265 -> {266};
     266 -> {267};
     267 -> {268};
@@ -887,8 +887,8 @@ digraph kt44814_kt {
         286 [label="Exit class FirModifierList [1]" style="filled" fillcolor=red];
     }
     284 -> {285} [color=green];
-    285 -> {286} [style=dotted];
     285 -> {141} [color=green];
+    285 -> {286} [style=dotted];
     285 -> {141} [style=dashed];
 
     subgraph cluster_77 {