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
@@ -6,95 +6,85 @@ digraph secondaryConstructorCfg_kt {
subgraph cluster_0 {
color=red
0 [label="Enter class B" style="filled" fillcolor=red];
1 [label="Part of class initialization"];
subgraph cluster_1 {
color=blue
2 [label="Enter property" style="filled" fillcolor=red];
3 [label="Access variable R|<local>/p0|"];
4 [label="Exit property" style="filled" fillcolor=red];
1 [label="Enter property" style="filled" fillcolor=red];
2 [label="Access variable R|<local>/p0|"];
3 [label="Exit property" style="filled" fillcolor=red];
}
5 [label="Part of class initialization"];
subgraph cluster_2 {
color=blue
6 [label="Enter property" style="filled" fillcolor=red];
7 [label="Access variable R|<local>/p0|"];
8 [label="Access variable R|kotlin/String.length|"];
9 [label="Exit property" style="filled" fillcolor=red];
4 [label="Enter property" style="filled" fillcolor=red];
5 [label="Access variable R|<local>/p0|"];
6 [label="Access variable R|kotlin/String.length|"];
7 [label="Exit property" style="filled" fillcolor=red];
}
10 [label="Part of class initialization"];
subgraph cluster_3 {
color=blue
11 [label="Enter init block" style="filled" fillcolor=red];
8 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_4 {
color=blue
12 [label="Enter block"];
13 [label="Access variable R|<local>/p0|"];
14 [label="Access variable R|kotlin/String.length|"];
15 [label="Assignment: R|/B.p1|"];
16 [label="Const: String()"];
17 [label="Assignment: R|/B.p3|"];
18 [label="Exit block"];
9 [label="Enter block"];
10 [label="Access variable R|<local>/p0|"];
11 [label="Access variable R|kotlin/String.length|"];
12 [label="Assignment: R|/B.p1|"];
13 [label="Const: String()"];
14 [label="Assignment: R|/B.p3|"];
15 [label="Exit block"];
}
19 [label="Exit init block" style="filled" fillcolor=red];
16 [label="Exit init block" style="filled" fillcolor=red];
}
20 [label="Exit class B" style="filled" fillcolor=red];
17 [label="Exit class B" style="filled" fillcolor=red];
}
subgraph cluster_5 {
color=blue
21 [label="Enter function <init>" style="filled" fillcolor=red];
22 [label="Access variable R|<local>/p0|"];
23 [label="Delegated constructor call: this<R|B|>(...)" style="filled" fillcolor=yellow];
18 [label="Enter function <init>" style="filled" fillcolor=red];
19 [label="Access variable R|<local>/p0|"];
20 [label="Delegated constructor call: this<R|B|>(...)" style="filled" fillcolor=yellow];
subgraph cluster_6 {
color=blue
24 [label="Enter block"];
25 [label="Access variable R|<local>/p1|"];
26 [label="Assignment: R|/B.p3|"];
27 [label="Exit block"];
21 [label="Enter block"];
22 [label="Access variable R|<local>/p1|"];
23 [label="Assignment: R|/B.p3|"];
24 [label="Exit block"];
}
28 [label="Exit function <init>" style="filled" fillcolor=red];
25 [label="Exit function <init>" style="filled" fillcolor=red];
}
subgraph cluster_7 {
color=blue
29 [label="Enter function <init>" style="filled" fillcolor=red];
30 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
31 [label="Exit function <init>" style="filled" fillcolor=red];
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];
}
0 -> {1} [color=green];
1 -> {2} [color=green];
1 -> {5} [style=dotted];
1 -> {2} [style=dashed];
0 -> {17} [style=dotted];
0 -> {1 4 8} [style=dashed];
1 -> {2};
2 -> {3};
3 -> {4};
4 -> {5} [color=green];
5 -> {6} [color=green];
5 -> {10} [style=dotted];
5 -> {6} [style=dashed];
3 -> {4} [color=green];
4 -> {5};
5 -> {6};
6 -> {7};
7 -> {8};
7 -> {8} [color=green];
8 -> {9};
9 -> {10} [color=green];
10 -> {11} [color=green];
10 -> {20} [style=dotted];
10 -> {11} [style=dashed];
9 -> {10};
10 -> {11};
11 -> {12};
12 -> {13};
13 -> {14};
14 -> {15};
15 -> {16};
16 -> {17};
17 -> {18};
16 -> {17} [color=green];
17 -> {18 26} [color=green];
17 -> {18 26} [style=dashed];
18 -> {19};
19 -> {20} [color=green];
20 -> {21 29} [color=green];
20 -> {21 29} [style=dashed];
19 -> {20};
20 -> {21};
21 -> {22};
22 -> {23};
23 -> {24};
24 -> {25};
25 -> {26};
26 -> {27};
27 -> {28};
29 -> {30};
30 -> {31};
}