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

FIR CFG: add union nodes

Browse Source 
Quick quiz:

 Q: In a CFG, what does `a -> b -> c -> d` mean?
 A: `a`, then `b`, then `c`, then `d`.

 Q: In a CFG, what does `a -> b -> d; a -> c -> d` mean?
 A: `a`, then `b` or `c`, then `d`.

 Q: So how do you encode "a, then (b, then c) or (c, then b), then d`?
 A: You can't.

Problem is, you need to, because that's what `a; run2({ b }, { c }); d`
does when `run2` has a contract that it calls both its lambda arguments
in-place: `shuffle(listOf(block1, block2)).forEach { it() }` is a
perfectly valid implementation for it, as little sense as that makes.

So that's what union nodes solve. When a node implements
`UnionNodeMarker`, its inputs are interpreted as "all visited in some
order" instead of the normal "one of the inputs is visited".

Currently this is used for data flow. It *should* also be used for
control flow, but it isn't. But it should be. But that's not so easy.

BTW, `try` exit is NOT a union node; although lambdas in one branch can
be completed according to types' of lambdas in another, data does not
flow between the branches anyway (since we don't know how much of the
`try` executed before jumping into `catch`, and `catch`es are mutually
exclusive) so a `try` expression is more like `when` than a function
call with called-in-place-exactly-once arguments. The fact that
`exitTryExpression` used `processUnionOfArguments` in a weird way
should've hinted at that, but now we know for certain.
This commit is contained in:
pyos
2022-11-17 12:53:35 +01:00
committed by teamcity
parent 99bebfa183
commit a9be27e330
108 changed files with 4050 additions and 4239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/elvis.dot
Vendored
+1 -1
View File
@@ -48,7 +48,7 @@ digraph elvis_kt {
21 [label="Enter block"];
22 [label="Access variable R|<local>/x|"];
23 [label="Smart cast: R|<local>/x|"];
24 [label="Function call: R|<local>/x|.R|/A.foo|()"];
24 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
25 [label="Exit block"];
}
26 [label="Exit when branch result"];
compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.dot
Vendored
+12 -12
View File
@@ -237,7 +237,7 @@ digraph returns_kt {
85 [label="Enter block"];
86 [label="Access variable R|<local>/x|"];
87 [label="Smart cast: R|<local>/x|"];
88 [label="Function call: R|<local>/x|.R|/C.baz|()"];
88 [label="Function call: R|<local>/x|.R|/C.baz|()" style="filled" fillcolor=yellow];
89 [label="Exit block"];
}
90 [label="Exit when branch result"];
@@ -247,7 +247,7 @@ digraph returns_kt {
92 [label="Enter block"];
93 [label="Access variable R|<local>/x|"];
94 [label="Smart cast: R|<local>/x|"];
95 [label="Function call: R|<local>/x|.R|/B.bar|()"];
95 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
96 [label="Exit block"];
}
97 [label="Exit when branch result"];
@@ -255,13 +255,13 @@ digraph returns_kt {
}
99 [label="Access variable R|<local>/x|"];
100 [label="Smart cast: R|<local>/x|"];
101 [label="Function call: R|<local>/x|.R|/A.foo|()"];
101 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
102 [label="Access variable R|<local>/x|"];
103 [label="Smart cast: R|<local>/x|"];
104 [label="Function call: R|<local>/x|.<Unresolved name: bar>#()"];
104 [label="Function call: R|<local>/x|.<Unresolved name: bar>#()" style="filled" fillcolor=yellow];
105 [label="Access variable R|<local>/x|"];
106 [label="Smart cast: R|<local>/x|"];
107 [label="Function call: R|<local>/x|.<Unresolved name: baz>#()"];
107 [label="Function call: R|<local>/x|.<Unresolved name: baz>#()" style="filled" fillcolor=yellow];
108 [label="Exit block"];
}
109 [label="Exit function test_2" style="filled" fillcolor=red];
@@ -342,7 +342,7 @@ digraph returns_kt {
123 [label="Enter block"];
124 [label="Access variable R|<local>/x|"];
125 [label="Smart cast: R|<local>/x|"];
126 [label="Function call: R|<local>/x|.R|/C.baz|()"];
126 [label="Function call: R|<local>/x|.R|/C.baz|()" style="filled" fillcolor=yellow];
127 [label="Exit block"];
}
128 [label="Exit when branch result"];
@@ -352,18 +352,18 @@ digraph returns_kt {
130 [label="Enter block"];
131 [label="Access variable R|<local>/x|"];
132 [label="Smart cast: R|<local>/x|"];
133 [label="Function call: R|<local>/x|.R|/B.bar|()"];
133 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
134 [label="Exit block"];
}
135 [label="Exit when branch result"];
136 [label="Exit when"];
}
137 [label="Access variable R|<local>/x|"];
138 [label="Function call: R|<local>/x|.<Unresolved name: foo>#()"];
138 [label="Function call: R|<local>/x|.<Unresolved name: foo>#()" style="filled" fillcolor=yellow];
139 [label="Access variable R|<local>/x|"];
140 [label="Function call: R|<local>/x|.<Unresolved name: bar>#()"];
140 [label="Function call: R|<local>/x|.<Unresolved name: bar>#()" style="filled" fillcolor=yellow];
141 [label="Access variable R|<local>/x|"];
142 [label="Function call: R|<local>/x|.<Unresolved name: baz>#()"];
142 [label="Function call: R|<local>/x|.<Unresolved name: baz>#()" style="filled" fillcolor=yellow];
143 [label="Exit block"];
}
144 [label="Exit function test_3" style="filled" fillcolor=red];
@@ -409,7 +409,7 @@ digraph returns_kt {
subgraph cluster_37 {
color=blue
146 [label="Enter block"];
147 [label="Function call: R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
147 [label="Function call: R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()" style="filled" fillcolor=yellow];
148 [label="Jump: ^runHigherOrder R|<local>/f|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
149 [label="Stub" style="filled" fillcolor=gray];
150 [label="Exit block" style="filled" fillcolor=gray];
@@ -480,7 +480,7 @@ digraph returns_kt {
186 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
}
176 [label="Postponed exit from lambda"];
177 [label="Function call: R|/runHigherOrder|<R|kotlin/Int|>(...)"];
177 [label="Function call: R|/runHigherOrder|<R|kotlin/Int|>(...)" style="filled" fillcolor=yellow];
178 [label="Exit block"];
}
179 [label="Exit function test_4" style="filled" fillcolor=red];
compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/simpleIf.dot
Vendored
+1 -1
View File
@@ -155,7 +155,7 @@ digraph simpleIf_kt {
60 [label="Access variable R|kotlin/String.length|"];
61 [label="Access variable R|<local>/x|"];
62 [label="Smart cast: R|<local>/x|"];
63 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
63 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
64 [label="Exit block"];
}
65 [label="Exit when branch result"];
compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/smartcastFromArgument.dot
Vendored
+2 -2
View File
@@ -58,7 +58,7 @@ digraph smartcastFromArgument_kt {
20 [label="Stub" style="filled" fillcolor=gray];
21 [label="Lhs of ?: is not null"];
22 [label="Exit ?:"];
23 [label="Function call: R|/takeA|(...)"];
23 [label="Function call: R|/takeA|(...)" style="filled" fillcolor=yellow];
24 [label="Exit when branch condition"];
}
25 [label="Synthetic else branch"];
@@ -68,7 +68,7 @@ digraph smartcastFromArgument_kt {
27 [label="Enter block"];
28 [label="Access variable R|<local>/a|"];
29 [label="Smart cast: R|<local>/a|"];
30 [label="Function call: R|<local>/a|.R|/A.foo|()"];
30 [label="Function call: R|<local>/a|.R|/A.foo|()" style="filled" fillcolor=yellow];
31 [label="Exit block"];
}
32 [label="Exit when branch result"];
compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/when.dot
Vendored
+34 -34
View File
@@ -61,7 +61,7 @@ digraph when_kt {
21 [label="Enter block"];
22 [label="Access variable R|<local>/x|"];
23 [label="Smart cast: R|<local>/x|"];
24 [label="Function call: R|<local>/x|.R|/B.bar|()"];
24 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
25 [label="Exit block"];
}
26 [label="Exit when branch result"];
@@ -71,7 +71,7 @@ digraph when_kt {
28 [label="Enter block"];
29 [label="Access variable R|<local>/x|"];
30 [label="Smart cast: R|<local>/x|"];
31 [label="Function call: R|<local>/x|.R|/A.foo|()"];
31 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
32 [label="Exit block"];
}
33 [label="Exit when branch result"];
@@ -114,10 +114,10 @@ digraph when_kt {
53 [label="Enter block"];
54 [label="Access variable R|<local>/x|"];
55 [label="Smart cast: R|<local>/x|"];
56 [label="Function call: R|<local>/x|.R|/A.foo|()"];
56 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
57 [label="Access variable R|<local>/x|"];
58 [label="Smart cast: R|<local>/x|"];
59 [label="Function call: R|<local>/x|.R|/B.bar|()"];
59 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
60 [label="Exit block"];
}
61 [label="Exit when branch result"];
@@ -127,13 +127,13 @@ digraph when_kt {
63 [label="Enter block"];
64 [label="Access variable R|<local>/x|"];
65 [label="Smart cast: R|<local>/x|"];
66 [label="Function call: R|<local>/x|.R|/A.foo|()"];
66 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
67 [label="Access variable R|<local>/x|"];
68 [label="Smart cast: R|<local>/x|"];
69 [label="Function call: R|<local>/x|.R|/B.bar|()"];
69 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
70 [label="Access variable R|<local>/x|"];
71 [label="Smart cast: R|<local>/x|"];
72 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
72 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
73 [label="Exit block"];
}
74 [label="Exit when branch result"];
@@ -143,7 +143,7 @@ digraph when_kt {
76 [label="Enter block"];
77 [label="Access variable R|<local>/x|"];
78 [label="Smart cast: R|<local>/x|"];
79 [label="Function call: R|<local>/x|.R|/A.foo|()"];
79 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
80 [label="Exit block"];
}
81 [label="Exit when branch result"];
@@ -272,7 +272,7 @@ digraph when_kt {
103 [label="Enter block"];
104 [label="Access variable R|<local>/x|"];
105 [label="Smart cast: R|<local>/x|"];
106 [label="Function call: R|<local>/x|.R|/B.bar|()"];
106 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
107 [label="Exit block"];
}
108 [label="Exit when branch result"];
@@ -282,7 +282,7 @@ digraph when_kt {
110 [label="Enter block"];
111 [label="Access variable R|<local>/x|"];
112 [label="Smart cast: R|<local>/x|"];
113 [label="Function call: R|<local>/x|.R|/A.foo|()"];
113 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
114 [label="Exit block"];
}
115 [label="Exit when branch result"];
@@ -324,10 +324,10 @@ digraph when_kt {
134 [label="Enter block"];
135 [label="Access variable R|<local>/x|"];
136 [label="Smart cast: R|<local>/x|"];
137 [label="Function call: R|<local>/x|.R|/A.foo|()"];
137 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
138 [label="Access variable R|<local>/x|"];
139 [label="Smart cast: R|<local>/x|"];
140 [label="Function call: R|<local>/x|.R|/B.bar|()"];
140 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
141 [label="Exit block"];
}
142 [label="Exit when branch result"];
@@ -337,13 +337,13 @@ digraph when_kt {
144 [label="Enter block"];
145 [label="Access variable R|<local>/x|"];
146 [label="Smart cast: R|<local>/x|"];
147 [label="Function call: R|<local>/x|.R|/A.foo|()"];
147 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
148 [label="Access variable R|<local>/x|"];
149 [label="Smart cast: R|<local>/x|"];
150 [label="Function call: R|<local>/x|.R|/B.bar|()"];
150 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
151 [label="Access variable R|<local>/x|"];
152 [label="Smart cast: R|<local>/x|"];
153 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
153 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
154 [label="Exit block"];
}
155 [label="Exit when branch result"];
@@ -353,7 +353,7 @@ digraph when_kt {
157 [label="Enter block"];
158 [label="Access variable R|<local>/x|"];
159 [label="Smart cast: R|<local>/x|"];
160 [label="Function call: R|<local>/x|.R|/A.foo|()"];
160 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
161 [label="Exit block"];
}
162 [label="Exit when branch result"];
@@ -483,10 +483,10 @@ digraph when_kt {
185 [label="Enter block"];
186 [label="Access variable R|<local>/x|"];
187 [label="Smart cast: R|<local>/x|"];
188 [label="Function call: R|<local>/x|.R|/B.bar|()"];
188 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
189 [label="Access variable R|<local>/y|"];
190 [label="Smart cast: R|<local>/y|"];
191 [label="Function call: R|<local>/y|.R|/B.bar|()"];
191 [label="Function call: R|<local>/y|.R|/B.bar|()" style="filled" fillcolor=yellow];
192 [label="Exit block"];
}
193 [label="Exit when branch result"];
@@ -496,10 +496,10 @@ digraph when_kt {
195 [label="Enter block"];
196 [label="Access variable R|<local>/x|"];
197 [label="Smart cast: R|<local>/x|"];
198 [label="Function call: R|<local>/x|.R|/A.foo|()"];
198 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
199 [label="Access variable R|<local>/y|"];
200 [label="Smart cast: R|<local>/y|"];
201 [label="Function call: R|<local>/y|.R|/A.foo|()"];
201 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
202 [label="Exit block"];
}
203 [label="Exit when branch result"];
@@ -542,16 +542,16 @@ digraph when_kt {
223 [label="Enter block"];
224 [label="Access variable R|<local>/x|"];
225 [label="Smart cast: R|<local>/x|"];
226 [label="Function call: R|<local>/x|.R|/A.foo|()"];
226 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
227 [label="Access variable R|<local>/x|"];
228 [label="Smart cast: R|<local>/x|"];
229 [label="Function call: R|<local>/x|.R|/B.bar|()"];
229 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
230 [label="Access variable R|<local>/y|"];
231 [label="Smart cast: R|<local>/y|"];
232 [label="Function call: R|<local>/y|.R|/A.foo|()"];
232 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
233 [label="Access variable R|<local>/y|"];
234 [label="Smart cast: R|<local>/y|"];
235 [label="Function call: R|<local>/y|.R|/B.bar|()"];
235 [label="Function call: R|<local>/y|.R|/B.bar|()" style="filled" fillcolor=yellow];
236 [label="Exit block"];
}
237 [label="Exit when branch result"];
@@ -561,22 +561,22 @@ digraph when_kt {
239 [label="Enter block"];
240 [label="Access variable R|<local>/x|"];
241 [label="Smart cast: R|<local>/x|"];
242 [label="Function call: R|<local>/x|.R|/A.foo|()"];
242 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
243 [label="Access variable R|<local>/x|"];
244 [label="Smart cast: R|<local>/x|"];
245 [label="Function call: R|<local>/x|.R|/B.bar|()"];
245 [label="Function call: R|<local>/x|.R|/B.bar|()" style="filled" fillcolor=yellow];
246 [label="Access variable R|<local>/x|"];
247 [label="Smart cast: R|<local>/x|"];
248 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
248 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
249 [label="Access variable R|<local>/y|"];
250 [label="Smart cast: R|<local>/y|"];
251 [label="Function call: R|<local>/y|.R|/A.foo|()"];
251 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
252 [label="Access variable R|<local>/y|"];
253 [label="Smart cast: R|<local>/y|"];
254 [label="Function call: R|<local>/y|.R|/B.bar|()"];
254 [label="Function call: R|<local>/y|.R|/B.bar|()" style="filled" fillcolor=yellow];
255 [label="Access variable R|<local>/y|"];
256 [label="Smart cast: R|<local>/y|"];
257 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
257 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
258 [label="Exit block"];
}
259 [label="Exit when branch result"];
@@ -586,10 +586,10 @@ digraph when_kt {
261 [label="Enter block"];
262 [label="Access variable R|<local>/x|"];
263 [label="Smart cast: R|<local>/x|"];
264 [label="Function call: R|<local>/x|.R|/A.foo|()"];
264 [label="Function call: R|<local>/x|.R|/A.foo|()" style="filled" fillcolor=yellow];
265 [label="Access variable R|<local>/y|"];
266 [label="Smart cast: R|<local>/y|"];
267 [label="Function call: R|<local>/y|.R|/A.foo|()"];
267 [label="Function call: R|<local>/y|.R|/A.foo|()" style="filled" fillcolor=yellow];
268 [label="Exit block"];
}
269 [label="Exit when branch result"];
@@ -739,7 +739,7 @@ digraph when_kt {
289 [label="Enter block"];
290 [label="Access variable R|<local>/x|"];
291 [label="Smart cast: R|<local>/x|"];
292 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
292 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
293 [label="Exit block"];
}
294 [label="Exit when branch result"];
@@ -747,7 +747,7 @@ digraph when_kt {
}
296 [label="Access variable R|<local>/x|"];
297 [label="Smart cast: R|<local>/x|"];
298 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
298 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow];
299 [label="Exit block"];
}
300 [label="Exit function test_4" style="filled" fillcolor=red];
compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/whenSubjectExpression.dot
Vendored
+2 -2
View File
@@ -39,7 +39,7 @@ digraph whenSubjectExpression_kt {
16 [label="Enter block"];
17 [label="Access variable R|<local>/x|"];
18 [label="Smart cast: R|<local>/x|"];
19 [label="Function call: R|<local>/x|.R|kotlin/Double.toInt|()"];
19 [label="Function call: R|<local>/x|.R|kotlin/Double.toInt|()" style="filled" fillcolor=yellow];
20 [label="Exit block"];
}
21 [label="Exit when branch result"];
@@ -137,7 +137,7 @@ digraph whenSubjectExpression_kt {
52 [label="Enter block"];
53 [label="Access variable R|<local>/y|"];
54 [label="Smart cast: R|<local>/y|"];
55 [label="Function call: R|<local>/y|.R|kotlin/Double.toInt|()"];
55 [label="Function call: R|<local>/y|.R|kotlin/Double.toInt|()" style="filled" fillcolor=yellow];
56 [label="Exit block"];
}
57 [label="Exit when branch result"];