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

[FIR] Fix incorrect cluster creating in CFG dumps

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-10-12 11:09:52 +03:00
parent 3495ec198d
commit f794ced888
19 changed files with 4222 additions and 4274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.dot
Vendored
+90 -94
View File
@@ -21,99 +21,95 @@ digraph inAnonymousObject_kt {
subgraph cluster_2 {
color=blue
9 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
subgraph cluster_3 {
10 [label="Part of class initialization"];
11 [label="Part of class initialization"];
12 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
}
0 -> {1};
1 -> {2};
1 -> {13 18 16 21 23 29} [color=red];
2 -> {3};
2 -> {13 29 9} [color=green];
2 -> {13 29 9} [style=dashed];
3 -> {4};
4 -> {5};
5 -> {6};
6 -> {7};
7 -> {8};
9 -> {10} [color=green];
10 -> {11} [style=dotted];
10 -> {18} [color=green];
10 -> {18} [style=dashed];
11 -> {12} [style=dotted];
11 -> {23} [color=green];
11 -> {23} [style=dashed];
subgraph cluster_3 {
color=red
13 [label="Enter function <init>" style="filled" fillcolor=red];
14 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
15 [label="Exit function <init>" style="filled" fillcolor=red];
}
13 -> {14};
14 -> {15};
subgraph cluster_4 {
color=red
16 [label="Enter function getter" style="filled" fillcolor=red];
17 [label="Exit function getter" style="filled" fillcolor=red];
}
16 -> {17};
subgraph cluster_5 {
color=red
18 [label="Enter property" style="filled" fillcolor=red];
19 [label="Access variable R|<local>/a|"];
20 [label="Exit property" style="filled" fillcolor=red];
}
18 -> {19};
19 -> {20};
20 -> {11} [color=green];
subgraph cluster_6 {
color=red
21 [label="Enter function getter" style="filled" fillcolor=red];
22 [label="Exit function getter" style="filled" fillcolor=red];
}
21 -> {22};
subgraph cluster_7 {
color=red
23 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_8 {
color=blue
10 [label="Part of class initialization"];
subgraph cluster_4 {
color=blue
11 [label="Part of class initialization"];
12 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
}
0 -> {1};
1 -> {2};
1 -> {13 18 16 21 23 29} [color=red];
2 -> {3};
2 -> {13 29 9} [color=green];
2 -> {13 29 9} [style=dashed];
3 -> {4};
4 -> {5};
5 -> {6};
6 -> {7};
7 -> {8};
9 -> {10} [color=green];
10 -> {11} [style=dotted];
10 -> {18} [color=green];
10 -> {18} [style=dashed];
11 -> {12} [style=dotted];
11 -> {23} [color=green];
11 -> {23} [style=dashed];
subgraph cluster_5 {
color=red
13 [label="Enter function <init>" style="filled" fillcolor=red];
14 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
15 [label="Exit function <init>" style="filled" fillcolor=red];
}
13 -> {14};
14 -> {15};
subgraph cluster_6 {
color=red
16 [label="Enter function getter" style="filled" fillcolor=red];
17 [label="Exit function getter" style="filled" fillcolor=red];
}
16 -> {17};
subgraph cluster_7 {
color=red
18 [label="Enter property" style="filled" fillcolor=red];
19 [label="Access variable R|<local>/a|"];
20 [label="Exit property" style="filled" fillcolor=red];
}
18 -> {19};
19 -> {20};
20 -> {11} [color=green];
subgraph cluster_8 {
color=red
21 [label="Enter function getter" style="filled" fillcolor=red];
22 [label="Exit function getter" style="filled" fillcolor=red];
}
21 -> {22};
subgraph cluster_9 {
color=red
23 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_10 {
color=blue
24 [label="Enter block"];
25 [label="Access variable R|<local>/b|"];
26 [label="Assignment: R|/<anonymous>.leaked|"];
27 [label="Exit block"];
}
28 [label="Exit init block" style="filled" fillcolor=red];
}
23 -> {24};
24 -> {25};
25 -> {26};
26 -> {27};
27 -> {28};
28 -> {12} [color=green];
subgraph cluster_11 {
color=red
29 [label="Enter function run" style="filled" fillcolor=red];
subgraph cluster_12 {
color=blue
30 [label="Enter block"];
31 [label="Function call: R|<local>/c|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
32 [label="Exit block"];
}
33 [label="Exit function run" style="filled" fillcolor=red];
}
29 -> {30};
30 -> {31};
31 -> {32};
32 -> {33};
24 [label="Enter block"];
25 [label="Access variable R|<local>/b|"];
26 [label="Assignment: R|/<anonymous>.leaked|"];
27 [label="Exit block"];
}
28 [label="Exit init block" style="filled" fillcolor=red];
}
23 -> {24};
24 -> {25};
25 -> {26};
26 -> {27};
27 -> {28};
28 -> {12} [color=green];
subgraph cluster_9 {
color=red
29 [label="Enter function run" style="filled" fillcolor=red];
subgraph cluster_10 {
color=blue
30 [label="Enter block"];
31 [label="Function call: R|<local>/c|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
32 [label="Exit block"];
}
33 [label="Exit function run" style="filled" fillcolor=red];
}
29 -> {30};
30 -> {31};
31 -> {32};
32 -> {33};
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.dot
Vendored
+98 -102
View File
@@ -20,107 +20,103 @@ digraph inLocalClass_kt {
subgraph cluster_2 {
color=blue
8 [label="Enter class LocalClass" style="filled" fillcolor=red];
subgraph cluster_3 {
9 [label="Part of class initialization"];
10 [label="Part of class initialization"];
11 [label="Exit class LocalClass" style="filled" fillcolor=red];
}
0 -> {1};
1 -> {2};
1 -> {14 12 17 19 25 31} [color=red];
2 -> {3};
2 -> {19 31 8} [color=green];
2 -> {19 31 8} [style=dashed];
3 -> {4};
4 -> {5};
5 -> {6};
6 -> {7};
8 -> {9} [color=green];
9 -> {10} [style=dotted];
9 -> {14} [color=green];
9 -> {14} [style=dashed];
10 -> {11} [style=dotted];
10 -> {25} [color=green];
10 -> {25} [style=dashed];
subgraph cluster_3 {
color=red
12 [label="Enter function getter" style="filled" fillcolor=red];
13 [label="Exit function getter" style="filled" fillcolor=red];
}
12 -> {13};
subgraph cluster_4 {
color=red
14 [label="Enter property" style="filled" fillcolor=red];
15 [label="Access variable R|<local>/a|"];
16 [label="Exit property" style="filled" fillcolor=red];
}
14 -> {15};
15 -> {16};
16 -> {10} [color=green];
subgraph cluster_5 {
color=red
17 [label="Enter function getter" style="filled" fillcolor=red];
18 [label="Exit function getter" style="filled" fillcolor=red];
}
17 -> {18};
subgraph cluster_6 {
color=red
19 [label="Enter function <init>" style="filled" fillcolor=red];
20 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
subgraph cluster_7 {
color=blue
9 [label="Part of class initialization"];
subgraph cluster_4 {
color=blue
10 [label="Part of class initialization"];
11 [label="Exit class LocalClass" style="filled" fillcolor=red];
}
0 -> {1};
1 -> {2};
1 -> {14 12 17 19 25 31} [color=red];
2 -> {3};
2 -> {19 31 8} [color=green];
2 -> {19 31 8} [style=dashed];
3 -> {4};
4 -> {5};
5 -> {6};
6 -> {7};
8 -> {9} [color=green];
9 -> {10} [style=dotted];
9 -> {14} [color=green];
9 -> {14} [style=dashed];
10 -> {11} [style=dotted];
10 -> {25} [color=green];
10 -> {25} [style=dashed];
subgraph cluster_5 {
color=red
12 [label="Enter function getter" style="filled" fillcolor=red];
13 [label="Exit function getter" style="filled" fillcolor=red];
}
12 -> {13};
subgraph cluster_6 {
color=red
14 [label="Enter property" style="filled" fillcolor=red];
15 [label="Access variable R|<local>/a|"];
16 [label="Exit property" style="filled" fillcolor=red];
}
14 -> {15};
15 -> {16};
16 -> {10} [color=green];
subgraph cluster_7 {
color=red
17 [label="Enter function getter" style="filled" fillcolor=red];
18 [label="Exit function getter" style="filled" fillcolor=red];
}
17 -> {18};
subgraph cluster_8 {
color=red
19 [label="Enter function <init>" style="filled" fillcolor=red];
20 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
subgraph cluster_9 {
color=blue
21 [label="Enter block"];
22 [label="Function call: R|<local>/b|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
23 [label="Exit block"];
}
24 [label="Exit function <init>" style="filled" fillcolor=red];
}
19 -> {20};
20 -> {21};
21 -> {22};
22 -> {23};
23 -> {24};
subgraph cluster_10 {
color=red
25 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_11 {
color=blue
26 [label="Enter block"];
27 [label="Access variable R|<local>/c|"];
28 [label="Assignment: R|/LocalClass.leaked|"];
29 [label="Exit block"];
}
30 [label="Exit init block" style="filled" fillcolor=red];
}
25 -> {26};
26 -> {27};
27 -> {28};
28 -> {29};
29 -> {30};
30 -> {11} [color=green];
subgraph cluster_12 {
color=red
31 [label="Enter function run" style="filled" fillcolor=red];
subgraph cluster_13 {
color=blue
32 [label="Enter block"];
33 [label="Function call: R|<local>/d|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
34 [label="Exit block"];
}
35 [label="Exit function run" style="filled" fillcolor=red];
}
31 -> {32};
32 -> {33};
33 -> {34};
34 -> {35};
21 [label="Enter block"];
22 [label="Function call: R|<local>/b|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
23 [label="Exit block"];
}
24 [label="Exit function <init>" style="filled" fillcolor=red];
}
19 -> {20};
20 -> {21};
21 -> {22};
22 -> {23};
23 -> {24};
subgraph cluster_8 {
color=red
25 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_9 {
color=blue
26 [label="Enter block"];
27 [label="Access variable R|<local>/c|"];
28 [label="Assignment: R|/LocalClass.leaked|"];
29 [label="Exit block"];
}
30 [label="Exit init block" style="filled" fillcolor=red];
}
25 -> {26};
26 -> {27};
27 -> {28};
28 -> {29};
29 -> {30};
30 -> {11} [color=green];
subgraph cluster_10 {
color=red
31 [label="Enter function run" style="filled" fillcolor=red];
subgraph cluster_11 {
color=blue
32 [label="Enter block"];
33 [label="Function call: R|<local>/d|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
34 [label="Exit block"];
}
35 [label="Exit function run" style="filled" fillcolor=red];
}
31 -> {32};
32 -> {33};
33 -> {34};
34 -> {35};
}