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

[FIR] Create CFG for files to track top-level property initialization

Browse Source 
In order to properly analyze top-level property initialization, a
control-flow graph must be created for FirFiles. This change adds the
foundation for the file CFG and updates body resolve to create the CFG.
Checking the CFG for proper initialization is separated into a following
change to ease code review.

KT-56683
This commit is contained in:
Brian Norman
2023-07-25 10:23:22 -05:00
committed by Space Team
parent 0b7eb32064
commit b55fda0c55
127 changed files with 19565 additions and 18746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/cfg/initBlock.dot
Vendored
+69 -62
View File
@@ -5,78 +5,83 @@ digraph initBlock_kt {
subgraph cluster_0 {
color=red
0 [label="Enter class Foo" style="filled" fillcolor=red];
subgraph cluster_1 {
color=blue
1 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_2 {
color=blue
2 [label="Enter block"];
3 [label="Const: Int(1)"];
4 [label="Variable declaration: lval x: R|kotlin/Int|"];
5 [label="Exit block"];
}
6 [label="Exit init block" style="filled" fillcolor=red];
}
subgraph cluster_3 {
color=blue
7 [label="Enter function <init>" style="filled" fillcolor=red];
8 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
9 [label="Exit function <init>" style="filled" fillcolor=red];
}
10 [label="Exit class Foo" style="filled" fillcolor=red];
0 [label="Enter file initBlock.kt" style="filled" fillcolor=red];
1 [label="Exit file initBlock.kt" style="filled" fillcolor=red];
}
0 -> {1} [color=green];
0 -> {10} [style=dotted];
0 -> {1 7} [style=dashed];
1 -> {2};
2 -> {3};
subgraph cluster_1 {
color=red
2 [label="Enter class Foo" style="filled" fillcolor=red];
subgraph cluster_2 {
color=blue
3 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_3 {
color=blue
4 [label="Enter block"];
5 [label="Const: Int(1)"];
6 [label="Variable declaration: lval x: R|kotlin/Int|"];
7 [label="Exit block"];
}
8 [label="Exit init block" style="filled" fillcolor=red];
}
subgraph cluster_4 {
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];
}
12 [label="Exit class Foo" style="filled" fillcolor=red];
}
2 -> {3} [color=green];
2 -> {12} [style=dotted];
2 -> {3 9} [style=dashed];
3 -> {4};
4 -> {5};
5 -> {6};
6 -> {7} [color=green];
6 -> {7};
7 -> {8};
8 -> {9};
9 -> {10} [color=green];
subgraph cluster_4 {
color=red
11 [label="Enter class Bar" style="filled" fillcolor=red];
subgraph cluster_5 {
color=blue
12 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_6 {
color=blue
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];
}
22 [label="Exit init block" style="filled" fillcolor=gray];
}
subgraph cluster_7 {
color=blue
23 [label="Enter function <init>" style="filled" fillcolor=gray];
24 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=gray];
25 [label="Exit function <init>" style="filled" fillcolor=gray];
}
26 [label="Exit class Bar" style="filled" fillcolor=gray];
}
8 -> {9} [color=green];
9 -> {10};
10 -> {11};
11 -> {12} [color=green];
11 -> {26} [style=dotted];
11 -> {12 23} [style=dashed];
12 -> {13};
13 -> {14};
subgraph cluster_5 {
color=red
13 [label="Enter class Bar" style="filled" fillcolor=red];
subgraph cluster_6 {
color=blue
14 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_7 {
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];
}
24 [label="Exit init block" style="filled" fillcolor=gray];
}
subgraph cluster_8 {
color=blue
25 [label="Enter function <init>" style="filled" fillcolor=gray];
26 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=gray];
27 [label="Exit function <init>" style="filled" fillcolor=gray];
}
28 [label="Exit class Bar" style="filled" fillcolor=gray];
}
13 -> {14} [color=green];
13 -> {28} [style=dotted];
13 -> {14 25} [style=dashed];
14 -> {15};
15 -> {16};
16 -> {17};
17 -> {18} [style=dotted];
18 -> {19} [style=dotted];
17 -> {18};
18 -> {19};
19 -> {20} [style=dotted];
20 -> {21} [style=dotted];
21 -> {22} [style=dotted];
@@ -84,5 +89,7 @@ digraph initBlock_kt {
23 -> {24} [style=dotted];
24 -> {25} [style=dotted];
25 -> {26} [style=dotted];
26 -> {27} [style=dotted];
27 -> {28} [style=dotted];
}