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
@@ -23,191 +23,190 @@ digraph lambdaInWhenBranch_kt {
subgraph cluster_2 {
color=red
5 [label="Enter class SubClass1" style="filled" fillcolor=red];
6 [label="Part of class initialization"];
subgraph cluster_3 {
color=blue
7 [label="Enter property" style="filled" fillcolor=red];
8 [label="Access variable R|<local>/t|"];
9 [label="Exit property" style="filled" fillcolor=red];
6 [label="Enter property" style="filled" fillcolor=red];
7 [label="Access variable R|<local>/t|"];
8 [label="Exit property" style="filled" fillcolor=red];
}
10 [label="Exit class SubClass1" style="filled" fillcolor=red];
9 [label="Exit class SubClass1" style="filled" fillcolor=red];
}
subgraph cluster_4 {
color=blue
11 [label="Enter function copy" style="filled" fillcolor=red];
12 [label="Enter default value of t"];
10 [label="Enter function copy" style="filled" fillcolor=red];
11 [label="Enter default value of t"];
subgraph cluster_5 {
color=blue
13 [label="Enter default value of t" style="filled" fillcolor=red];
14 [label="Access variable R|/SubClass1.t|"];
15 [label="Exit default value of t" style="filled" fillcolor=red];
12 [label="Enter default value of t" style="filled" fillcolor=red];
13 [label="Access variable R|/SubClass1.t|"];
14 [label="Exit default value of t" style="filled" fillcolor=red];
}
16 [label="Exit default value of t"];
17 [label="Exit function copy" style="filled" fillcolor=red];
15 [label="Exit default value of t"];
16 [label="Exit function copy" style="filled" fillcolor=red];
}
subgraph cluster_6 {
color=blue
18 [label="Enter function component1" style="filled" fillcolor=red];
19 [label="Exit function component1" style="filled" fillcolor=red];
17 [label="Enter function component1" style="filled" fillcolor=red];
18 [label="Exit function component1" style="filled" fillcolor=red];
}
subgraph cluster_7 {
color=blue
20 [label="Enter function <init>" style="filled" fillcolor=red];
21 [label="Delegated constructor call: super<R|Sealed|>()" style="filled" fillcolor=yellow];
22 [label="Exit function <init>" style="filled" fillcolor=red];
19 [label="Enter function <init>" style="filled" fillcolor=red];
20 [label="Delegated constructor call: super<R|Sealed|>()" style="filled" fillcolor=yellow];
21 [label="Exit function <init>" style="filled" fillcolor=red];
}
5 -> {6} [color=green];
6 -> {7} [color=green];
6 -> {10} [style=dotted];
6 -> {7} [style=dashed];
5 -> {9} [style=dotted];
5 -> {6} [style=dashed];
6 -> {7};
7 -> {8};
8 -> {9};
9 -> {10} [color=green];
10 -> {11 18 20} [color=green];
10 -> {11 18 20} [style=dashed];
11 -> {12};
12 -> {13 16};
12 -> {13} [style=dashed];
8 -> {9} [color=green];
9 -> {10 17 19} [color=green];
9 -> {10 17 19} [style=dashed];
10 -> {11};
11 -> {12 15};
11 -> {12} [style=dashed];
12 -> {13};
13 -> {14};
14 -> {15};
15 -> {16};
16 -> {17};
18 -> {19};
17 -> {18};
19 -> {20};
20 -> {21};
21 -> {22};
subgraph cluster_8 {
color=red
23 [label="Enter class SubClass2" style="filled" fillcolor=red];
24 [label="Exit class SubClass2" style="filled" fillcolor=red];
22 [label="Enter class SubClass2" style="filled" fillcolor=red];
23 [label="Exit class SubClass2" style="filled" fillcolor=red];
}
subgraph cluster_9 {
color=blue
25 [label="Enter function copy" style="filled" fillcolor=red];
26 [label="Exit function copy" style="filled" fillcolor=red];
24 [label="Enter function copy" style="filled" fillcolor=red];
25 [label="Exit function copy" style="filled" fillcolor=red];
}
subgraph cluster_10 {
color=blue
27 [label="Enter function <init>" style="filled" fillcolor=red];
28 [label="Delegated constructor call: super<R|Sealed|>()" style="filled" fillcolor=yellow];
29 [label="Exit function <init>" style="filled" fillcolor=red];
26 [label="Enter function <init>" style="filled" fillcolor=red];
27 [label="Delegated constructor call: super<R|Sealed|>()" style="filled" fillcolor=yellow];
28 [label="Exit function <init>" style="filled" fillcolor=red];
}
23 -> {24} [color=green];
24 -> {25 27} [color=green];
24 -> {25 27} [style=dashed];
25 -> {26};
22 -> {23} [color=green];
23 -> {24 26} [color=green];
23 -> {24 26} [style=dashed];
24 -> {25};
26 -> {27};
27 -> {28};
28 -> {29};
subgraph cluster_11 {
color=red
30 [label="Enter function foo" style="filled" fillcolor=red];
29 [label="Enter function foo" style="filled" fillcolor=red];
subgraph cluster_12 {
color=blue
31 [label="Enter block"];
30 [label="Enter block"];
subgraph cluster_13 {
color=blue
32 [label="Enter when"];
33 [label="Access variable R|<local>/p|"];
31 [label="Enter when"];
32 [label="Access variable R|<local>/p|"];
subgraph cluster_14 {
color=blue
34 [label="Enter when branch condition "];
35 [label="Exit $subj"];
36 [label="Type operator: ($subj$ is R|SubClass1|)"];
37 [label="Exit when branch condition"];
33 [label="Enter when branch condition "];
34 [label="Exit $subj"];
35 [label="Type operator: ($subj$ is R|SubClass1|)"];
36 [label="Exit when branch condition"];
}
subgraph cluster_15 {
color=blue
38 [label="Enter when branch condition "];
39 [label="Exit $subj"];
40 [label="Type operator: ($subj$ is R|SubClass2|)"];
41 [label="Exit when branch condition"];
37 [label="Enter when branch condition "];
38 [label="Exit $subj"];
39 [label="Type operator: ($subj$ is R|SubClass2|)"];
40 [label="Exit when branch condition"];
}
42 [label="Enter when branch result"];
41 [label="Enter when branch result"];
subgraph cluster_16 {
color=blue
43 [label="Enter block"];
44 [label="Const: String()"];
45 [label="Exit block"];
42 [label="Enter block"];
43 [label="Const: String()"];
44 [label="Exit block"];
}
46 [label="Exit when branch result"];
47 [label="Enter when branch result"];
45 [label="Exit when branch result"];
46 [label="Enter when branch result"];
subgraph cluster_17 {
color=blue
48 [label="Enter block"];
49 [label="Const: String()"];
50 [label="Postponed enter to lambda"];
47 [label="Enter block"];
48 [label="Const: String()"];
49 [label="Postponed enter to lambda"];
subgraph cluster_18 {
color=blue
51 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
50 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_19 {
color=blue
52 [label="Enter block"];
53 [label="Access variable R|<local>/it|"];
54 [label="Exit block"];
51 [label="Enter block"];
52 [label="Access variable R|<local>/it|"];
53 [label="Exit block"];
}
55 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
54 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
}
56 [label="Postponed exit from lambda"];
57 [label="Function call: String().R|kotlin/let|<R|kotlin/String|, R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
58 [label="Exit block"];
55 [label="Postponed exit from lambda"];
56 [label="Function call: String().R|kotlin/let|<R|kotlin/String|, R|kotlin/String|>(...)" style="filled" fillcolor=yellow];
57 [label="Exit block"];
}
59 [label="Exit when branch result"];
60 [label="Exit when"];
58 [label="Exit when branch result"];
59 [label="Exit when"];
}
61 [label="Access variable R|<local>/p|"];
62 [label="Access variable <Unresolved name: t>#"];
60 [label="Access variable R|<local>/p|"];
61 [label="Access variable <Unresolved name: t>#"];
subgraph cluster_20 {
color=blue
63 [label="Enter when"];
64 [label="Access variable R|<local>/p|"];
62 [label="Enter when"];
63 [label="Access variable R|<local>/p|"];
subgraph cluster_21 {
color=blue
65 [label="Enter when branch condition "];
66 [label="Exit $subj"];
67 [label="Type operator: ($subj$ is R|SubClass1|)"];
68 [label="Exit when branch condition"];
64 [label="Enter when branch condition "];
65 [label="Exit $subj"];
66 [label="Type operator: ($subj$ is R|SubClass1|)"];
67 [label="Exit when branch condition"];
}
subgraph cluster_22 {
color=blue
69 [label="Enter when branch condition "];
70 [label="Exit $subj"];
71 [label="Type operator: ($subj$ is R|SubClass2|)"];
72 [label="Exit when branch condition"];
68 [label="Enter when branch condition "];
69 [label="Exit $subj"];
70 [label="Type operator: ($subj$ is R|SubClass2|)"];
71 [label="Exit when branch condition"];
}
73 [label="Enter when branch result"];
72 [label="Enter when branch result"];
subgraph cluster_23 {
color=blue
74 [label="Enter block"];
75 [label="Const: String(2)"];
76 [label="Exit block"];
73 [label="Enter block"];
74 [label="Const: String(2)"];
75 [label="Exit block"];
}
77 [label="Exit when branch result"];
78 [label="Enter when branch result"];
76 [label="Exit when branch result"];
77 [label="Enter when branch result"];
subgraph cluster_24 {
color=blue
79 [label="Enter block"];
80 [label="Access variable R|<local>/p|"];
81 [label="Smart cast: R|<local>/p|"];
82 [label="Access variable R|/SubClass1.t|"];
83 [label="Exit block"];
78 [label="Enter block"];
79 [label="Access variable R|<local>/p|"];
80 [label="Smart cast: R|<local>/p|"];
81 [label="Access variable R|/SubClass1.t|"];
82 [label="Exit block"];
}
84 [label="Exit when branch result"];
85 [label="Exit when"];
83 [label="Exit when branch result"];
84 [label="Exit when"];
}
86 [label="Access variable R|kotlin/String.length|"];
87 [label="Exit block"];
85 [label="Access variable R|kotlin/String.length|"];
86 [label="Exit block"];
}
88 [label="Exit function foo" style="filled" fillcolor=red];
87 [label="Exit function foo" style="filled" fillcolor=red];
}
29 -> {30};
30 -> {31};
31 -> {32};
32 -> {33};
33 -> {34};
34 -> {35};
35 -> {36};
36 -> {37};
37 -> {38 47};
36 -> {37 46};
37 -> {38};
38 -> {39};
39 -> {40};
40 -> {41};
@@ -215,21 +214,21 @@ digraph lambdaInWhenBranch_kt {
42 -> {43};
43 -> {44};
44 -> {45};
45 -> {46};
46 -> {60};
45 -> {59};
46 -> {47};
47 -> {48};
48 -> {49};
49 -> {50};
50 -> {51 57};
50 -> {56} [style=dotted];
50 -> {51} [style=dashed];
49 -> {50 56};
49 -> {55} [style=dotted];
49 -> {50} [style=dashed];
50 -> {51};
51 -> {52};
52 -> {53};
53 -> {54};
54 -> {55};
55 -> {56};
56 -> {57} [color=green];
56 -> {60} [color=red];
55 -> {56} [color=green];
55 -> {59} [color=red];
56 -> {57};
57 -> {58};
58 -> {59};
59 -> {60};
@@ -240,8 +239,8 @@ digraph lambdaInWhenBranch_kt {
64 -> {65};
65 -> {66};
66 -> {67};
67 -> {68};
68 -> {69 78};
67 -> {68 77};
68 -> {69};
69 -> {70};
70 -> {71};
71 -> {72};
@@ -249,8 +248,8 @@ digraph lambdaInWhenBranch_kt {
73 -> {74};
74 -> {75};
75 -> {76};
76 -> {77};
77 -> {85};
76 -> {84};
77 -> {78};
78 -> {79};
79 -> {80};
80 -> {81};
@@ -260,6 +259,5 @@ digraph lambdaInWhenBranch_kt {
84 -> {85};
85 -> {86};
86 -> {87};
87 -> {88};
}