[FIR] Create CFG for files to track top-level property initialization
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
+96
-89
@@ -5,127 +5,134 @@ digraph variableInitializedInTryBlock_kt {
|
||||
|
||||
subgraph cluster_0 {
|
||||
color=red
|
||||
0 [label="Enter function test" style="filled" fillcolor=red];
|
||||
subgraph cluster_1 {
|
||||
color=blue
|
||||
1 [label="Enter block"];
|
||||
2 [label="Variable declaration: lval b: R|kotlin/Boolean|"];
|
||||
subgraph cluster_2 {
|
||||
color=blue
|
||||
3 [label="Try expression enter"];
|
||||
subgraph cluster_3 {
|
||||
color=blue
|
||||
4 [label="Try main block enter"];
|
||||
subgraph cluster_4 {
|
||||
color=blue
|
||||
5 [label="Enter block"];
|
||||
6 [label="Function call: R|/getStringOrNull|()" style="filled" fillcolor=yellow];
|
||||
7 [label="Exit lhs of ?:"];
|
||||
8 [label="Enter rhs of ?:"];
|
||||
9 [label="Jump: ^test Unit"];
|
||||
10 [label="Stub" style="filled" fillcolor=gray];
|
||||
11 [label="Lhs of ?: is not null"];
|
||||
12 [label="Exit ?:"];
|
||||
13 [label="Variable declaration: lval s: R|kotlin/String|"];
|
||||
14 [label="Access variable R|<local>/s|"];
|
||||
15 [label="Access variable R|kotlin/String.length|"];
|
||||
16 [label="Const: Int(0)"];
|
||||
17 [label="Equality operator !="];
|
||||
18 [label="Assignment: R|<local>/b|"];
|
||||
19 [label="Exit block"];
|
||||
}
|
||||
20 [label="Try main block exit"];
|
||||
}
|
||||
subgraph cluster_5 {
|
||||
color=blue
|
||||
21 [label="Enter finally"];
|
||||
subgraph cluster_6 {
|
||||
color=blue
|
||||
22 [label="Enter block"];
|
||||
23 [label="Function call: R|/test|()" style="filled" fillcolor=yellow];
|
||||
24 [label="Exit block"];
|
||||
}
|
||||
25 [label="Exit finally"];
|
||||
}
|
||||
26 [label="Try expression exit"];
|
||||
}
|
||||
27 [label="Access variable R|<local>/b|"];
|
||||
28 [label="Function call: R|/takeBoolean|(...)" style="filled" fillcolor=yellow];
|
||||
29 [label="Exit block"];
|
||||
}
|
||||
30 [label="Exit function test" style="filled" fillcolor=red];
|
||||
0 [label="Enter file variableInitializedInTryBlock.kt" style="filled" fillcolor=red];
|
||||
1 [label="Exit file variableInitializedInTryBlock.kt" style="filled" fillcolor=red];
|
||||
}
|
||||
0 -> {1} [color=green];
|
||||
|
||||
subgraph cluster_1 {
|
||||
color=red
|
||||
2 [label="Enter function test" style="filled" fillcolor=red];
|
||||
subgraph cluster_2 {
|
||||
color=blue
|
||||
3 [label="Enter block"];
|
||||
4 [label="Variable declaration: lval b: R|kotlin/Boolean|"];
|
||||
subgraph cluster_3 {
|
||||
color=blue
|
||||
5 [label="Try expression enter"];
|
||||
subgraph cluster_4 {
|
||||
color=blue
|
||||
6 [label="Try main block enter"];
|
||||
subgraph cluster_5 {
|
||||
color=blue
|
||||
7 [label="Enter block"];
|
||||
8 [label="Function call: R|/getStringOrNull|()" style="filled" fillcolor=yellow];
|
||||
9 [label="Exit lhs of ?:"];
|
||||
10 [label="Enter rhs of ?:"];
|
||||
11 [label="Jump: ^test Unit"];
|
||||
12 [label="Stub" style="filled" fillcolor=gray];
|
||||
13 [label="Lhs of ?: is not null"];
|
||||
14 [label="Exit ?:"];
|
||||
15 [label="Variable declaration: lval s: R|kotlin/String|"];
|
||||
16 [label="Access variable R|<local>/s|"];
|
||||
17 [label="Access variable R|kotlin/String.length|"];
|
||||
18 [label="Const: Int(0)"];
|
||||
19 [label="Equality operator !="];
|
||||
20 [label="Assignment: R|<local>/b|"];
|
||||
21 [label="Exit block"];
|
||||
}
|
||||
22 [label="Try main block exit"];
|
||||
}
|
||||
subgraph cluster_6 {
|
||||
color=blue
|
||||
23 [label="Enter finally"];
|
||||
subgraph cluster_7 {
|
||||
color=blue
|
||||
24 [label="Enter block"];
|
||||
25 [label="Function call: R|/test|()" style="filled" fillcolor=yellow];
|
||||
26 [label="Exit block"];
|
||||
}
|
||||
27 [label="Exit finally"];
|
||||
}
|
||||
28 [label="Try expression exit"];
|
||||
}
|
||||
29 [label="Access variable R|<local>/b|"];
|
||||
30 [label="Function call: R|/takeBoolean|(...)" style="filled" fillcolor=yellow];
|
||||
31 [label="Exit block"];
|
||||
}
|
||||
32 [label="Exit function test" style="filled" fillcolor=red];
|
||||
}
|
||||
0 -> {1};
|
||||
1 -> {2};
|
||||
2 -> {3};
|
||||
3 -> {4};
|
||||
3 -> {21} [label="onUncaughtException"];
|
||||
4 -> {5};
|
||||
5 -> {6};
|
||||
5 -> {23} [label="onUncaughtException"];
|
||||
6 -> {7};
|
||||
6 -> {21} [label="onUncaughtException"];
|
||||
7 -> {8 11};
|
||||
7 -> {8};
|
||||
8 -> {9};
|
||||
9 -> {21} [label="return@/test"];
|
||||
9 -> {10} [style=dotted];
|
||||
10 -> {12} [style=dotted];
|
||||
11 -> {12};
|
||||
12 -> {13};
|
||||
8 -> {23} [label="onUncaughtException"];
|
||||
9 -> {10 13};
|
||||
10 -> {11};
|
||||
11 -> {23} [label="return@/test"];
|
||||
11 -> {12} [style=dotted];
|
||||
12 -> {14} [style=dotted];
|
||||
13 -> {14};
|
||||
14 -> {15};
|
||||
14 -> {21} [label="onUncaughtException"];
|
||||
15 -> {16};
|
||||
15 -> {21} [label="onUncaughtException"];
|
||||
16 -> {17};
|
||||
16 -> {23} [label="onUncaughtException"];
|
||||
17 -> {18};
|
||||
17 -> {21} [label="onUncaughtException"];
|
||||
17 -> {23} [label="onUncaughtException"];
|
||||
18 -> {19};
|
||||
19 -> {20};
|
||||
19 -> {23} [label="onUncaughtException"];
|
||||
20 -> {21};
|
||||
21 -> {22};
|
||||
22 -> {23};
|
||||
23 -> {24};
|
||||
24 -> {25};
|
||||
25 -> {26};
|
||||
25 -> {30} [label="return@/test"];
|
||||
26 -> {27};
|
||||
27 -> {28};
|
||||
27 -> {32} [label="return@/test"];
|
||||
28 -> {29};
|
||||
29 -> {30};
|
||||
|
||||
subgraph cluster_7 {
|
||||
color=red
|
||||
31 [label="Enter function takeBoolean" style="filled" fillcolor=red];
|
||||
subgraph cluster_8 {
|
||||
color=blue
|
||||
32 [label="Enter block"];
|
||||
33 [label="Exit block"];
|
||||
}
|
||||
34 [label="Exit function takeBoolean" style="filled" fillcolor=red];
|
||||
}
|
||||
30 -> {31};
|
||||
31 -> {32};
|
||||
32 -> {33};
|
||||
33 -> {34};
|
||||
|
||||
subgraph cluster_9 {
|
||||
subgraph cluster_8 {
|
||||
color=red
|
||||
35 [label="Enter function getStringOrNull" style="filled" fillcolor=red];
|
||||
subgraph cluster_10 {
|
||||
33 [label="Enter function takeBoolean" style="filled" fillcolor=red];
|
||||
subgraph cluster_9 {
|
||||
color=blue
|
||||
36 [label="Enter block"];
|
||||
37 [label="Const: String(hello)"];
|
||||
38 [label="Jump: ^getStringOrNull String(hello)"];
|
||||
39 [label="Stub" style="filled" fillcolor=gray];
|
||||
40 [label="Exit block" style="filled" fillcolor=gray];
|
||||
34 [label="Enter block"];
|
||||
35 [label="Exit block"];
|
||||
}
|
||||
41 [label="Exit function getStringOrNull" style="filled" fillcolor=red];
|
||||
36 [label="Exit function takeBoolean" style="filled" fillcolor=red];
|
||||
}
|
||||
33 -> {34};
|
||||
34 -> {35};
|
||||
35 -> {36};
|
||||
36 -> {37};
|
||||
|
||||
subgraph cluster_10 {
|
||||
color=red
|
||||
37 [label="Enter function getStringOrNull" style="filled" fillcolor=red];
|
||||
subgraph cluster_11 {
|
||||
color=blue
|
||||
38 [label="Enter block"];
|
||||
39 [label="Const: String(hello)"];
|
||||
40 [label="Jump: ^getStringOrNull String(hello)"];
|
||||
41 [label="Stub" style="filled" fillcolor=gray];
|
||||
42 [label="Exit block" style="filled" fillcolor=gray];
|
||||
}
|
||||
43 [label="Exit function getStringOrNull" style="filled" fillcolor=red];
|
||||
}
|
||||
37 -> {38};
|
||||
38 -> {41};
|
||||
38 -> {39} [style=dotted];
|
||||
39 -> {40} [style=dotted];
|
||||
38 -> {39};
|
||||
39 -> {40};
|
||||
40 -> {43};
|
||||
40 -> {41} [style=dotted];
|
||||
41 -> {42} [style=dotted];
|
||||
42 -> {43} [style=dotted];
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user