FIR CFG: join/unify data flow from postponed lambdas at each level
For example:
foo(
// `if` joins A & B
if (condition)
run { ... } // A
else
run { ... }, // B
run { ... } // C
) // `foo` unifies `A & B` and `C`, so if it is not resolved itself,
// further `if`s, `when`s, safe calls outside it, etc. continue
// building the correct type predicate until the next completed
// call.
^KT-44512 Fixed
This commit is contained in:
+12
-10
@@ -135,14 +135,14 @@ digraph lambdaInWhenBranch_kt {
|
||||
48 [label="Postponed enter to lambda"];
|
||||
subgraph cluster_18 {
|
||||
color=blue
|
||||
81 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
|
||||
82 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
|
||||
subgraph cluster_19 {
|
||||
color=blue
|
||||
82 [label="Enter block"];
|
||||
83 [label="Access variable R|<local>/it|"];
|
||||
84 [label="Exit block"];
|
||||
83 [label="Enter block"];
|
||||
84 [label="Access variable R|<local>/it|"];
|
||||
85 [label="Exit block"];
|
||||
}
|
||||
85 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
|
||||
86 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
|
||||
}
|
||||
49 [label="Postponed exit from lambda"];
|
||||
50 [label="Function call: String().R|kotlin/let|<R|kotlin/String|, R|kotlin/String|>(...)"];
|
||||
@@ -195,6 +195,7 @@ digraph lambdaInWhenBranch_kt {
|
||||
}
|
||||
80 [label="Exit function foo" style="filled" fillcolor=red];
|
||||
}
|
||||
81 [label="Merge postponed lambda exits"];
|
||||
28 -> {29};
|
||||
29 -> {30};
|
||||
30 -> {31};
|
||||
@@ -215,14 +216,14 @@ digraph lambdaInWhenBranch_kt {
|
||||
45 -> {46};
|
||||
46 -> {47};
|
||||
47 -> {48};
|
||||
48 -> {81};
|
||||
48 -> {82};
|
||||
48 -> {49} [color=red];
|
||||
48 -> {81} [style=dashed];
|
||||
48 -> {82} [style=dashed];
|
||||
49 -> {50};
|
||||
50 -> {51};
|
||||
51 -> {52};
|
||||
52 -> {53};
|
||||
53 -> {54};
|
||||
53 -> {81 54};
|
||||
54 -> {55};
|
||||
55 -> {56};
|
||||
56 -> {57};
|
||||
@@ -249,10 +250,11 @@ digraph lambdaInWhenBranch_kt {
|
||||
77 -> {78};
|
||||
78 -> {79};
|
||||
79 -> {80};
|
||||
81 -> {82};
|
||||
82 -> {83};
|
||||
83 -> {84};
|
||||
84 -> {85};
|
||||
85 -> {49} [color=green];
|
||||
85 -> {86};
|
||||
86 -> {81} [color=red];
|
||||
86 -> {49} [color=green];
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user