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

FIR CFA: add edges according to constructor delegation

Browse Source
This commit is contained in:
pyos
2023-01-18 12:02:00 +01:00
committed by teamcity
parent 29b7a8e435
commit 9f17b5de97
21 changed files with 593 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/cfg/initBlock.dot
Vendored
+39 -39
View File
@@ -8,33 +8,33 @@ digraph initBlock_kt {
0 [label="Enter class Foo" style="filled" fillcolor=red];
subgraph cluster_1 {
color=blue
1 [label="Enter function <init>" style="filled" fillcolor=red];
2 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
3 [label="Exit function <init>" style="filled" fillcolor=red];
}
subgraph cluster_2 {
color=blue
4 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_3 {
1 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_2 {
color=blue
5 [label="Enter block"];
6 [label="Const: Int(1)"];
7 [label="Variable declaration: lval x: R|kotlin/Int|"];
8 [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"];
}
9 [label="Exit init block" style="filled" fillcolor=red];
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 -> {1} [color=green];
0 -> {10} [style=dotted];
0 -> {1 4} [style=dashed];
0 -> {1 7} [style=dashed];
1 -> {2};
2 -> {3};
3 -> {4} [color=green];
3 -> {4};
4 -> {5};
5 -> {6};
6 -> {7};
6 -> {7} [color=green];
7 -> {8};
8 -> {9};
9 -> {10} [color=green];
@@ -44,40 +44,40 @@ digraph initBlock_kt {
11 [label="Enter class Bar" style="filled" fillcolor=red];
subgraph cluster_5 {
color=blue
12 [label="Enter function <init>" style="filled" fillcolor=red];
13 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
14 [label="Exit function <init>" style="filled" fillcolor=red];
}
subgraph cluster_6 {
color=blue
15 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_7 {
12 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_6 {
color=blue
16 [label="Enter block"];
17 [label="Const: Int(1)"];
18 [label="Variable declaration: lval x: R|kotlin/Int|"];
19 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
20 [label="Throw: throw R|java/lang/Exception.Exception|()"];
21 [label="Stub" style="filled" fillcolor=gray];
22 [label="Const: Int(2)" style="filled" fillcolor=gray];
23 [label="Variable declaration: lval y: R|kotlin/Int|" style="filled" fillcolor=gray];
24 [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];
}
25 [label="Exit init 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];
}
11 -> {12} [color=green];
11 -> {26} [style=dotted];
11 -> {12 15} [style=dashed];
11 -> {12 23} [style=dashed];
12 -> {13};
13 -> {14};
14 -> {15} [color=green];
14 -> {15};
15 -> {16};
16 -> {17};
17 -> {18};
18 -> {19};
19 -> {20};
17 -> {18} [style=dotted];
18 -> {19} [style=dotted];
19 -> {20} [style=dotted];
20 -> {21} [style=dotted];
21 -> {22} [style=dotted];
22 -> {23} [style=dotted];
compiler/fir/analysis-tests/testData/resolve/cfg/initBlockAndInPlaceLambda.dot
Vendored
+37 -37
View File
@@ -22,57 +22,57 @@ digraph initBlockAndInPlaceLambda_kt {
4 [label="Enter class C" style="filled" fillcolor=red];
subgraph cluster_3 {
color=blue
5 [label="Enter function <init>" style="filled" fillcolor=red];
6 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
7 [label="Exit function <init>" style="filled" fillcolor=red];
}
subgraph cluster_4 {
color=blue
8 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_5 {
5 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_4 {
color=blue
9 [label="Enter block"];
10 [label="Access variable R|<local>/a|"];
11 [label="Access variable R|/A.b|"];
12 [label="Enter safe call"];
13 [label="Postponed enter to lambda"];
subgraph cluster_6 {
6 [label="Enter block"];
7 [label="Access variable R|<local>/a|"];
8 [label="Access variable R|/A.b|"];
9 [label="Enter safe call"];
10 [label="Postponed enter to lambda"];
subgraph cluster_5 {
color=blue
14 [label="Enter function <anonymous>" style="filled" fillcolor=red];
subgraph cluster_7 {
11 [label="Enter function <anonymous>" style="filled" fillcolor=red];
subgraph cluster_6 {
color=blue
15 [label="Enter block"];
16 [label="Access variable R|<local>/a|"];
17 [label="Access variable R|<local>/it|"];
18 [label="Function call: R|/C.C|(...)" style="filled" fillcolor=yellow];
19 [label="Exit block"];
12 [label="Enter block"];
13 [label="Access variable R|<local>/a|"];
14 [label="Access variable R|<local>/it|"];
15 [label="Function call: R|/C.C|(...)" style="filled" fillcolor=yellow];
16 [label="Exit block"];
}
20 [label="Exit function <anonymous>" style="filled" fillcolor=red];
17 [label="Exit function <anonymous>" style="filled" fillcolor=red];
}
21 [label="Postponed exit from lambda"];
22 [label="Function call: $subj$.R|kotlin/let|<R|B|, R|C|>(...)" style="filled" fillcolor=yellow];
23 [label="Exit safe call"];
24 [label="Variable declaration: lval c: R|C?|"];
25 [label="Exit block"];
18 [label="Postponed exit from lambda"];
19 [label="Function call: $subj$.R|kotlin/let|<R|B|, R|C|>(...)" style="filled" fillcolor=yellow];
20 [label="Exit safe call"];
21 [label="Variable declaration: lval c: R|C?|"];
22 [label="Exit block"];
}
26 [label="Exit init block" style="filled" fillcolor=red];
23 [label="Exit init block" style="filled" fillcolor=red];
}
subgraph cluster_7 {
color=blue
24 [label="Enter function <init>" style="filled" fillcolor=red];
25 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
26 [label="Exit function <init>" style="filled" fillcolor=red];
}
27 [label="Exit class C" style="filled" fillcolor=red];
}
4 -> {5} [color=green];
4 -> {27} [style=dotted];
4 -> {5 8} [style=dashed];
4 -> {5 24} [style=dashed];
5 -> {6};
6 -> {7};
7 -> {8} [color=green];
8 -> {9};
7 -> {8};
8 -> {9 20};
9 -> {10};
10 -> {11};
11 -> {12 23};
10 -> {11 19};
10 -> {18} [style=dotted];
10 -> {11} [style=dashed];
11 -> {12};
12 -> {13};
13 -> {14 22};
13 -> {21} [style=dotted];
13 -> {14} [style=dashed];
13 -> {14};
14 -> {15};
15 -> {16};
16 -> {17};
@@ -82,7 +82,7 @@ digraph initBlockAndInPlaceLambda_kt {
20 -> {21};
21 -> {22};
22 -> {23};
23 -> {24};
23 -> {24} [color=green];
24 -> {25};
25 -> {26};
26 -> {27} [color=green];
compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInConstructor.dot
Vendored
+40 -40
View File
@@ -26,41 +26,41 @@ digraph postponedLambdaInConstructor_kt {
5 [label="Enter class B" style="filled" fillcolor=red];
subgraph cluster_3 {
color=blue
6 [label="Enter function <init>" style="filled" fillcolor=red];
6 [label="Enter property" style="filled" fillcolor=red];
7 [label="Access variable R|<local>/s|"];
8 [label="Postponed enter to lambda"];
subgraph cluster_4 {
color=blue
9 [label="Enter function <anonymous>" style="filled" fillcolor=red];
subgraph cluster_5 {
color=blue
10 [label="Enter block"];
11 [label="Exit anonymous function expression"];
subgraph cluster_6 {
color=blue
12 [label="Enter function <anonymous>" style="filled" fillcolor=red];
subgraph cluster_7 {
color=blue
13 [label="Enter block"];
14 [label="Access variable R|<local>/it|"];
15 [label="Exit block"];
}
16 [label="Exit function <anonymous>" style="filled" fillcolor=red];
}
17 [label="Exit block"];
}
18 [label="Exit function <anonymous>" style="filled" fillcolor=red];
}
19 [label="Postponed exit from lambda"];
20 [label="Function call: R|<local>/s|.R|kotlin/let|<R|kotlin/String|, R|() -> kotlin/String|>(...)" style="filled" fillcolor=yellow];
21 [label="Delegated constructor call: super<R|A|>(...)" style="filled" fillcolor=yellow];
22 [label="Exit function <init>" style="filled" fillcolor=red];
8 [label="Exit property" style="filled" fillcolor=red];
}
subgraph cluster_8 {
subgraph cluster_4 {
color=blue
23 [label="Enter property" style="filled" fillcolor=red];
24 [label="Access variable R|<local>/s|"];
25 [label="Exit property" style="filled" fillcolor=red];
9 [label="Enter function <init>" style="filled" fillcolor=red];
10 [label="Access variable R|<local>/s|"];
11 [label="Postponed enter to lambda"];
subgraph cluster_5 {
color=blue
12 [label="Enter function <anonymous>" style="filled" fillcolor=red];
subgraph cluster_6 {
color=blue
13 [label="Enter block"];
14 [label="Exit anonymous function expression"];
subgraph cluster_7 {
color=blue
15 [label="Enter function <anonymous>" style="filled" fillcolor=red];
subgraph cluster_8 {
color=blue
16 [label="Enter block"];
17 [label="Access variable R|<local>/it|"];
18 [label="Exit block"];
}
19 [label="Exit function <anonymous>" style="filled" fillcolor=red];
}
20 [label="Exit block"];
}
21 [label="Exit function <anonymous>" style="filled" fillcolor=red];
}
22 [label="Postponed exit from lambda"];
23 [label="Function call: R|<local>/s|.R|kotlin/let|<R|kotlin/String|, R|() -> kotlin/String|>(...)" style="filled" fillcolor=yellow];
24 [label="Delegated constructor call: super<R|A|>(...)" style="filled" fillcolor=yellow];
25 [label="Exit function <init>" style="filled" fillcolor=red];
}
26 [label="Exit class B" style="filled" fillcolor=red];
}
@@ -77,27 +77,27 @@ digraph postponedLambdaInConstructor_kt {
}
5 -> {6} [color=green];
5 -> {26} [style=dotted];
5 -> {6 23} [style=dashed];
5 -> {6 9} [style=dashed];
6 -> {7};
7 -> {8};
8 -> {9 20};
8 -> {19} [style=dotted];
8 -> {9} [style=dashed];
8 -> {9} [color=green];
9 -> {10};
10 -> {11};
11 -> {12 17};
11 -> {12 23};
11 -> {22} [style=dotted];
11 -> {12} [style=dashed];
12 -> {13};
13 -> {14};
14 -> {15};
14 -> {15 20};
14 -> {15} [style=dashed];
15 -> {16};
16 -> {17};
17 -> {18};
18 -> {19};
19 -> {20} [color=green];
19 -> {21} [color=red];
20 -> {21};
21 -> {22};
22 -> {23} [color=green];
22 -> {24} [color=red];
23 -> {24};
24 -> {25};
25 -> {26} [color=green];
compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.dot
Vendored
+41 -41
View File
@@ -92,22 +92,22 @@ digraph propertiesAndInitBlocks_kt {
29 [label="Enter class GetterLocalClass" style="filled" fillcolor=red];
subgraph cluster_11 {
color=blue
30 [label="Enter function <init>" style="filled" fillcolor=red];
31 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
32 [label="Exit function <init>" style="filled" fillcolor=red];
}
subgraph cluster_12 {
color=blue
33 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_13 {
30 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_12 {
color=blue
34 [label="Enter block"];
35 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
36 [label="Throw: throw R|java/lang/Exception.Exception|()"];
37 [label="Stub" style="filled" fillcolor=gray];
38 [label="Exit block" style="filled" fillcolor=gray];
31 [label="Enter block"];
32 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
33 [label="Throw: throw R|java/lang/Exception.Exception|()"];
34 [label="Stub" style="filled" fillcolor=gray];
35 [label="Exit block" style="filled" fillcolor=gray];
}
39 [label="Exit init block" style="filled" fillcolor=gray];
36 [label="Exit init block" style="filled" fillcolor=gray];
}
subgraph cluster_13 {
color=blue
37 [label="Enter function <init>" style="filled" fillcolor=gray];
38 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=gray];
39 [label="Exit function <init>" style="filled" fillcolor=gray];
}
40 [label="Exit class GetterLocalClass" style="filled" fillcolor=gray];
}
@@ -117,15 +117,15 @@ digraph propertiesAndInitBlocks_kt {
26 -> {29} [style=dashed];
27 -> {28};
29 -> {30};
29 -> {33} [color=red];
29 -> {37} [color=red];
29 -> {40} [style=dotted];
29 -> {30 33} [style=dashed];
29 -> {30 37} [style=dashed];
30 -> {31};
31 -> {32};
32 -> {33} [color=green];
33 -> {34};
34 -> {35};
35 -> {36};
32 -> {33};
33 -> {34} [style=dotted];
34 -> {35} [style=dotted];
35 -> {36} [style=dotted];
36 -> {37} [style=dotted];
37 -> {38} [style=dotted];
38 -> {39} [style=dotted];
@@ -155,23 +155,23 @@ digraph propertiesAndInitBlocks_kt {
52 [label="Enter class InitializerLocalClass" style="filled" fillcolor=red];
subgraph cluster_18 {
color=blue
53 [label="Enter function <init>" style="filled" fillcolor=red];
54 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
55 [label="Exit function <init>" style="filled" fillcolor=red];
}
subgraph cluster_19 {
color=blue
56 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_20 {
53 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_19 {
color=blue
57 [label="Enter block"];
58 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
59 [label="Throw: throw R|java/lang/Exception.Exception|()"];
60 [label="Stub" style="filled" fillcolor=gray];
61 [label="Const: Int(1)" style="filled" fillcolor=gray];
62 [label="Exit block" style="filled" fillcolor=gray];
54 [label="Enter block"];
55 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow];
56 [label="Throw: throw R|java/lang/Exception.Exception|()"];
57 [label="Stub" style="filled" fillcolor=gray];
58 [label="Const: Int(1)" style="filled" fillcolor=gray];
59 [label="Exit block" style="filled" fillcolor=gray];
}
63 [label="Exit init block" style="filled" fillcolor=gray];
60 [label="Exit init block" style="filled" fillcolor=gray];
}
subgraph cluster_20 {
color=blue
61 [label="Enter function <init>" style="filled" fillcolor=gray];
62 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=gray];
63 [label="Exit function <init>" style="filled" fillcolor=gray];
}
64 [label="Exit class InitializerLocalClass" style="filled" fillcolor=gray];
}
@@ -211,15 +211,15 @@ digraph propertiesAndInitBlocks_kt {
50 -> {51} [style=dotted];
51 -> {76} [style=dotted];
52 -> {53};
52 -> {56} [color=red];
52 -> {61} [color=red];
52 -> {64} [style=dotted];
52 -> {53 56} [style=dashed];
52 -> {53 61} [style=dashed];
53 -> {54};
54 -> {55};
55 -> {56} [color=green];
56 -> {57};
57 -> {58};
58 -> {59};
55 -> {56};
56 -> {57} [style=dotted];
57 -> {58} [style=dotted];
58 -> {59} [style=dotted];
59 -> {60} [style=dotted];
60 -> {61} [style=dotted];
61 -> {62} [style=dotted];