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

FIR. Refactor smart-cast representation in FIR tree

Browse Source 
Make smart-casts non-transparent expression without delegation
to underlying FirQualifiedAccessExpression, as children delegation in
fir tree has unclear semantics
Remove two different kinds of tree nodes for smart-casts
This commit is contained in:
Simon Ogorodnik
2022-08-02 00:49:24 +02:00
committed by teamcity
parent bc9db58b3c
commit 513af2dfbc
154 changed files with 9573 additions and 9320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.dot
Vendored
+123 -115
View File
@@ -63,15 +63,16 @@ digraph safeCallAndEqualityToBool_kt {
color=blue
27 [label="Enter block"];
28 [label="Access variable R|<local>/s|"];
29 [label="Access variable R|kotlin/String.length|"];
30 [label="Exit block"];
29 [label="Smart cast: R|<local>/s|"];
30 [label="Access variable R|kotlin/String.length|"];
31 [label="Exit block"];
}
31 [label="Exit when branch result"];
32 [label="Exit when"];
32 [label="Exit when branch result"];
33 [label="Exit when"];
}
33 [label="Exit block"];
34 [label="Exit block"];
}
34 [label="Exit function test_1" style="filled" fillcolor=red];
35 [label="Exit function test_1" style="filled" fillcolor=red];
}
7 -> {8};
8 -> {9};
@@ -91,7 +92,7 @@ digraph safeCallAndEqualityToBool_kt {
22 -> {23};
23 -> {24};
24 -> {25};
25 -> {32};
25 -> {33};
26 -> {27};
27 -> {28};
28 -> {29};
@@ -100,76 +101,77 @@ digraph safeCallAndEqualityToBool_kt {
31 -> {32};
32 -> {33};
33 -> {34};
34 -> {35};
subgraph cluster_9 {
color=red
35 [label="Enter function test_2" style="filled" fillcolor=red];
36 [label="Enter function test_2" style="filled" fillcolor=red];
subgraph cluster_10 {
color=blue
36 [label="Enter block"];
37 [label="Enter block"];
subgraph cluster_11 {
color=blue
37 [label="Enter when"];
38 [label="Enter when"];
subgraph cluster_12 {
color=blue
38 [label="Enter when branch condition "];
39 [label="Access variable R|<local>/s|"];
40 [label="Enter safe call"];
41 [label="Function call: $subj$.R|/check|()"];
42 [label="Exit safe call"];
43 [label="Const: Boolean(false)"];
44 [label="Equality operator =="];
45 [label="Exit when branch condition"];
39 [label="Enter when branch condition "];
40 [label="Access variable R|<local>/s|"];
41 [label="Enter safe call"];
42 [label="Function call: $subj$.R|/check|()"];
43 [label="Exit safe call"];
44 [label="Const: Boolean(false)"];
45 [label="Equality operator =="];
46 [label="Exit when branch condition"];
}
subgraph cluster_13 {
color=blue
46 [label="Enter when branch condition else"];
47 [label="Exit when branch condition"];
47 [label="Enter when branch condition else"];
48 [label="Exit when branch condition"];
}
48 [label="Enter when branch result"];
49 [label="Enter when branch result"];
subgraph cluster_14 {
color=blue
49 [label="Enter block"];
50 [label="Access variable R|<local>/s|"];
51 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
52 [label="Exit block"];
50 [label="Enter block"];
51 [label="Access variable R|<local>/s|"];
52 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
53 [label="Exit block"];
}
53 [label="Exit when branch result"];
54 [label="Enter when branch result"];
54 [label="Exit when branch result"];
55 [label="Enter when branch result"];
subgraph cluster_15 {
color=blue
55 [label="Enter block"];
56 [label="Access variable R|<local>/s|"];
57 [label="Access variable R|kotlin/String.length|"];
58 [label="Exit block"];
56 [label="Enter block"];
57 [label="Access variable R|<local>/s|"];
58 [label="Smart cast: R|<local>/s|"];
59 [label="Access variable R|kotlin/String.length|"];
60 [label="Exit block"];
}
59 [label="Exit when branch result"];
60 [label="Exit when"];
61 [label="Exit when branch result"];
62 [label="Exit when"];
}
61 [label="Exit block"];
63 [label="Exit block"];
}
62 [label="Exit function test_2" style="filled" fillcolor=red];
64 [label="Exit function test_2" style="filled" fillcolor=red];
}
35 -> {36};
36 -> {37};
37 -> {38};
38 -> {39};
39 -> {40 42};
40 -> {41};
39 -> {40};
40 -> {41 43};
41 -> {42};
42 -> {43};
43 -> {44};
44 -> {45};
45 -> {54 46};
46 -> {47};
45 -> {46};
46 -> {55 47};
47 -> {48};
48 -> {49};
49 -> {50};
50 -> {51};
51 -> {52};
52 -> {53};
53 -> {60};
54 -> {55};
53 -> {54};
54 -> {62};
55 -> {56};
56 -> {57};
57 -> {58};
@@ -177,159 +179,165 @@ digraph safeCallAndEqualityToBool_kt {
59 -> {60};
60 -> {61};
61 -> {62};
62 -> {63};
63 -> {64};
subgraph cluster_16 {
color=red
63 [label="Enter function test_3" style="filled" fillcolor=red];
65 [label="Enter function test_3" style="filled" fillcolor=red];
subgraph cluster_17 {
color=blue
64 [label="Enter block"];
66 [label="Enter block"];
subgraph cluster_18 {
color=blue
65 [label="Enter when"];
67 [label="Enter when"];
subgraph cluster_19 {
color=blue
66 [label="Enter when branch condition "];
67 [label="Access variable R|<local>/s|"];
68 [label="Enter safe call"];
69 [label="Function call: $subj$.R|/check|()"];
70 [label="Exit safe call"];
71 [label="Const: Boolean(true)"];
72 [label="Equality operator !="];
73 [label="Exit when branch condition"];
68 [label="Enter when branch condition "];
69 [label="Access variable R|<local>/s|"];
70 [label="Enter safe call"];
71 [label="Function call: $subj$.R|/check|()"];
72 [label="Exit safe call"];
73 [label="Const: Boolean(true)"];
74 [label="Equality operator !="];
75 [label="Exit when branch condition"];
}
subgraph cluster_20 {
color=blue
74 [label="Enter when branch condition else"];
75 [label="Exit when branch condition"];
76 [label="Enter when branch condition else"];
77 [label="Exit when branch condition"];
}
76 [label="Enter when branch result"];
78 [label="Enter when branch result"];
subgraph cluster_21 {
color=blue
77 [label="Enter block"];
78 [label="Access variable R|<local>/s|"];
79 [label="Access variable R|kotlin/String.length|"];
80 [label="Exit block"];
79 [label="Enter block"];
80 [label="Access variable R|<local>/s|"];
81 [label="Smart cast: R|<local>/s|"];
82 [label="Access variable R|kotlin/String.length|"];
83 [label="Exit block"];
}
81 [label="Exit when branch result"];
82 [label="Enter when branch result"];
84 [label="Exit when branch result"];
85 [label="Enter when branch result"];
subgraph cluster_22 {
color=blue
83 [label="Enter block"];
84 [label="Access variable R|<local>/s|"];
85 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
86 [label="Exit block"];
86 [label="Enter block"];
87 [label="Access variable R|<local>/s|"];
88 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
89 [label="Exit block"];
}
87 [label="Exit when branch result"];
88 [label="Exit when"];
90 [label="Exit when branch result"];
91 [label="Exit when"];
}
89 [label="Exit block"];
92 [label="Exit block"];
}
90 [label="Exit function test_3" style="filled" fillcolor=red];
93 [label="Exit function test_3" style="filled" fillcolor=red];
}
63 -> {64};
64 -> {65};
65 -> {66};
66 -> {67};
67 -> {68 70};
67 -> {68};
68 -> {69};
69 -> {70};
69 -> {70 72};
70 -> {71};
71 -> {72};
72 -> {73};
73 -> {82 74};
73 -> {74};
74 -> {75};
75 -> {76};
75 -> {85 76};
76 -> {77};
77 -> {78};
78 -> {79};
79 -> {80};
80 -> {81};
81 -> {88};
81 -> {82};
82 -> {83};
83 -> {84};
84 -> {85};
84 -> {91};
85 -> {86};
86 -> {87};
87 -> {88};
88 -> {89};
89 -> {90};
90 -> {91};
91 -> {92};
92 -> {93};
subgraph cluster_23 {
color=red
91 [label="Enter function test_4" style="filled" fillcolor=red];
94 [label="Enter function test_4" style="filled" fillcolor=red];
subgraph cluster_24 {
color=blue
92 [label="Enter block"];
95 [label="Enter block"];
subgraph cluster_25 {
color=blue
93 [label="Enter when"];
96 [label="Enter when"];
subgraph cluster_26 {
color=blue
94 [label="Enter when branch condition "];
95 [label="Access variable R|<local>/s|"];
96 [label="Enter safe call"];
97 [label="Function call: $subj$.R|/check|()"];
98 [label="Exit safe call"];
99 [label="Const: Boolean(false)"];
100 [label="Equality operator !="];
101 [label="Exit when branch condition"];
97 [label="Enter when branch condition "];
98 [label="Access variable R|<local>/s|"];
99 [label="Enter safe call"];
100 [label="Function call: $subj$.R|/check|()"];
101 [label="Exit safe call"];
102 [label="Const: Boolean(false)"];
103 [label="Equality operator !="];
104 [label="Exit when branch condition"];
}
subgraph cluster_27 {
color=blue
102 [label="Enter when branch condition else"];
103 [label="Exit when branch condition"];
105 [label="Enter when branch condition else"];
106 [label="Exit when branch condition"];
}
104 [label="Enter when branch result"];
107 [label="Enter when branch result"];
subgraph cluster_28 {
color=blue
105 [label="Enter block"];
106 [label="Access variable R|<local>/s|"];
107 [label="Access variable R|kotlin/String.length|"];
108 [label="Exit block"];
108 [label="Enter block"];
109 [label="Access variable R|<local>/s|"];
110 [label="Smart cast: R|<local>/s|"];
111 [label="Access variable R|kotlin/String.length|"];
112 [label="Exit block"];
}
109 [label="Exit when branch result"];
110 [label="Enter when branch result"];
113 [label="Exit when branch result"];
114 [label="Enter when branch result"];
subgraph cluster_29 {
color=blue
111 [label="Enter block"];
112 [label="Access variable R|<local>/s|"];
113 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
114 [label="Exit block"];
115 [label="Enter block"];
116 [label="Access variable R|<local>/s|"];
117 [label="Access variable <Inapplicable(UNSAFE_CALL): kotlin/String.length>#"];
118 [label="Exit block"];
}
115 [label="Exit when branch result"];
116 [label="Exit when"];
119 [label="Exit when branch result"];
120 [label="Exit when"];
}
117 [label="Exit block"];
121 [label="Exit block"];
}
118 [label="Exit function test_4" style="filled" fillcolor=red];
122 [label="Exit function test_4" style="filled" fillcolor=red];
}
91 -> {92};
92 -> {93};
93 -> {94};
94 -> {95};
95 -> {96 98};
95 -> {96};
96 -> {97};
97 -> {98};
98 -> {99};
98 -> {99 101};
99 -> {100};
100 -> {101};
101 -> {110 102};
101 -> {102};
102 -> {103};
103 -> {104};
104 -> {105};
104 -> {114 105};
105 -> {106};
106 -> {107};
107 -> {108};
108 -> {109};
109 -> {116};
109 -> {110};
110 -> {111};
111 -> {112};
112 -> {113};
113 -> {114};
113 -> {120};
114 -> {115};
115 -> {116};
116 -> {117};
117 -> {118};
118 -> {119};
119 -> {120};
120 -> {121};
121 -> {122};
}