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/cfg/annotatedLocalClass.dot
Vendored
+12 -9
View File
@@ -5,20 +5,21 @@ digraph annotatedLocalClass_kt {
subgraph cluster_0 {
color=red
3 [label="Enter class Ann" style="filled" fillcolor=red];
4 [label="Exit class Ann" style="filled" fillcolor=red];
}
subgraph cluster_1 {
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];
}
3 -> {4} [color=green];
4 -> {0} [color=green];
4 -> {0} [style=dashed];
0 -> {1};
1 -> {2};
subgraph cluster_1 {
color=red
3 [label="Enter class Ann" style="filled" fillcolor=red];
4 [label="Exit class Ann" style="filled" fillcolor=red];
}
3 -> {4} [color=green];
subgraph cluster_2 {
color=red
5 [label="Enter function foo" style="filled" fillcolor=red];
@@ -80,11 +81,13 @@ digraph annotatedLocalClass_kt {
18 -> {19};
18 -> {25} [color=red];
19 -> {20};
19 -> {23 25} [color=green];
19 -> {23 25} [style=dashed];
19 -> {23} [color=green];
19 -> {23} [style=dashed];
20 -> {21};
21 -> {22};
23 -> {24} [color=green];
24 -> {25} [color=green];
24 -> {25} [style=dashed];
25 -> {26};
26 -> {27};
compiler/fir/analysis-tests/testData/resolve/cfg/complex.dot
Vendored
+8 -7
View File
@@ -4,18 +4,19 @@ digraph complex_kt {
edge [penwidth=2]
subgraph cluster_0 {
color=red
0 [label="Enter function close" style="filled" fillcolor=red];
1 [label="Exit function close" style="filled" fillcolor=red];
}
0 -> {1};
subgraph cluster_1 {
color=red
2 [label="Enter class AutoCloseable" style="filled" fillcolor=red];
3 [label="Exit class AutoCloseable" style="filled" fillcolor=red];
}
subgraph cluster_1 {
color=blue
0 [label="Enter function close" style="filled" fillcolor=red];
1 [label="Exit function close" style="filled" fillcolor=red];
}
2 -> {3} [color=green];
3 -> {0} [color=green];
3 -> {0} [style=dashed];
0 -> {1};
subgraph cluster_2 {
color=red
compiler/fir/analysis-tests/testData/resolve/cfg/initBlock.dot
Vendored
+24 -22
View File
@@ -4,22 +4,13 @@ digraph initBlock_kt {
edge [penwidth=2]
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];
}
0 -> {1};
1 -> {2};
subgraph cluster_1 {
color=red
9 [label="Enter class Foo" style="filled" fillcolor=red];
10 [label="Part of class initialization"];
subgraph cluster_2 {
subgraph cluster_1 {
color=blue
3 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_3 {
subgraph cluster_2 {
color=blue
4 [label="Enter block"];
5 [label="Const: Int(1)"];
@@ -30,34 +21,35 @@ digraph initBlock_kt {
}
11 [label="Exit class Foo" style="filled" fillcolor=red];
}
subgraph cluster_3 {
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];
}
9 -> {10} [color=green];
10 -> {3} [color=green];
10 -> {11} [style=dotted];
10 -> {3} [style=dashed];
11 -> {0} [color=green];
11 -> {0} [style=dashed];
3 -> {4};
4 -> {5};
5 -> {6};
6 -> {7};
7 -> {8};
8 -> {11} [color=green];
0 -> {1};
1 -> {2};
subgraph cluster_4 {
color=red
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];
}
12 -> {13};
13 -> {14};
subgraph cluster_5 {
color=red
26 [label="Enter class Bar" style="filled" fillcolor=red];
27 [label="Part of class initialization"];
subgraph cluster_6 {
subgraph cluster_5 {
color=blue
15 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_7 {
subgraph cluster_6 {
color=blue
16 [label="Enter block"];
17 [label="Const: Int(1)"];
@@ -73,10 +65,18 @@ digraph initBlock_kt {
}
28 [label="Exit class Bar" style="filled" fillcolor=red style="filled" fillcolor=gray];
}
subgraph cluster_7 {
color=blue
12 [label="Enter function <init>" style="filled" fillcolor=red style="filled" fillcolor=gray];
13 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
14 [label="Exit function <init>" style="filled" fillcolor=red];
}
26 -> {27} [color=green];
27 -> {15} [color=green];
27 -> {28} [style=dotted];
27 -> {15} [style=dashed];
28 -> {12} [style=dotted];
28 -> {12} [style=dashed];
15 -> {16};
16 -> {17};
17 -> {18};
@@ -88,5 +88,7 @@ digraph initBlock_kt {
23 -> {24} [style=dotted];
24 -> {25} [style=dotted];
25 -> {28} [style=dotted];
12 -> {13};
13 -> {14};
}
compiler/fir/analysis-tests/testData/resolve/cfg/initBlockAndInPlaceLambda.dot
Vendored
+14 -13
View File
@@ -18,32 +18,23 @@ digraph initBlockAndInPlaceLambda_kt {
2 -> {3} [color=green];
subgraph cluster_2 {
color=red
4 [label="Enter function <init>" style="filled" fillcolor=red];
5 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
6 [label="Exit function <init>" style="filled" fillcolor=red];
}
4 -> {5};
5 -> {6};
subgraph cluster_3 {
color=red
26 [label="Enter class C" style="filled" fillcolor=red];
27 [label="Part of class initialization"];
subgraph cluster_4 {
subgraph cluster_3 {
color=blue
7 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_5 {
subgraph cluster_4 {
color=blue
8 [label="Enter block"];
9 [label="Access variable R|<local>/a|"];
10 [label="Access variable R|/A.b|"];
11 [label="Enter safe call"];
12 [label="Postponed enter to lambda"];
subgraph cluster_6 {
subgraph cluster_5 {
color=blue
19 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_7 {
subgraph cluster_6 {
color=blue
20 [label="Enter block"];
21 [label="Access variable R|<local>/a|"];
@@ -63,10 +54,18 @@ digraph initBlockAndInPlaceLambda_kt {
}
28 [label="Exit class C" style="filled" fillcolor=red];
}
subgraph cluster_7 {
color=blue
4 [label="Enter function <init>" style="filled" fillcolor=red];
5 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
6 [label="Exit function <init>" style="filled" fillcolor=red];
}
26 -> {27} [color=green];
27 -> {7} [color=green];
27 -> {28} [style=dotted];
27 -> {7} [style=dashed];
28 -> {4} [color=green];
28 -> {4} [style=dashed];
7 -> {8};
8 -> {9};
9 -> {10};
@@ -88,5 +87,7 @@ digraph initBlockAndInPlaceLambda_kt {
23 -> {24};
24 -> {25};
25 -> {13};
4 -> {5};
5 -> {6};
}
compiler/fir/analysis-tests/testData/resolve/cfg/innerClassInAnonymousObject.dot
Vendored
+16 -17
View File
@@ -5,15 +5,11 @@ digraph innerClassInAnonymousObject_kt {
subgraph cluster_0 {
color=red
3 [label="Enter function <init>" style="filled" fillcolor=red];
4 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
5 [label="Exit function <init>" style="filled" fillcolor=red];
10 [label="Enter class Nested" style="filled" fillcolor=red];
11 [label="Exit class Nested" style="filled" fillcolor=red];
}
3 -> {4};
4 -> {5};
subgraph cluster_1 {
color=red
color=blue
6 [label="Enter function foo" style="filled" fillcolor=red];
subgraph cluster_2 {
color=blue
@@ -22,17 +18,21 @@ digraph innerClassInAnonymousObject_kt {
}
9 [label="Exit function foo" style="filled" fillcolor=red];
}
subgraph cluster_3 {
color=blue
3 [label="Enter function <init>" style="filled" fillcolor=red];
4 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
5 [label="Exit function <init>" style="filled" fillcolor=red];
}
10 -> {11} [color=green];
11 -> {3 6} [color=green];
11 -> {3 6} [style=dashed];
3 -> {4};
4 -> {5};
6 -> {7};
7 -> {8};
8 -> {9};
subgraph cluster_3 {
color=red
10 [label="Enter class Nested" style="filled" fillcolor=red];
11 [label="Exit class Nested" style="filled" fillcolor=red];
}
10 -> {11} [color=green];
subgraph cluster_4 {
color=red
14 [label="Enter property" style="filled" fillcolor=red];
@@ -58,11 +58,10 @@ digraph innerClassInAnonymousObject_kt {
15 -> {16} [color=red];
15 -> {12} [style=dashed];
16 -> {17};
16 -> {0} [color=green];
16 -> {0} [style=dashed];
17 -> {18};
12 -> {13} [color=green];
13 -> {16} [color=green];
13 -> {0 16} [color=green];
13 -> {0} [style=dashed];
0 -> {1};
1 -> {2};
compiler/fir/analysis-tests/testData/resolve/cfg/lambdaReturningObject.dot
Vendored
+8 -7
View File
@@ -33,20 +33,21 @@ digraph lambdaReturningObject_kt {
subgraph cluster_4 {
color=red
11 [label="Enter class IrStarProjectionImpl" style="filled" fillcolor=red];
12 [label="Exit class IrStarProjectionImpl" style="filled" fillcolor=red];
}
subgraph cluster_5 {
color=blue
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];
}
11 -> {12} [color=green];
12 -> {8} [color=green];
12 -> {8} [style=dashed];
8 -> {9};
9 -> {10};
subgraph cluster_5 {
color=red
11 [label="Enter class IrStarProjectionImpl" style="filled" fillcolor=red];
12 [label="Exit class IrStarProjectionImpl" style="filled" fillcolor=red];
}
11 -> {12} [color=green];
subgraph cluster_6 {
color=red
13 [label="Enter function MyOut" style="filled" fillcolor=red];
compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot
Vendored
+6 -5
View File
@@ -353,19 +353,19 @@ digraph localClassesWithImplicit_kt {
21 -> {22};
21 -> {31 34 71 90} [color=red];
22 -> {23};
22 -> {29 31 34 71 90} [color=green];
22 -> {29} [color=green];
22 -> {99 102 139 158} [color=red];
22 -> {29 31 34 71 90} [style=dashed];
22 -> {29} [style=dashed];
23 -> {97} [color=green];
23 -> {24} [color=red];
23 -> {97} [style=dashed];
24 -> {25};
24 -> {99 102 139 158} [color=green];
24 -> {99 102 139 158} [style=dashed];
25 -> {26};
26 -> {27};
27 -> {28};
29 -> {30} [color=green];
30 -> {31 34 71 90} [color=green];
30 -> {31 34 71 90} [style=dashed];
31 -> {32};
32 -> {33};
34 -> {35};
@@ -436,7 +436,8 @@ digraph localClassesWithImplicit_kt {
94 -> {95} [style=dotted];
95 -> {96} [style=dotted];
97 -> {98} [color=green];
98 -> {24} [color=green];
98 -> {24 99 102 139 158} [color=green];
98 -> {99 102 139 158} [style=dashed];
99 -> {100};
100 -> {101};
102 -> {103};
compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInConstructor.dot
Vendored
+44 -43
View File
@@ -5,36 +5,60 @@ digraph postponedLambdaInConstructor_kt {
subgraph cluster_0 {
color=red
3 [label="Enter class A" style="filled" fillcolor=red];
4 [label="Exit class A" style="filled" fillcolor=red];
}
subgraph cluster_1 {
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];
}
3 -> {4} [color=green];
4 -> {0} [color=green];
4 -> {0} [style=dashed];
0 -> {1};
1 -> {2};
subgraph cluster_1 {
color=red
3 [label="Enter class A" style="filled" fillcolor=red];
4 [label="Exit class A" style="filled" fillcolor=red];
}
3 -> {4} [color=green];
subgraph cluster_2 {
color=red
30 [label="Enter class B" style="filled" fillcolor=red];
31 [label="Part of class initialization"];
subgraph cluster_3 {
color=blue
22 [label="Enter property" style="filled" fillcolor=red];
23 [label="Access variable R|<local>/s|"];
24 [label="Exit property" style="filled" fillcolor=red];
}
32 [label="Exit class B" style="filled" fillcolor=red];
}
subgraph cluster_4 {
color=blue
25 [label="Enter function foo" style="filled" fillcolor=red];
subgraph cluster_5 {
color=blue
26 [label="Enter block"];
27 [label="Function call: this@R|/B|.R|/B.foo|()" style="filled" fillcolor=yellow];
28 [label="Exit block"];
}
29 [label="Exit function foo" style="filled" fillcolor=red];
}
subgraph cluster_6 {
color=blue
5 [label="Enter function <init>" style="filled" fillcolor=red];
6 [label="Access variable R|<local>/s|"];
7 [label="Postponed enter to lambda"];
subgraph cluster_3 {
subgraph cluster_7 {
color=blue
12 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_4 {
subgraph cluster_8 {
color=blue
13 [label="Enter block"];
14 [label="Exit anonymous function expression"];
subgraph cluster_5 {
subgraph cluster_9 {
color=blue
17 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_6 {
subgraph cluster_10 {
color=blue
18 [label="Enter block"];
19 [label="Access variable R|<local>/it|"];
@@ -51,6 +75,15 @@ digraph postponedLambdaInConstructor_kt {
10 [label="Delegated constructor call: super<R|A|>(...)" style="filled" fillcolor=yellow];
11 [label="Exit function <init>" style="filled" fillcolor=red];
}
30 -> {31} [color=green];
31 -> {22} [color=green];
31 -> {32} [style=dotted];
31 -> {22} [style=dashed];
32 -> {5 25} [color=green];
32 -> {5 25} [style=dashed];
22 -> {23};
23 -> {24};
24 -> {32} [color=green];
5 -> {6};
6 -> {7};
7 -> {9 12};
@@ -70,41 +103,9 @@ digraph postponedLambdaInConstructor_kt {
18 -> {19};
19 -> {20};
20 -> {21};
subgraph cluster_7 {
color=red
25 [label="Enter function foo" style="filled" fillcolor=red];
subgraph cluster_8 {
color=blue
26 [label="Enter block"];
27 [label="Function call: this@R|/B|.R|/B.foo|()" style="filled" fillcolor=yellow];
28 [label="Exit block"];
}
29 [label="Exit function foo" style="filled" fillcolor=red];
}
25 -> {26};
26 -> {27};
27 -> {28};
28 -> {29};
subgraph cluster_9 {
color=red
30 [label="Enter class B" style="filled" fillcolor=red];
31 [label="Part of class initialization"];
subgraph cluster_10 {
color=blue
22 [label="Enter property" style="filled" fillcolor=red];
23 [label="Access variable R|<local>/s|"];
24 [label="Exit property" style="filled" fillcolor=red];
}
32 [label="Exit class B" style="filled" fillcolor=red];
}
30 -> {31} [color=green];
31 -> {22} [color=green];
31 -> {32} [style=dotted];
31 -> {22} [style=dashed];
22 -> {23};
23 -> {24};
24 -> {32} [color=green];
}
compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInReturn.dot
Vendored
+8 -7
View File
@@ -5,20 +5,21 @@ digraph postponedLambdaInReturn_kt {
subgraph cluster_0 {
color=red
3 [label="Enter class Lateinit" style="filled" fillcolor=red];
4 [label="Exit class Lateinit" style="filled" fillcolor=red];
}
subgraph cluster_1 {
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];
}
3 -> {4} [color=green];
4 -> {0} [color=green];
4 -> {0} [style=dashed];
0 -> {1};
1 -> {2};
subgraph cluster_1 {
color=red
3 [label="Enter class Lateinit" style="filled" fillcolor=red];
4 [label="Exit class Lateinit" style="filled" fillcolor=red];
}
3 -> {4} [color=green];
subgraph cluster_2 {
color=red
5 [label="Enter function build" style="filled" fillcolor=red];
compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.dot
Vendored
+10 -6
View File
@@ -136,7 +136,7 @@ digraph propertiesAndInitBlocks_kt {
}
subgraph cluster_15 {
color=blue
72 [label="Enter function <init>" style="filled" fillcolor=red];
72 [label="Enter function <init>" style="filled" fillcolor=red style="filled" fillcolor=gray];
73 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
74 [label="Exit function <init>" style="filled" fillcolor=red];
}
@@ -144,13 +144,15 @@ digraph propertiesAndInitBlocks_kt {
58 -> {59};
58 -> {65 72} [color=red];
59 -> {60};
59 -> {62 72} [color=green];
59 -> {62 72} [style=dashed];
59 -> {62} [color=green];
59 -> {62} [style=dashed];
60 -> {61};
62 -> {63} [color=green];
63 -> {65} [color=green];
63 -> {64} [style=dotted];
63 -> {65} [style=dashed];
64 -> {72} [style=dotted];
64 -> {72} [style=dashed];
65 -> {66};
66 -> {67};
67 -> {68};
@@ -201,7 +203,7 @@ digraph propertiesAndInitBlocks_kt {
}
subgraph cluster_22 {
color=blue
43 [label="Enter function <init>" style="filled" fillcolor=red];
43 [label="Enter function <init>" style="filled" fillcolor=red style="filled" fillcolor=gray];
44 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
45 [label="Exit function <init>" style="filled" fillcolor=red];
}
@@ -219,8 +221,8 @@ digraph propertiesAndInitBlocks_kt {
25 -> {26};
25 -> {35 43 46} [color=red];
26 -> {27};
26 -> {32 43} [color=green];
26 -> {32 43} [style=dashed];
26 -> {32} [color=green];
26 -> {32} [style=dashed];
27 -> {28};
28 -> {29} [style=dotted];
29 -> {30} [style=dotted];
@@ -230,6 +232,8 @@ digraph propertiesAndInitBlocks_kt {
33 -> {35} [color=green];
33 -> {34} [style=dotted];
33 -> {35} [style=dashed];
34 -> {43} [style=dotted];
34 -> {43} [style=dashed];
35 -> {36};
36 -> {37};
37 -> {38};
compiler/fir/analysis-tests/testData/resolve/cfg/returnValuesFromLambda.dot
Vendored
+18 -16
View File
@@ -12,35 +12,37 @@ digraph returnValuesFromLambda_kt {
subgraph cluster_1 {
color=red
5 [label="Enter class B" style="filled" fillcolor=red];
6 [label="Exit class B" style="filled" fillcolor=red];
}
subgraph cluster_2 {
color=blue
2 [label="Enter function <init>" style="filled" fillcolor=red];
3 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
4 [label="Exit function <init>" style="filled" fillcolor=red];
}
5 -> {6} [color=green];
6 -> {2} [color=green];
6 -> {2} [style=dashed];
2 -> {3};
3 -> {4};
subgraph cluster_2 {
color=red
5 [label="Enter class B" style="filled" fillcolor=red];
6 [label="Exit class B" style="filled" fillcolor=red];
}
5 -> {6} [color=green];
subgraph cluster_3 {
color=red
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];
}
7 -> {8};
8 -> {9};
subgraph cluster_4 {
color=red
10 [label="Enter class C" style="filled" fillcolor=red];
11 [label="Exit class C" style="filled" fillcolor=red];
}
subgraph cluster_4 {
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 -> {11} [color=green];
11 -> {7} [color=green];
11 -> {7} [style=dashed];
7 -> {8};
8 -> {9};
subgraph cluster_5 {
color=red
compiler/fir/analysis-tests/testData/resolve/cfg/safeCalls.dot
Vendored
+14 -14
View File
@@ -4,25 +4,25 @@ digraph safeCalls_kt {
edge [penwidth=2]
subgraph cluster_0 {
color=red
0 [label="Enter function foo" style="filled" fillcolor=red];
1 [label="Exit function foo" style="filled" fillcolor=red];
}
0 -> {1};
subgraph cluster_1 {
color=red
2 [label="Enter function bar" style="filled" fillcolor=red];
3 [label="Exit function bar" style="filled" fillcolor=red];
}
2 -> {3};
subgraph cluster_2 {
color=red
4 [label="Enter class A" style="filled" fillcolor=red];
5 [label="Exit class A" style="filled" fillcolor=red];
}
subgraph cluster_1 {
color=blue
2 [label="Enter function bar" style="filled" fillcolor=red];
3 [label="Exit function bar" style="filled" fillcolor=red];
}
subgraph cluster_2 {
color=blue
0 [label="Enter function foo" style="filled" fillcolor=red];
1 [label="Exit function foo" style="filled" fillcolor=red];
}
4 -> {5} [color=green];
5 -> {0 2} [color=green];
5 -> {0 2} [style=dashed];
0 -> {1};
2 -> {3};
subgraph cluster_3 {
color=red