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

FIR CFA: remove class initializer part nodes

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/cfg/initBlock.dot
Vendored
+40 -44
View File
@@ -6,89 +6,85 @@ digraph initBlock_kt {
subgraph cluster_0 {
color=red
0 [label="Enter class Foo" style="filled" fillcolor=red];
1 [label="Part of class initialization"];
subgraph cluster_1 {
color=blue
2 [label="Enter init block" style="filled" fillcolor=red];
1 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_2 {
color=blue
3 [label="Enter block"];
4 [label="Const: Int(1)"];
5 [label="Variable declaration: lval x: R|kotlin/Int|"];
6 [label="Exit block"];
2 [label="Enter block"];
3 [label="Const: Int(1)"];
4 [label="Variable declaration: lval x: R|kotlin/Int|"];
5 [label="Exit block"];
}
7 [label="Exit init block" style="filled" fillcolor=red];
6 [label="Exit init block" style="filled" fillcolor=red];
}
8 [label="Exit class Foo" style="filled" fillcolor=red];
7 [label="Exit class Foo" style="filled" fillcolor=red];
}
subgraph cluster_3 {
color=blue
9 [label="Enter function <init>" style="filled" fillcolor=red];
10 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
11 [label="Exit function <init>" style="filled" fillcolor=red];
8 [label="Enter function <init>" style="filled" fillcolor=red];
9 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
10 [label="Exit function <init>" style="filled" fillcolor=red];
}
0 -> {1} [color=green];
1 -> {2} [color=green];
1 -> {8} [style=dotted];
1 -> {2} [style=dashed];
0 -> {7} [style=dotted];
0 -> {1} [style=dashed];
1 -> {2};
2 -> {3};
3 -> {4};
4 -> {5};
5 -> {6};
6 -> {7};
6 -> {7} [color=green];
7 -> {8} [color=green];
8 -> {9} [color=green];
8 -> {9} [style=dashed];
7 -> {8} [style=dashed];
8 -> {9};
9 -> {10};
10 -> {11};
subgraph cluster_4 {
color=red
12 [label="Enter class Bar" style="filled" fillcolor=red];
13 [label="Part of class initialization"];
11 [label="Enter class Bar" style="filled" fillcolor=red];
subgraph cluster_5 {
color=blue
14 [label="Enter init block" style="filled" fillcolor=red];
12 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_6 {
color=blue
15 [label="Enter block"];
16 [label="Const: Int(1)"];
17 [label="Variable declaration: lval x: R|kotlin/Int|"];
18 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
19 [label="Throw: throw R|java/lang/Exception.Exception|()"];
20 [label="Stub" style="filled" fillcolor=gray];
21 [label="Const: Int(2)" style="filled" fillcolor=gray];
22 [label="Variable declaration: lval y: R|kotlin/Int|" style="filled" fillcolor=gray];
23 [label="Exit block" style="filled" fillcolor=gray];
13 [label="Enter block"];
14 [label="Const: Int(1)"];
15 [label="Variable declaration: lval x: R|kotlin/Int|"];
16 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
17 [label="Throw: throw R|java/lang/Exception.Exception|()"];
18 [label="Stub" style="filled" fillcolor=gray];
19 [label="Const: Int(2)" style="filled" fillcolor=gray];
20 [label="Variable declaration: lval y: R|kotlin/Int|" style="filled" fillcolor=gray];
21 [label="Exit block" style="filled" fillcolor=gray];
}
24 [label="Exit init block" style="filled" fillcolor=gray];
22 [label="Exit init block" style="filled" fillcolor=gray];
}
25 [label="Exit class Bar" style="filled" fillcolor=gray];
23 [label="Exit class Bar" style="filled" fillcolor=gray];
}
subgraph cluster_7 {
color=blue
26 [label="Enter function <init>" style="filled" fillcolor=gray];
27 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
28 [label="Exit function <init>" style="filled" fillcolor=red];
24 [label="Enter function <init>" style="filled" fillcolor=gray];
25 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=gray];
26 [label="Exit function <init>" style="filled" fillcolor=gray];
}
12 -> {13} [color=green];
13 -> {14} [color=green];
13 -> {25} [style=dotted];
13 -> {14} [style=dashed];
11 -> {12} [color=green];
11 -> {23} [style=dotted];
11 -> {12} [style=dashed];
12 -> {13};
13 -> {14};
14 -> {15};
15 -> {16};
16 -> {17};
17 -> {18};
18 -> {19};
17 -> {18} [style=dotted];
18 -> {19} [style=dotted];
19 -> {20} [style=dotted];
20 -> {21} [style=dotted];
21 -> {22} [style=dotted];
22 -> {23} [style=dotted];
23 -> {24} [style=dotted];
23 -> {24} [style=dashed];
24 -> {25} [style=dotted];
25 -> {26} [style=dotted];
25 -> {26} [style=dashed];
26 -> {27};
27 -> {28};
}