FIR CFA: attach method graphs to class exit node

Even for non-local classes. This ensures that the CFG edges in this case
will only go to a subgraph, not to an unrelated graph.
This commit is contained in:
pyos
2022-12-09 13:22:17 +01:00
committed by Dmitriy Novozhilov
parent aadea0e26f
commit 74758278d7
47 changed files with 1245 additions and 1181 deletions
@@ -5,57 +5,26 @@ digraph lambdaInWhenBranch_kt {
subgraph cluster_0 {
color=red
3 [label="Enter class Sealed" style="filled" fillcolor=red];
4 [label="Exit class Sealed" style="filled" fillcolor=red];
}
subgraph cluster_1 {
color=blue
0 [label="Enter function <init>" style="filled" fillcolor=red];
1 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
2 [label="Exit function <init>" style="filled" fillcolor=red];
}
3 -> {4} [color=green];
4 -> {0} [color=green];
4 -> {0} [style=dashed];
0 -> {1};
1 -> {2};
subgraph cluster_1 {
color=red
3 [label="Enter class Sealed" style="filled" fillcolor=red];
4 [label="Exit class Sealed" style="filled" fillcolor=red];
}
3 -> {4} [color=green];
subgraph cluster_2 {
color=red
5 [label="Enter function <init>" style="filled" fillcolor=red];
6 [label="Delegated constructor call: super<R|Sealed|>()" style="filled" fillcolor=yellow];
7 [label="Exit function <init>" style="filled" fillcolor=red];
}
5 -> {6};
6 -> {7};
subgraph cluster_3 {
color=red
11 [label="Enter function component1" style="filled" fillcolor=red];
12 [label="Exit function component1" style="filled" fillcolor=red];
}
11 -> {12};
subgraph cluster_4 {
color=red
13 [label="Enter function copy" style="filled" fillcolor=red];
subgraph cluster_5 {
color=blue
15 [label="Enter default value of t" style="filled" fillcolor=red];
16 [label="Access variable R|/SubClass1.t|"];
17 [label="Exit default value of t" style="filled" fillcolor=red];
}
14 [label="Exit function copy" style="filled" fillcolor=red];
}
13 -> {14 15};
15 -> {16};
15 -> {15} [style=dashed];
16 -> {17};
subgraph cluster_6 {
color=red
18 [label="Enter class SubClass1" style="filled" fillcolor=red];
19 [label="Part of class initialization"];
subgraph cluster_7 {
subgraph cluster_3 {
color=blue
8 [label="Enter property" style="filled" fillcolor=red];
9 [label="Access variable R|<local>/t|"];
@@ -63,36 +32,67 @@ digraph lambdaInWhenBranch_kt {
}
20 [label="Exit class SubClass1" style="filled" fillcolor=red];
}
subgraph cluster_4 {
color=blue
13 [label="Enter function copy" style="filled" fillcolor=red];
14 [label="Exit function copy" style="filled" fillcolor=red];
}
subgraph cluster_5 {
color=blue
15 [label="Enter default value of t" style="filled" fillcolor=red];
16 [label="Access variable R|/SubClass1.t|"];
17 [label="Exit default value of t" style="filled" fillcolor=red];
}
subgraph cluster_6 {
color=blue
11 [label="Enter function component1" style="filled" fillcolor=red];
12 [label="Exit function component1" style="filled" fillcolor=red];
}
subgraph cluster_7 {
color=blue
5 [label="Enter function <init>" style="filled" fillcolor=red];
6 [label="Delegated constructor call: super<R|Sealed|>()" style="filled" fillcolor=yellow];
7 [label="Exit function <init>" style="filled" fillcolor=red];
}
18 -> {19} [color=green];
19 -> {8} [color=green];
19 -> {20} [style=dotted];
19 -> {8} [style=dashed];
20 -> {5 11 13} [color=green];
20 -> {5 11 13} [style=dashed];
8 -> {9};
9 -> {10};
10 -> {20} [color=green];
5 -> {6};
6 -> {7};
11 -> {12};
13 -> {14 15};
15 -> {16};
15 -> {15} [style=dashed];
16 -> {17};
subgraph cluster_8 {
color=red
21 [label="Enter function <init>" style="filled" fillcolor=red];
22 [label="Delegated constructor call: super<R|Sealed|>()" style="filled" fillcolor=yellow];
23 [label="Exit function <init>" style="filled" fillcolor=red];
}
21 -> {22};
22 -> {23};
subgraph cluster_9 {
color=red
24 [label="Enter function copy" style="filled" fillcolor=red];
25 [label="Exit function copy" style="filled" fillcolor=red];
}
24 -> {25};
subgraph cluster_10 {
color=red
26 [label="Enter class SubClass2" style="filled" fillcolor=red];
27 [label="Exit class SubClass2" style="filled" fillcolor=red];
}
subgraph cluster_9 {
color=blue
24 [label="Enter function copy" style="filled" fillcolor=red];
25 [label="Exit function copy" style="filled" fillcolor=red];
}
subgraph cluster_10 {
color=blue
21 [label="Enter function <init>" style="filled" fillcolor=red];
22 [label="Delegated constructor call: super<R|Sealed|>()" style="filled" fillcolor=yellow];
23 [label="Exit function <init>" style="filled" fillcolor=red];
}
26 -> {27} [color=green];
27 -> {21 24} [color=green];
27 -> {21 24} [style=dashed];
21 -> {22};
22 -> {23};
24 -> {25};
subgraph cluster_11 {
color=red