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

FIR CFA: attach accessors and nested classes as class subgraphs

Browse Source
This commit is contained in:
pyos
2022-12-09 19:41:58 +01:00
committed by Dmitriy Novozhilov
parent 5d4fb3ead8
commit cb8cb1f610
5 changed files with 315 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/cfg/innerClassInAnonymousObject.dot
Vendored
+32 -33
View File
@@ -4,40 +4,10 @@ digraph innerClassInAnonymousObject_kt {
edge [penwidth=2]
subgraph cluster_0 {
color=red
10 [label="Enter class Nested" style="filled" fillcolor=red];
11 [label="Exit class Nested" style="filled" fillcolor=red];
}
subgraph cluster_1 {
color=blue
6 [label="Enter function foo" style="filled" fillcolor=red];
subgraph cluster_2 {
color=blue
7 [label="Enter block"];
8 [label="Exit block"];
}
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_4 {
color=red
14 [label="Enter property" style="filled" fillcolor=red];
15 [label="Enter anonymous object"];
subgraph cluster_5 {
subgraph cluster_1 {
color=blue
12 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
13 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
@@ -46,6 +16,27 @@ digraph innerClassInAnonymousObject_kt {
17 [label="Exit anonymous object expression"];
18 [label="Exit property" style="filled" fillcolor=red];
}
subgraph cluster_2 {
color=blue
10 [label="Enter class Nested" style="filled" fillcolor=red];
11 [label="Exit class Nested" style="filled" fillcolor=red];
}
subgraph cluster_3 {
color=blue
6 [label="Enter function foo" style="filled" fillcolor=red];
subgraph cluster_4 {
color=blue
7 [label="Enter block"];
8 [label="Exit block"];
}
9 [label="Exit function foo" style="filled" fillcolor=red];
}
subgraph cluster_5 {
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];
}
subgraph cluster_6 {
color=blue
0 [label="Enter function <init>" style="filled" fillcolor=red];
@@ -60,9 +51,17 @@ digraph innerClassInAnonymousObject_kt {
16 -> {17};
17 -> {18};
12 -> {13} [color=green];
13 -> {0 16} [color=green];
13 -> {0} [style=dashed];
13 -> {0 10 16} [color=green];
13 -> {0 10} [style=dashed];
0 -> {1};
1 -> {2};
10 -> {11} [color=green];
11 -> {3 6} [color=green];
11 -> {3 6} [style=dashed];
3 -> {4};
4 -> {5};
6 -> {7};
7 -> {8};
8 -> {9};
}
compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.dot
Vendored
+24 -25
View File
@@ -155,35 +155,14 @@ digraph nullability_kt {
41 -> {42} [style=dotted];
subgraph cluster_17 {
color=red
49 [label="Enter function getter" style="filled" fillcolor=red];
subgraph cluster_18 {
color=blue
50 [label="Enter block"];
51 [label="Const: Null(null)"];
52 [label="Jump: ^ Null(null)"];
53 [label="Stub" style="filled" fillcolor=gray];
54 [label="Exit block" style="filled" fillcolor=gray];
}
55 [label="Exit function getter" style="filled" fillcolor=red];
}
49 -> {50};
50 -> {51};
51 -> {52};
52 -> {55};
52 -> {53} [style=dotted];
53 -> {54} [style=dotted];
54 -> {55} [style=dotted];
subgraph cluster_19 {
color=red
63 [label="Enter class QImplWithCustomGetter" style="filled" fillcolor=red];
64 [label="Exit class QImplWithCustomGetter" style="filled" fillcolor=red];
}
subgraph cluster_20 {
subgraph cluster_18 {
color=blue
56 [label="Enter function fdata" style="filled" fillcolor=red];
subgraph cluster_21 {
subgraph cluster_19 {
color=blue
57 [label="Enter block"];
58 [label="Const: Null(null)"];
@@ -193,6 +172,19 @@ digraph nullability_kt {
}
62 [label="Exit function fdata" style="filled" fillcolor=red];
}
subgraph cluster_20 {
color=blue
49 [label="Enter function getter" style="filled" fillcolor=red];
subgraph cluster_21 {
color=blue
50 [label="Enter block"];
51 [label="Const: Null(null)"];
52 [label="Jump: ^ Null(null)"];
53 [label="Stub" style="filled" fillcolor=gray];
54 [label="Exit block" style="filled" fillcolor=gray];
}
55 [label="Exit function getter" style="filled" fillcolor=red];
}
subgraph cluster_22 {
color=blue
46 [label="Enter function <init>" style="filled" fillcolor=red];
@@ -200,10 +192,17 @@ digraph nullability_kt {
48 [label="Exit function <init>" style="filled" fillcolor=red];
}
63 -> {64} [color=green];
64 -> {46 56} [color=green];
64 -> {46 56} [style=dashed];
64 -> {46 49 56} [color=green];
64 -> {46 49 56} [style=dashed];
46 -> {47};
47 -> {48};
49 -> {50};
50 -> {51};
51 -> {52};
52 -> {55};
52 -> {53} [style=dotted];
53 -> {54} [style=dotted];
54 -> {55} [style=dotted];
56 -> {57};
57 -> {58};
58 -> {59};
compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot
Vendored
+56 -58
View File
@@ -75,68 +75,21 @@ digraph delegateWithAnonymousObject_kt {
19 -> {20};
subgraph cluster_8 {
color=red
54 [label="Enter function getter" style="filled" fillcolor=red];
subgraph cluster_9 {
color=blue
55 [label="Enter block"];
56 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
57 [label="Access variable this@R|/IssuesListUserProfile|"];
58 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|Stub (chain inference): TypeVariable(_Target)|>|(...)" style="filled" fillcolor=yellow];
59 [label="Jump: ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|Stub (chain inference): TypeVariable(_Target)|>|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|)"];
60 [label="Stub" style="filled" fillcolor=gray];
61 [label="Exit block" style="filled" fillcolor=gray];
}
62 [label="Exit function getter" style="filled" fillcolor=red];
}
54 -> {55};
55 -> {56};
56 -> {57};
57 -> {58};
58 -> {59};
59 -> {62};
59 -> {60} [style=dotted];
60 -> {61} [style=dotted];
61 -> {62} [style=dotted];
subgraph cluster_10 {
color=red
63 [label="Enter function setter" style="filled" fillcolor=red];
subgraph cluster_11 {
color=blue
64 [label="Enter block"];
65 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
66 [label="Access variable this@R|/IssuesListUserProfile|"];
67 [label="Access variable R|<local>/issueListView|"];
68 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(...)" style="filled" fillcolor=yellow];
69 [label="Exit block"];
}
70 [label="Exit function setter" style="filled" fillcolor=red];
}
63 -> {64};
64 -> {65};
65 -> {66};
66 -> {67};
67 -> {68};
68 -> {69};
69 -> {70};
subgraph cluster_12 {
color=red
79 [label="Enter class IssuesListUserProfile" style="filled" fillcolor=red];
80 [label="Part of class initialization"];
subgraph cluster_13 {
subgraph cluster_9 {
color=blue
71 [label="Enter property" style="filled" fillcolor=red];
72 [label="Postponed enter to lambda"];
subgraph cluster_14 {
subgraph cluster_10 {
color=blue
26 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_15 {
subgraph cluster_11 {
color=blue
27 [label="Enter block"];
28 [label="Enter anonymous object"];
subgraph cluster_16 {
subgraph cluster_12 {
color=blue
33 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
34 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
@@ -147,10 +100,10 @@ digraph delegateWithAnonymousObject_kt {
}
32 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
}
subgraph cluster_17 {
subgraph cluster_13 {
color=blue
45 [label="Enter function setValue" style="filled" fillcolor=red];
subgraph cluster_18 {
subgraph cluster_14 {
color=blue
46 [label="Enter block"];
47 [label="Function call: R|/IssueListView.IssueListView|()" style="filled" fillcolor=yellow];
@@ -162,10 +115,10 @@ digraph delegateWithAnonymousObject_kt {
}
53 [label="Exit function setValue" style="filled" fillcolor=red];
}
subgraph cluster_19 {
subgraph cluster_15 {
color=blue
38 [label="Enter function getValue" style="filled" fillcolor=red];
subgraph cluster_20 {
subgraph cluster_16 {
color=blue
39 [label="Enter block"];
40 [label="Function call: R|/IssueListView.IssueListView|()" style="filled" fillcolor=yellow];
@@ -175,7 +128,7 @@ digraph delegateWithAnonymousObject_kt {
}
44 [label="Exit function getValue" style="filled" fillcolor=red];
}
subgraph cluster_21 {
subgraph cluster_17 {
color=blue
35 [label="Enter function <init>" style="filled" fillcolor=red];
36 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
@@ -190,6 +143,35 @@ digraph delegateWithAnonymousObject_kt {
}
81 [label="Exit class IssuesListUserProfile" style="filled" fillcolor=red];
}
subgraph cluster_18 {
color=blue
63 [label="Enter function setter" style="filled" fillcolor=red];
subgraph cluster_19 {
color=blue
64 [label="Enter block"];
65 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
66 [label="Access variable this@R|/IssuesListUserProfile|"];
67 [label="Access variable R|<local>/issueListView|"];
68 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(...)" style="filled" fillcolor=yellow];
69 [label="Exit block"];
}
70 [label="Exit function setter" style="filled" fillcolor=red];
}
subgraph cluster_20 {
color=blue
54 [label="Enter function getter" style="filled" fillcolor=red];
subgraph cluster_21 {
color=blue
55 [label="Enter block"];
56 [label="Access variable D|/IssuesListUserProfile.issueListView|"];
57 [label="Access variable this@R|/IssuesListUserProfile|"];
58 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|Stub (chain inference): TypeVariable(_Target)|>|(...)" style="filled" fillcolor=yellow];
59 [label="Jump: ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|Stub (chain inference): TypeVariable(_Target)|>|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|)"];
60 [label="Stub" style="filled" fillcolor=gray];
61 [label="Exit block" style="filled" fillcolor=gray];
}
62 [label="Exit function getter" style="filled" fillcolor=red];
}
subgraph cluster_22 {
color=blue
23 [label="Enter function <init>" style="filled" fillcolor=red];
@@ -200,8 +182,8 @@ digraph delegateWithAnonymousObject_kt {
80 -> {71} [color=green];
80 -> {81} [style=dotted];
80 -> {71} [style=dashed];
81 -> {23} [color=green];
81 -> {23} [style=dashed];
81 -> {23 54 63} [color=green];
81 -> {23 54 63} [style=dashed];
71 -> {72};
72 -> {26 73 74};
72 -> {26} [style=dashed];
@@ -244,5 +226,21 @@ digraph delegateWithAnonymousObject_kt {
52 -> {53} [style=dotted];
23 -> {24};
24 -> {25};
54 -> {55};
55 -> {56};
56 -> {57};
57 -> {58};
58 -> {59};
59 -> {62};
59 -> {60} [style=dotted];
60 -> {61} [style=dotted];
61 -> {62} [style=dotted];
63 -> {64};
64 -> {65};
65 -> {66};
66 -> {67};
67 -> {68};
68 -> {69};
69 -> {70};
}