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,89 +6,88 @@ digraph overridenOpenVal_kt {
subgraph cluster_0 {
color=red
0 [label="Enter class A" 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>/x|"];
4 [label="Exit property" style="filled" fillcolor=red];
1 [label="Enter property" style="filled" fillcolor=red];
2 [label="Access variable R|<local>/x|"];
3 [label="Exit property" style="filled" fillcolor=red];
}
5 [label="Exit class A" style="filled" fillcolor=red];
4 [label="Exit class A" style="filled" fillcolor=red];
}
subgraph cluster_2 {
color=blue
6 [label="Enter function <init>" style="filled" fillcolor=red];
7 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
8 [label="Exit function <init>" style="filled" fillcolor=red];
5 [label="Enter function <init>" style="filled" fillcolor=red];
6 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
7 [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 -> {4} [style=dotted];
0 -> {1} [style=dashed];
1 -> {2};
2 -> {3};
3 -> {4};
3 -> {4} [color=green];
4 -> {5} [color=green];
5 -> {6} [color=green];
5 -> {6} [style=dashed];
4 -> {5} [style=dashed];
5 -> {6};
6 -> {7};
7 -> {8};
subgraph cluster_3 {
color=red
9 [label="Enter class B" style="filled" fillcolor=red];
10 [label="Exit class B" style="filled" fillcolor=red];
8 [label="Enter class B" style="filled" fillcolor=red];
9 [label="Exit class B" style="filled" fillcolor=red];
}
subgraph cluster_4 {
color=blue
11 [label="Enter function test_1" style="filled" fillcolor=red];
10 [label="Enter function test_1" style="filled" fillcolor=red];
subgraph cluster_5 {
color=blue
12 [label="Enter block"];
11 [label="Enter block"];
subgraph cluster_6 {
color=blue
13 [label="Enter when"];
12 [label="Enter when"];
subgraph cluster_7 {
color=blue
14 [label="Enter when branch condition "];
15 [label="Access variable R|/A.x|"];
16 [label="Type operator: (this@R|/B|.R|/A.x| is R|kotlin/String|)"];
17 [label="Exit when branch condition"];
13 [label="Enter when branch condition "];
14 [label="Access variable R|/A.x|"];
15 [label="Type operator: (this@R|/B|.R|/A.x| is R|kotlin/String|)"];
16 [label="Exit when branch condition"];
}
18 [label="Synthetic else branch"];
19 [label="Enter when branch result"];
17 [label="Synthetic else branch"];
18 [label="Enter when branch result"];
subgraph cluster_8 {
color=blue
20 [label="Enter block"];
21 [label="Access variable R|/A.x|"];
22 [label="Smart cast: this@R|/B|.R|/A.x|"];
23 [label="Access variable R|kotlin/String.length|"];
24 [label="Exit block"];
19 [label="Enter block"];
20 [label="Access variable R|/A.x|"];
21 [label="Smart cast: this@R|/B|.R|/A.x|"];
22 [label="Access variable R|kotlin/String.length|"];
23 [label="Exit block"];
}
25 [label="Exit when branch result"];
26 [label="Exit when"];
24 [label="Exit when branch result"];
25 [label="Exit when"];
}
27 [label="Exit block"];
26 [label="Exit block"];
}
28 [label="Exit function test_1" style="filled" fillcolor=red];
27 [label="Exit function test_1" style="filled" fillcolor=red];
}
subgraph cluster_9 {
color=blue
29 [label="Enter function <init>" style="filled" fillcolor=red];
30 [label="Access variable R|<local>/x|"];
31 [label="Delegated constructor call: super<R|A|>(...)" style="filled" fillcolor=yellow];
32 [label="Exit function <init>" style="filled" fillcolor=red];
28 [label="Enter function <init>" style="filled" fillcolor=red];
29 [label="Access variable R|<local>/x|"];
30 [label="Delegated constructor call: super<R|A|>(...)" style="filled" fillcolor=yellow];
31 [label="Exit function <init>" style="filled" fillcolor=red];
}
9 -> {10} [color=green];
10 -> {11 29} [color=green];
10 -> {11 29} [style=dashed];
8 -> {9} [color=green];
9 -> {10 28} [color=green];
9 -> {10 28} [style=dashed];
10 -> {11};
11 -> {12};
12 -> {13};
13 -> {14};
14 -> {15};
15 -> {16};
16 -> {17};
17 -> {18 19};
18 -> {26};
16 -> {17 18};
17 -> {25};
18 -> {19};
19 -> {20};
20 -> {21};
21 -> {22};
@@ -97,55 +96,55 @@ digraph overridenOpenVal_kt {
24 -> {25};
25 -> {26};
26 -> {27};
27 -> {28};
28 -> {29};
29 -> {30};
30 -> {31};
31 -> {32};
subgraph cluster_10 {
color=red
33 [label="Enter function test_2" style="filled" fillcolor=red];
32 [label="Enter function test_2" style="filled" fillcolor=red];
subgraph cluster_11 {
color=blue
34 [label="Enter block"];
33 [label="Enter block"];
subgraph cluster_12 {
color=blue
35 [label="Enter when"];
34 [label="Enter when"];
subgraph cluster_13 {
color=blue
36 [label="Enter when branch condition "];
37 [label="Access variable R|<local>/b|"];
38 [label="Access variable R|/A.x|"];
39 [label="Type operator: (R|<local>/b|.R|/A.x| is R|kotlin/String|)"];
40 [label="Exit when branch condition"];
35 [label="Enter when branch condition "];
36 [label="Access variable R|<local>/b|"];
37 [label="Access variable R|/A.x|"];
38 [label="Type operator: (R|<local>/b|.R|/A.x| is R|kotlin/String|)"];
39 [label="Exit when branch condition"];
}
41 [label="Synthetic else branch"];
42 [label="Enter when branch result"];
40 [label="Synthetic else branch"];
41 [label="Enter when branch result"];
subgraph cluster_14 {
color=blue
43 [label="Enter block"];
44 [label="Access variable R|<local>/b|"];
45 [label="Access variable R|/A.x|"];
46 [label="Smart cast: R|<local>/b|.R|/A.x|"];
47 [label="Access variable R|kotlin/String.length|"];
48 [label="Exit block"];
42 [label="Enter block"];
43 [label="Access variable R|<local>/b|"];
44 [label="Access variable R|/A.x|"];
45 [label="Smart cast: R|<local>/b|.R|/A.x|"];
46 [label="Access variable R|kotlin/String.length|"];
47 [label="Exit block"];
}
49 [label="Exit when branch result"];
50 [label="Exit when"];
48 [label="Exit when branch result"];
49 [label="Exit when"];
}
51 [label="Exit block"];
50 [label="Exit block"];
}
52 [label="Exit function test_2" style="filled" fillcolor=red];
51 [label="Exit function test_2" style="filled" fillcolor=red];
}
32 -> {33};
33 -> {34};
34 -> {35};
35 -> {36};
36 -> {37};
37 -> {38};
38 -> {39};
39 -> {40};
40 -> {41 42};
41 -> {50};
39 -> {40 41};
40 -> {49};
41 -> {42};
42 -> {43};
43 -> {44};
44 -> {45};
@@ -155,6 +154,5 @@ digraph overridenOpenVal_kt {
48 -> {49};
49 -> {50};
50 -> {51};
51 -> {52};
}