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
@@ -52,106 +52,104 @@ digraph plusAssignWithLambdaInRhs_kt {
subgraph cluster_4 {
color=red
17 [label="Enter class A" style="filled" fillcolor=red];
18 [label="Part of class initialization"];
subgraph cluster_5 {
color=blue
19 [label="Enter property" style="filled" fillcolor=red];
20 [label="Access variable R|<local>/executor|"];
21 [label="Exit property" style="filled" fillcolor=red];
18 [label="Enter property" style="filled" fillcolor=red];
19 [label="Access variable R|<local>/executor|"];
20 [label="Exit property" style="filled" fillcolor=red];
}
22 [label="Exit class A" style="filled" fillcolor=red];
21 [label="Exit class A" style="filled" fillcolor=red];
}
subgraph cluster_6 {
color=blue
23 [label="Enter function <init>" style="filled" fillcolor=red];
24 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
25 [label="Exit function <init>" style="filled" fillcolor=red];
22 [label="Enter function <init>" style="filled" fillcolor=red];
23 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
24 [label="Exit function <init>" style="filled" fillcolor=red];
}
17 -> {18} [color=green];
18 -> {19} [color=green];
18 -> {22} [style=dotted];
18 -> {19} [style=dashed];
17 -> {21} [style=dotted];
17 -> {18} [style=dashed];
18 -> {19};
19 -> {20};
20 -> {21};
20 -> {21} [color=green];
21 -> {22} [color=green];
22 -> {23} [color=green];
22 -> {23} [style=dashed];
21 -> {22} [style=dashed];
22 -> {23};
23 -> {24};
24 -> {25};
subgraph cluster_7 {
color=red
26 [label="Enter function postpone" style="filled" fillcolor=red];
25 [label="Enter function postpone" style="filled" fillcolor=red];
subgraph cluster_8 {
color=blue
27 [label="Enter block"];
28 [label="Function call: R|kotlin/collections/mutableListOf|<R|() -> kotlin/Unit|>()" style="filled" fillcolor=yellow];
29 [label="Variable declaration: lval queue: R|kotlin/collections/MutableList<kotlin/Function0<kotlin/Unit>>|"];
30 [label="Postponed enter to lambda"];
26 [label="Enter block"];
27 [label="Function call: R|kotlin/collections/mutableListOf|<R|() -> kotlin/Unit|>()" style="filled" fillcolor=yellow];
28 [label="Variable declaration: lval queue: R|kotlin/collections/MutableList<kotlin/Function0<kotlin/Unit>>|"];
29 [label="Postponed enter to lambda"];
subgraph cluster_9 {
color=blue
31 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
30 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_10 {
color=blue
32 [label="Enter block"];
33 [label="Access variable R|<local>/queue|"];
34 [label="Postponed enter to lambda"];
31 [label="Enter block"];
32 [label="Access variable R|<local>/queue|"];
33 [label="Postponed enter to lambda"];
subgraph cluster_11 {
color=blue
35 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
34 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_12 {
color=blue
36 [label="Enter block"];
37 [label="Function call: R|<local>/computation|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()" style="filled" fillcolor=yellow];
38 [label="Function call: R|<local>/resolve|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(...)" style="filled" fillcolor=yellow];
39 [label="Exit block"];
35 [label="Enter block"];
36 [label="Function call: R|<local>/computation|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()" style="filled" fillcolor=yellow];
37 [label="Function call: R|<local>/resolve|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(...)" style="filled" fillcolor=yellow];
38 [label="Exit block"];
}
40 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
39 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
}
41 [label="Postponed exit from lambda"];
42 [label="Function call: R|<local>/queue|.R|kotlin/collections/plusAssign|<R|() -> kotlin/Unit|>(...)" style="filled" fillcolor=yellow];
43 [label="Exit block"];
40 [label="Postponed exit from lambda"];
41 [label="Function call: R|<local>/queue|.R|kotlin/collections/plusAssign|<R|() -> kotlin/Unit|>(...)" style="filled" fillcolor=yellow];
42 [label="Exit block"];
}
44 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
43 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
}
45 [label="Postponed exit from lambda"];
46 [label="Function call: R|/A.A|<R|T|>(...)" style="filled" fillcolor=yellow];
47 [label="Jump: ^postpone R|/A.A|<R|T|>(<L> = A@fun <anonymous>(resolve: R|(T) -> kotlin/Unit|): R|kotlin/Unit| <inline=NoInline> {
44 [label="Postponed exit from lambda"];
45 [label="Function call: R|/A.A|<R|T|>(...)" style="filled" fillcolor=yellow];
46 [label="Jump: ^postpone R|/A.A|<R|T|>(<L> = A@fun <anonymous>(resolve: R|(T) -> kotlin/Unit|): R|kotlin/Unit| <inline=NoInline> {
R|<local>/queue|.R|kotlin/collections/plusAssign|<R|() -> kotlin/Unit|>(A@fun <anonymous>(): R|kotlin/Unit| <inline=Inline> {
R|<local>/resolve|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/computation|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
}
)
}
)"];
48 [label="Stub" style="filled" fillcolor=gray];
49 [label="Exit block" style="filled" fillcolor=gray];
47 [label="Stub" style="filled" fillcolor=gray];
48 [label="Exit block" style="filled" fillcolor=gray];
}
50 [label="Exit function postpone" style="filled" fillcolor=red];
49 [label="Exit function postpone" style="filled" fillcolor=red];
}
25 -> {26};
26 -> {27};
27 -> {28};
28 -> {29};
29 -> {30};
30 -> {31 45 46};
30 -> {31} [style=dashed];
29 -> {30 44 45};
29 -> {30} [style=dashed];
30 -> {31};
31 -> {32};
32 -> {33};
33 -> {34};
34 -> {35 41 42};
34 -> {35} [style=dashed];
33 -> {34 40 41};
33 -> {34} [style=dashed];
34 -> {35};
35 -> {36};
36 -> {37};
37 -> {38};
38 -> {39};
39 -> {40};
40 -> {41};
41 -> {42};
42 -> {43};
43 -> {44};
44 -> {45};
45 -> {46};
46 -> {47};
47 -> {50};
46 -> {49};
46 -> {47} [style=dotted];
47 -> {48} [style=dotted];
48 -> {49} [style=dotted];
49 -> {50} [style=dotted];
}