FIR CFA: remove class initializer part nodes

Instead, attach subgraphs directly to the class enter node.
This commit is contained in:
pyos
2022-12-11 13:43:55 +01:00
committed by Dmitriy Novozhilov
parent b9f366af05
commit c6e9afb788
25 changed files with 3271 additions and 3385 deletions
@@ -20,58 +20,57 @@ digraph initBlockAndInPlaceLambda_kt {
subgraph cluster_2 {
color=red
4 [label="Enter class C" style="filled" fillcolor=red];
5 [label="Part of class initialization"];
subgraph cluster_3 {
color=blue
6 [label="Enter init block" style="filled" fillcolor=red];
5 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_4 {
color=blue
7 [label="Enter block"];
8 [label="Access variable R|<local>/a|"];
9 [label="Access variable R|/A.b|"];
10 [label="Enter safe call"];
11 [label="Postponed enter to lambda"];
6 [label="Enter block"];
7 [label="Access variable R|<local>/a|"];
8 [label="Access variable R|/A.b|"];
9 [label="Enter safe call"];
10 [label="Postponed enter to lambda"];
subgraph cluster_5 {
color=blue
12 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
11 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_6 {
color=blue
13 [label="Enter block"];
14 [label="Access variable R|<local>/a|"];
15 [label="Access variable R|<local>/it|"];
16 [label="Function call: R|/C.C|(...)" style="filled" fillcolor=yellow];
17 [label="Exit block"];
12 [label="Enter block"];
13 [label="Access variable R|<local>/a|"];
14 [label="Access variable R|<local>/it|"];
15 [label="Function call: R|/C.C|(...)" style="filled" fillcolor=yellow];
16 [label="Exit block"];
}
18 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
17 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
}
19 [label="Postponed exit from lambda"];
20 [label="Function call: $subj$.R|kotlin/let|<R|B|, R|C|>(...)" style="filled" fillcolor=yellow];
21 [label="Exit safe call"];
22 [label="Variable declaration: lval c: R|C?|"];
23 [label="Exit block"];
18 [label="Postponed exit from lambda"];
19 [label="Function call: $subj$.R|kotlin/let|<R|B|, R|C|>(...)" style="filled" fillcolor=yellow];
20 [label="Exit safe call"];
21 [label="Variable declaration: lval c: R|C?|"];
22 [label="Exit block"];
}
24 [label="Exit init block" style="filled" fillcolor=red];
23 [label="Exit init block" style="filled" fillcolor=red];
}
25 [label="Exit class C" style="filled" fillcolor=red];
24 [label="Exit class C" style="filled" fillcolor=red];
}
subgraph cluster_7 {
color=blue
26 [label="Enter function <init>" style="filled" fillcolor=red];
27 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
28 [label="Exit function <init>" style="filled" fillcolor=red];
25 [label="Enter function <init>" style="filled" fillcolor=red];
26 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
27 [label="Exit function <init>" style="filled" fillcolor=red];
}
4 -> {5} [color=green];
5 -> {6} [color=green];
5 -> {25} [style=dotted];
5 -> {6} [style=dashed];
4 -> {24} [style=dotted];
4 -> {5} [style=dashed];
5 -> {6};
6 -> {7};
7 -> {8};
8 -> {9};
9 -> {10 21};
10 -> {11};
11 -> {12 20};
11 -> {19} [style=dotted];
11 -> {12} [style=dashed];
8 -> {9 20};
9 -> {10};
10 -> {11 19};
10 -> {18} [style=dotted];
10 -> {11} [style=dashed];
11 -> {12};
12 -> {13};
13 -> {14};
14 -> {15};
@@ -83,11 +82,10 @@ digraph initBlockAndInPlaceLambda_kt {
20 -> {21};
21 -> {22};
22 -> {23};
23 -> {24};
23 -> {24} [color=green];
24 -> {25} [color=green];
25 -> {26} [color=green];
25 -> {26} [style=dashed];
24 -> {25} [style=dashed];
25 -> {26};
26 -> {27};
27 -> {28};
}