azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR CFA: attach method graphs to class exit node

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/assignSafeCall.dot
Vendored
+53 -54
View File
@@ -5,17 +5,30 @@ digraph assignSafeCall_kt {
subgraph cluster_0 {
color=red
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];
17 [label="Enter class A" style="filled" fillcolor=red];
18 [label="Part of class initialization"];
subgraph cluster_1 {
color=blue
10 [label="Enter property" style="filled" fillcolor=red];
11 [label="Const: Int(1)"];
12 [label="Exit property" style="filled" fillcolor=red];
}
19 [label="Exit class A" style="filled" fillcolor=red];
}
0 -> {1};
1 -> {2};
subgraph cluster_1 {
color=red
subgraph cluster_2 {
color=blue
13 [label="Enter function bar" style="filled" fillcolor=red];
subgraph cluster_3 {
color=blue
14 [label="Enter block"];
15 [label="Exit block"];
}
16 [label="Exit function bar" style="filled" fillcolor=red];
}
subgraph cluster_4 {
color=blue
3 [label="Enter function foo" style="filled" fillcolor=red];
subgraph cluster_2 {
subgraph cluster_5 {
color=blue
4 [label="Enter block"];
5 [label="Const: Int(1)"];
@@ -25,6 +38,23 @@ digraph assignSafeCall_kt {
}
9 [label="Exit function foo" style="filled" fillcolor=red];
}
subgraph cluster_6 {
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];
}
17 -> {18} [color=green];
18 -> {10} [color=green];
18 -> {19} [style=dotted];
18 -> {10} [style=dashed];
19 -> {0 3 13} [color=green];
19 -> {0 3 13} [style=dashed];
10 -> {11};
11 -> {12};
12 -> {19} [color=green];
0 -> {1};
1 -> {2};
3 -> {4};
4 -> {5};
5 -> {6};
@@ -32,41 +62,10 @@ digraph assignSafeCall_kt {
6 -> {7} [style=dotted];
7 -> {8} [style=dotted];
8 -> {9} [style=dotted];
subgraph cluster_3 {
color=red
13 [label="Enter function bar" style="filled" fillcolor=red];
subgraph cluster_4 {
color=blue
14 [label="Enter block"];
15 [label="Exit block"];
}
16 [label="Exit function bar" style="filled" fillcolor=red];
}
13 -> {14};
14 -> {15};
15 -> {16};
subgraph cluster_5 {
color=red
17 [label="Enter class A" style="filled" fillcolor=red];
18 [label="Part of class initialization"];
subgraph cluster_6 {
color=blue
10 [label="Enter property" style="filled" fillcolor=red];
11 [label="Const: Int(1)"];
12 [label="Exit property" style="filled" fillcolor=red];
}
19 [label="Exit class A" style="filled" fillcolor=red];
}
17 -> {18} [color=green];
18 -> {10} [color=green];
18 -> {19} [style=dotted];
18 -> {10} [style=dashed];
10 -> {11};
11 -> {12};
12 -> {19} [color=green];
subgraph cluster_7 {
color=red
20 [label="Enter function test_1" style="filled" fillcolor=red];
@@ -237,25 +236,25 @@ digraph assignSafeCall_kt {
84 -> {85};
subgraph cluster_19 {
color=red
86 [label="Enter function foo" style="filled" fillcolor=red];
87 [label="Exit function foo" style="filled" fillcolor=red];
}
86 -> {87};
subgraph cluster_20 {
color=red
88 [label="Enter function bar" style="filled" fillcolor=red];
89 [label="Exit function bar" style="filled" fillcolor=red];
}
88 -> {89};
subgraph cluster_21 {
color=red
90 [label="Enter class B" style="filled" fillcolor=red];
91 [label="Exit class B" style="filled" fillcolor=red];
}
subgraph cluster_20 {
color=blue
88 [label="Enter function bar" style="filled" fillcolor=red];
89 [label="Exit function bar" style="filled" fillcolor=red];
}
subgraph cluster_21 {
color=blue
86 [label="Enter function foo" style="filled" fillcolor=red];
87 [label="Exit function foo" style="filled" fillcolor=red];
}
90 -> {91} [color=green];
91 -> {86 88} [color=green];
91 -> {86 88} [style=dashed];
86 -> {87};
88 -> {89};
subgraph cluster_22 {
color=red