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
@@ -77,170 +77,168 @@ digraph delegateWithAnonymousObject_kt {
subgraph cluster_8 {
color=red
23 [label="Enter class IssuesListUserProfile" style="filled" fillcolor=red];
24 [label="Part of class initialization"];
subgraph cluster_9 {
color=blue
25 [label="Enter property" style="filled" fillcolor=red];
26 [label="Postponed enter to lambda"];
24 [label="Enter property" style="filled" fillcolor=red];
25 [label="Postponed enter to lambda"];
subgraph cluster_10 {
color=blue
27 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
26 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_11 {
color=blue
28 [label="Enter block"];
29 [label="Enter anonymous object"];
27 [label="Enter block"];
28 [label="Enter anonymous object"];
subgraph cluster_12 {
color=blue
30 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
31 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
29 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
30 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
}
32 [label="Exit anonymous object"];
33 [label="Exit anonymous object expression"];
34 [label="Exit block"];
31 [label="Exit anonymous object"];
32 [label="Exit anonymous object expression"];
33 [label="Exit block"];
}
35 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
34 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
}
subgraph cluster_13 {
color=blue
36 [label="Enter function setValue" style="filled" fillcolor=red];
35 [label="Enter function setValue" style="filled" fillcolor=red];
subgraph cluster_14 {
color=blue
37 [label="Enter block"];
38 [label="Function call: R|/IssueListView.IssueListView|()" style="filled" fillcolor=yellow];
39 [label="Access variable R|<local>/value|"];
40 [label="Function call: R|/IssueListView.IssueListView|().R|/IssueListView.updateFrom|(...)" style="filled" fillcolor=yellow];
41 [label="Jump: ^setValue R|/IssueListView.IssueListView|().R|/IssueListView.updateFrom|(R|<local>/value|)"];
42 [label="Stub" style="filled" fillcolor=gray];
43 [label="Exit block" style="filled" fillcolor=gray];
36 [label="Enter block"];
37 [label="Function call: R|/IssueListView.IssueListView|()" style="filled" fillcolor=yellow];
38 [label="Access variable R|<local>/value|"];
39 [label="Function call: R|/IssueListView.IssueListView|().R|/IssueListView.updateFrom|(...)" style="filled" fillcolor=yellow];
40 [label="Jump: ^setValue R|/IssueListView.IssueListView|().R|/IssueListView.updateFrom|(R|<local>/value|)"];
41 [label="Stub" style="filled" fillcolor=gray];
42 [label="Exit block" style="filled" fillcolor=gray];
}
44 [label="Exit function setValue" style="filled" fillcolor=red];
43 [label="Exit function setValue" style="filled" fillcolor=red];
}
subgraph cluster_15 {
color=blue
45 [label="Enter function getValue" style="filled" fillcolor=red];
44 [label="Enter function getValue" style="filled" fillcolor=red];
subgraph cluster_16 {
color=blue
46 [label="Enter block"];
47 [label="Function call: R|/IssueListView.IssueListView|()" style="filled" fillcolor=yellow];
48 [label="Jump: ^getValue R|/IssueListView.IssueListView|()"];
49 [label="Stub" style="filled" fillcolor=gray];
50 [label="Exit block" style="filled" fillcolor=gray];
45 [label="Enter block"];
46 [label="Function call: R|/IssueListView.IssueListView|()" style="filled" fillcolor=yellow];
47 [label="Jump: ^getValue R|/IssueListView.IssueListView|()"];
48 [label="Stub" style="filled" fillcolor=gray];
49 [label="Exit block" style="filled" fillcolor=gray];
}
51 [label="Exit function getValue" style="filled" fillcolor=red];
50 [label="Exit function getValue" style="filled" fillcolor=red];
}
subgraph cluster_17 {
color=blue
52 [label="Enter function <init>" style="filled" fillcolor=red];
53 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
54 [label="Exit function <init>" style="filled" fillcolor=red];
51 [label="Enter function <init>" style="filled" fillcolor=red];
52 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
53 [label="Exit function <init>" style="filled" fillcolor=red];
}
55 [label="Postponed exit from lambda"];
56 [label="Function call: this@R|/IssuesListUserProfile|.R|/delegate|<R|IssuesListUserProfile|, R|IssuesListUserProfile|, R|IssueListView|>(...)" style="filled" fillcolor=yellow];
57 [label="Access variable this@R|/IssuesListUserProfile|"];
58 [label="Function call: this@R|/IssuesListUserProfile|.R|/delegate|<R|IssuesListUserProfile|, R|IssuesListUserProfile|, R|IssueListView|>(...).<Unresolved name: provideDelegate>#(...)" style="filled" fillcolor=yellow];
59 [label="Exit property delegate" style="filled" fillcolor=yellow];
60 [label="Exit property" style="filled" fillcolor=red];
54 [label="Postponed exit from lambda"];
55 [label="Function call: this@R|/IssuesListUserProfile|.R|/delegate|<R|IssuesListUserProfile|, R|IssuesListUserProfile|, R|IssueListView|>(...)" style="filled" fillcolor=yellow];
56 [label="Access variable this@R|/IssuesListUserProfile|"];
57 [label="Function call: this@R|/IssuesListUserProfile|.R|/delegate|<R|IssuesListUserProfile|, R|IssuesListUserProfile|, R|IssueListView|>(...).<Unresolved name: provideDelegate>#(...)" style="filled" fillcolor=yellow];
58 [label="Exit property delegate" style="filled" fillcolor=yellow];
59 [label="Exit property" style="filled" fillcolor=red];
}
61 [label="Exit class IssuesListUserProfile" style="filled" fillcolor=red];
60 [label="Exit class IssuesListUserProfile" style="filled" fillcolor=red];
}
subgraph cluster_18 {
color=blue
62 [label="Enter function setter" style="filled" fillcolor=red];
61 [label="Enter function setter" style="filled" fillcolor=red];
subgraph cluster_19 {
color=blue
63 [label="Enter block"];
64 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
65 [label="Access variable this@R|/IssuesListUserProfile|"];
66 [label="Access variable R|<local>/issueListView|"];
67 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(...)" style="filled" fillcolor=yellow];
68 [label="Exit block"];
62 [label="Enter block"];
63 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
64 [label="Access variable this@R|/IssuesListUserProfile|"];
65 [label="Access variable R|<local>/issueListView|"];
66 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(...)" style="filled" fillcolor=yellow];
67 [label="Exit block"];
}
69 [label="Exit function setter" style="filled" fillcolor=red];
68 [label="Exit function setter" style="filled" fillcolor=red];
}
subgraph cluster_20 {
color=blue
70 [label="Enter function getter" style="filled" fillcolor=red];
69 [label="Enter function getter" style="filled" fillcolor=red];
subgraph cluster_21 {
color=blue
71 [label="Enter block"];
72 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
73 [label="Access variable this@R|/IssuesListUserProfile|"];
74 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|Stub (chain inference): TypeVariable(_Target)|>|(...)" style="filled" fillcolor=yellow];
75 [label="Jump: ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|Stub (chain inference): TypeVariable(_Target)|>|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|)"];
76 [label="Stub" style="filled" fillcolor=gray];
77 [label="Exit block" style="filled" fillcolor=gray];
70 [label="Enter block"];
71 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
72 [label="Access variable this@R|/IssuesListUserProfile|"];
73 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|Stub (chain inference): TypeVariable(_Target)|>|(...)" style="filled" fillcolor=yellow];
74 [label="Jump: ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|Stub (chain inference): TypeVariable(_Target)|>|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|)"];
75 [label="Stub" style="filled" fillcolor=gray];
76 [label="Exit block" style="filled" fillcolor=gray];
}
78 [label="Exit function getter" style="filled" fillcolor=red];
77 [label="Exit function getter" style="filled" fillcolor=red];
}
subgraph cluster_22 {
color=blue
79 [label="Enter function <init>" style="filled" fillcolor=red];
80 [label="Delegated constructor call: super<R|DelegateProvider<IssuesListUserProfile>|>()" style="filled" fillcolor=yellow];
81 [label="Exit function <init>" style="filled" fillcolor=red];
78 [label="Enter function <init>" style="filled" fillcolor=red];
79 [label="Delegated constructor call: super<R|DelegateProvider<IssuesListUserProfile>|>()" style="filled" fillcolor=yellow];
80 [label="Exit function <init>" style="filled" fillcolor=red];
}
23 -> {24} [color=green];
24 -> {25} [color=green];
24 -> {61} [style=dotted];
24 -> {25} [style=dashed];
25 -> {26};
26 -> {27 55 56};
26 -> {27} [style=dashed];
23 -> {60} [style=dotted];
23 -> {24} [style=dashed];
24 -> {25};
25 -> {26 54 55};
25 -> {26} [style=dashed];
26 -> {27};
27 -> {28};
28 -> {29};
29 -> {30};
29 -> {32} [color=red];
29 -> {30} [style=dashed];
30 -> {31} [color=green];
30 -> {36 45 52} [color=red];
31 -> {32 36 45 52} [color=green];
31 -> {36 45 52} [style=dashed];
28 -> {31} [color=red];
28 -> {29} [style=dashed];
29 -> {30} [color=green];
29 -> {35 44 51} [color=red];
30 -> {31 35 44 51} [color=green];
30 -> {35 44 51} [style=dashed];
31 -> {32};
32 -> {33};
33 -> {34};
34 -> {35};
35 -> {36};
36 -> {37};
37 -> {38};
38 -> {39};
39 -> {40};
40 -> {41};
41 -> {44};
40 -> {43};
40 -> {41} [style=dotted];
41 -> {42} [style=dotted];
42 -> {43} [style=dotted];
43 -> {44} [style=dotted];
44 -> {45};
45 -> {46};
46 -> {47};
47 -> {48};
48 -> {51};
47 -> {50};
47 -> {48} [style=dotted];
48 -> {49} [style=dotted];
49 -> {50} [style=dotted];
50 -> {51} [style=dotted];
51 -> {52};
52 -> {53};
53 -> {54};
55 -> {56} [color=green];
55 -> {59} [color=red];
54 -> {55} [color=green];
54 -> {58} [color=red];
55 -> {56};
56 -> {57};
57 -> {58};
58 -> {59};
59 -> {60};
60 -> {61} [color=green];
61 -> {62 70 79} [color=green];
61 -> {62 70 79} [style=dashed];
59 -> {60} [color=green];
60 -> {61 69 78} [color=green];
60 -> {61 69 78} [style=dashed];
61 -> {62};
62 -> {63};
63 -> {64};
64 -> {65};
65 -> {66};
66 -> {67};
67 -> {68};
68 -> {69};
69 -> {70};
70 -> {71};
71 -> {72};
72 -> {73};
73 -> {74};
74 -> {75};
75 -> {78};
74 -> {77};
74 -> {75} [style=dotted];
75 -> {76} [style=dotted];
76 -> {77} [style=dotted];
77 -> {78} [style=dotted];
78 -> {79};
79 -> {80};
80 -> {81};
}