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

[FIR] Don't pass flow from inplace lambdas throw when and elvis expressions

Browse Source 
#KT-39080 Fixed
This commit is contained in:
Dmitriy Novozhilov
2020-07-02 16:22:45 +03:00
parent 1429cba2d4
commit 1db2ba51d2
9 changed files with 433 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.dot
Vendored
+70 -73
View File
@@ -61,14 +61,14 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
23 [label="Postponed enter to lambda"]; 23 [label="Postponed enter to lambda"];
subgraph cluster_9 { subgraph cluster_9 {
color=blue color=blue
33 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; 32 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_10 { subgraph cluster_10 {
color=blue color=blue
34 [label="Enter block"]; 33 [label="Enter block"];
35 [label="Function call: R|/materialize|<R|kotlin/String|>()"]; 34 [label="Function call: R|/materialize|<R|kotlin/String|>()"];
36 [label="Exit block"]; 35 [label="Exit block"];
} }
37 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; 36 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
} }
24 [label="Postponed exit from lambda"]; 24 [label="Postponed exit from lambda"];
25 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)"]; 25 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)"];
@@ -77,11 +77,10 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
27 [label="Exit when branch result"]; 27 [label="Exit when branch result"];
28 [label="Exit when"]; 28 [label="Exit when"];
} }
29 [label="Call arguments union" style="filled" fillcolor=yellow]; 29 [label="Variable declaration: lval x: R|kotlin/String|"];
30 [label="Variable declaration: lval x: R|kotlin/String|"]; 30 [label="Exit block"];
31 [label="Exit block"];
} }
32 [label="Exit function test_1" style="filled" fillcolor=red]; 31 [label="Exit function test_1" style="filled" fillcolor=red];
} }
8 -> {9}; 8 -> {9};
9 -> {10}; 9 -> {10};
@@ -98,7 +97,7 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
20 -> {28}; 20 -> {28};
21 -> {22}; 21 -> {22};
22 -> {23}; 22 -> {23};
23 -> {33}; 23 -> {32};
23 -> {24} [color=red]; 23 -> {24} [color=red];
24 -> {25}; 24 -> {25};
25 -> {26}; 25 -> {26};
@@ -107,78 +106,77 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
28 -> {29}; 28 -> {29};
29 -> {30}; 29 -> {30};
30 -> {31}; 30 -> {31};
31 -> {32}; 32 -> {33};
33 -> {34}; 33 -> {34};
34 -> {35}; 34 -> {35};
35 -> {36}; 35 -> {36};
36 -> {37}; 36 -> {24} [color=green];
37 -> {29} [color=red];
37 -> {24} [color=green];
subgraph cluster_11 { subgraph cluster_11 {
color=red color=red
38 [label="Enter function test_2" style="filled" fillcolor=red]; 37 [label="Enter function test_2" style="filled" fillcolor=red];
subgraph cluster_12 { subgraph cluster_12 {
color=blue color=blue
39 [label="Enter block"]; 38 [label="Enter block"];
subgraph cluster_13 { subgraph cluster_13 {
color=blue color=blue
40 [label="Try expression enter"]; 39 [label="Try expression enter"];
subgraph cluster_14 { subgraph cluster_14 {
color=blue color=blue
41 [label="Try main block enter"]; 40 [label="Try main block enter"];
subgraph cluster_15 { subgraph cluster_15 {
color=blue color=blue
42 [label="Enter block"]; 41 [label="Enter block"];
43 [label="Postponed enter to lambda"]; 42 [label="Postponed enter to lambda"];
subgraph cluster_16 { subgraph cluster_16 {
color=blue color=blue
58 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; 57 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_17 { subgraph cluster_17 {
color=blue color=blue
59 [label="Enter block"]; 58 [label="Enter block"];
60 [label="Function call: R|/materialize|<R|kotlin/String|>()"]; 59 [label="Function call: R|/materialize|<R|kotlin/String|>()"];
61 [label="Exit block"]; 60 [label="Exit block"];
} }
62 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; 61 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
} }
44 [label="Postponed exit from lambda"]; 43 [label="Postponed exit from lambda"];
45 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)"]; 44 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)"];
46 [label="Exit block"]; 45 [label="Exit block"];
} }
47 [label="Try main block exit"]; 46 [label="Try main block exit"];
} }
subgraph cluster_18 { subgraph cluster_18 {
color=blue color=blue
48 [label="Catch enter"]; 47 [label="Catch enter"];
subgraph cluster_19 { subgraph cluster_19 {
color=blue color=blue
49 [label="Enter block"]; 48 [label="Enter block"];
50 [label="Const: String()"]; 49 [label="Const: String()"];
51 [label="Exit block"]; 50 [label="Exit block"];
} }
52 [label="Catch exit"]; 51 [label="Catch exit"];
} }
53 [label="Try expression exit"]; 52 [label="Try expression exit"];
} }
54 [label="Call arguments union" style="filled" fillcolor=yellow]; 53 [label="Call arguments union" style="filled" fillcolor=yellow];
55 [label="Variable declaration: lval x: R|kotlin/String|"]; 54 [label="Variable declaration: lval x: R|kotlin/String|"];
56 [label="Exit block"]; 55 [label="Exit block"];
} }
57 [label="Exit function test_2" style="filled" fillcolor=red]; 56 [label="Exit function test_2" style="filled" fillcolor=red];
} }
37 -> {38};
38 -> {39}; 38 -> {39};
39 -> {40}; 39 -> {40};
40 -> {41}; 40 -> {56 47 41};
41 -> {57 48 42}; 41 -> {42};
42 -> {43}; 42 -> {57};
43 -> {58}; 42 -> {43} [color=red];
43 -> {44} [color=red]; 43 -> {44};
44 -> {45}; 44 -> {45};
45 -> {46}; 45 -> {46};
46 -> {47}; 46 -> {52};
47 -> {53}; 47 -> {56 48};
48 -> {57 49}; 48 -> {49};
49 -> {50}; 49 -> {50};
50 -> {51}; 50 -> {51};
51 -> {52}; 51 -> {52};
@@ -186,56 +184,55 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
53 -> {54}; 53 -> {54};
54 -> {55}; 54 -> {55};
55 -> {56}; 55 -> {56};
56 -> {57}; 57 -> {58};
58 -> {59}; 58 -> {59};
59 -> {60}; 59 -> {60};
60 -> {61}; 60 -> {61};
61 -> {62}; 61 -> {53} [color=red];
62 -> {54} [color=red]; 61 -> {43} [color=green];
62 -> {44} [color=green];
subgraph cluster_20 { subgraph cluster_20 {
color=red color=red
63 [label="Enter function test_3" style="filled" fillcolor=red]; 62 [label="Enter function test_3" style="filled" fillcolor=red];
subgraph cluster_21 { subgraph cluster_21 {
color=blue color=blue
64 [label="Enter block"]; 63 [label="Enter block"];
65 [label="Postponed enter to lambda"]; 64 [label="Postponed enter to lambda"];
subgraph cluster_22 { subgraph cluster_22 {
color=blue color=blue
73 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; 72 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_23 { subgraph cluster_23 {
color=blue color=blue
74 [label="Enter block"]; 73 [label="Enter block"];
75 [label="Function call: R|/materialize|<R|kotlin/String?|>()"]; 74 [label="Function call: R|/materialize|<R|kotlin/String?|>()"];
76 [label="Exit block"]; 75 [label="Exit block"];
} }
77 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; 76 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
} }
66 [label="Postponed exit from lambda"]; 65 [label="Postponed exit from lambda"];
67 [label="Function call: R|kotlin/run|<R|kotlin/String?|>(...)"]; 66 [label="Function call: R|kotlin/run|<R|kotlin/String?|>(...)"];
68 [label="Check not null: R|kotlin/run|<R|kotlin/String?|>(...)!!"]; 67 [label="Check not null: R|kotlin/run|<R|kotlin/String?|>(...)!!"];
69 [label="Call arguments union" style="filled" fillcolor=yellow]; 68 [label="Call arguments union" style="filled" fillcolor=yellow];
70 [label="Variable declaration: lval x: R|kotlin/String|"]; 69 [label="Variable declaration: lval x: R|kotlin/String|"];
71 [label="Exit block"]; 70 [label="Exit block"];
} }
72 [label="Exit function test_3" style="filled" fillcolor=red]; 71 [label="Exit function test_3" style="filled" fillcolor=red];
} }
62 -> {63};
63 -> {64}; 63 -> {64};
64 -> {65}; 64 -> {72};
65 -> {73}; 64 -> {65} [color=red];
65 -> {66} [color=red]; 65 -> {66};
66 -> {67}; 66 -> {67};
67 -> {68}; 67 -> {68};
68 -> {69}; 68 -> {69};
69 -> {70}; 69 -> {70};
70 -> {71}; 70 -> {71};
71 -> {72}; 72 -> {73};
73 -> {74}; 73 -> {74};
74 -> {75}; 74 -> {75};
75 -> {76}; 75 -> {76};
76 -> {77}; 76 -> {68} [color=red];
77 -> {69} [color=red]; 76 -> {65} [color=green];
77 -> {66} [color=green];
} }
compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/lambdaInWhenBranch.dot
Vendored
+250
View File
@@ -0,0 +1,250 @@
digraph lambdaInWhenBranch_kt {
graph [nodesep=3]
node [shape=box penwidth=2]
edge [penwidth=2]
subgraph cluster_0 {
color=red
0 [label="Enter class Sealed" style="filled" fillcolor=red];
1 [label="Exit class Sealed" style="filled" fillcolor=red];
}
0 -> {1} [color=green];
subgraph cluster_1 {
color=red
2 [label="Enter function <init>" style="filled" fillcolor=red];
3 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
4 [label="Exit function <init>" style="filled" fillcolor=red];
}
2 -> {3};
3 -> {4};
subgraph cluster_2 {
color=red
5 [label="Enter class SubClass1" style="filled" fillcolor=red];
subgraph cluster_3 {
color=blue
7 [label="Enter property" style="filled" fillcolor=red];
8 [label="Access variable R|<local>/t|"];
9 [label="Exit property" style="filled" fillcolor=red];
}
6 [label="Exit class SubClass1" style="filled" fillcolor=red];
}
5 -> {7} [color=green];
7 -> {8};
8 -> {9};
9 -> {6} [color=green];
subgraph cluster_4 {
color=red
10 [label="Enter function <init>" style="filled" fillcolor=red];
11 [label="Delegated constructor call: super<R|Sealed|>()"];
12 [label="Exit function <init>" style="filled" fillcolor=red];
}
10 -> {11};
11 -> {12};
subgraph cluster_5 {
color=red
13 [label="Enter function getter" style="filled" fillcolor=red];
14 [label="Exit function getter" style="filled" fillcolor=red];
}
13 -> {14};
subgraph cluster_6 {
color=red
15 [label="Enter function component1" style="filled" fillcolor=red];
16 [label="Exit function component1" style="filled" fillcolor=red];
}
15 -> {16};
subgraph cluster_7 {
color=red
17 [label="Enter function copy" style="filled" fillcolor=red];
subgraph cluster_8 {
color=blue
19 [label="Enter default value of t" style="filled" fillcolor=red];
20 [label="Access variable R|/SubClass1.t|"];
21 [label="Exit default value of t" style="filled" fillcolor=red];
}
18 [label="Exit function copy" style="filled" fillcolor=red];
}
17 -> {19 18};
19 -> {20};
20 -> {21};
subgraph cluster_9 {
color=red
22 [label="Enter class SubClass2" style="filled" fillcolor=red];
23 [label="Exit class SubClass2" style="filled" fillcolor=red];
}
22 -> {23} [color=green];
subgraph cluster_10 {
color=red
24 [label="Enter function <init>" style="filled" fillcolor=red];
25 [label="Delegated constructor call: super<R|Sealed|>()"];
26 [label="Exit function <init>" style="filled" fillcolor=red];
}
24 -> {25};
25 -> {26};
subgraph cluster_11 {
color=red
27 [label="Enter function copy" style="filled" fillcolor=red];
28 [label="Exit function copy" style="filled" fillcolor=red];
}
27 -> {28};
subgraph cluster_12 {
color=red
29 [label="Enter function foo" style="filled" fillcolor=red];
subgraph cluster_13 {
color=blue
30 [label="Enter block"];
subgraph cluster_14 {
color=blue
31 [label="Enter when"];
32 [label="Access variable R|<local>/p|"];
subgraph cluster_15 {
color=blue
33 [label="Enter when branch condition "];
34 [label="Type operator: ($subj$ is R|SubClass1|)"];
35 [label="Exit when branch condition"];
}
subgraph cluster_16 {
color=blue
36 [label="Enter when branch condition "];
37 [label="Type operator: ($subj$ is R|SubClass2|)"];
38 [label="Exit when branch condition"];
}
39 [label="Enter when branch result"];
subgraph cluster_17 {
color=blue
40 [label="Enter block"];
41 [label="Const: String()"];
42 [label="Exit block"];
}
43 [label="Exit when branch result"];
44 [label="Enter when branch result"];
subgraph cluster_18 {
color=blue
45 [label="Enter block"];
46 [label="Const: String()"];
47 [label="Postponed enter to lambda"];
subgraph cluster_19 {
color=blue
78 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_20 {
color=blue
79 [label="Enter block"];
80 [label="Access variable R|<local>/it|"];
81 [label="Exit block"];
}
82 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
}
48 [label="Postponed exit from lambda"];
49 [label="Function call: String().R|kotlin/let|<R|kotlin/String|, R|kotlin/String|>(...)"];
50 [label="Exit block"];
}
51 [label="Exit when branch result"];
52 [label="Exit when"];
}
53 [label="Access variable R|<local>/p|"];
54 [label="Access variable <Unresolved name: t>#"];
subgraph cluster_21 {
color=blue
55 [label="Enter when"];
56 [label="Access variable R|<local>/p|"];
subgraph cluster_22 {
color=blue
57 [label="Enter when branch condition "];
58 [label="Type operator: ($subj$ is R|SubClass1|)"];
59 [label="Exit when branch condition"];
}
subgraph cluster_23 {
color=blue
60 [label="Enter when branch condition "];
61 [label="Type operator: ($subj$ is R|SubClass2|)"];
62 [label="Exit when branch condition"];
}
63 [label="Enter when branch result"];
subgraph cluster_24 {
color=blue
64 [label="Enter block"];
65 [label="Const: String(2)"];
66 [label="Exit block"];
}
67 [label="Exit when branch result"];
68 [label="Enter when branch result"];
subgraph cluster_25 {
color=blue
69 [label="Enter block"];
70 [label="Access variable R|<local>/p|"];
71 [label="Access variable R|/SubClass1.t|"];
72 [label="Exit block"];
}
73 [label="Exit when branch result"];
74 [label="Exit when"];
}
75 [label="Access variable R|kotlin/String.length|"];
76 [label="Exit block"];
}
77 [label="Exit function foo" style="filled" fillcolor=red];
}
29 -> {30};
30 -> {31};
31 -> {32};
32 -> {33};
33 -> {34};
34 -> {35};
35 -> {44 36};
36 -> {37};
37 -> {38};
38 -> {39};
39 -> {40};
40 -> {41};
41 -> {42};
42 -> {43};
43 -> {52};
44 -> {45};
45 -> {46};
46 -> {47};
47 -> {78};
47 -> {48} [color=red];
48 -> {49};
49 -> {50};
50 -> {51};
51 -> {52};
52 -> {53};
53 -> {54};
54 -> {55};
55 -> {56};
56 -> {57};
57 -> {58};
58 -> {59};
59 -> {68 60};
60 -> {61};
61 -> {62};
62 -> {63};
63 -> {64};
64 -> {65};
65 -> {66};
66 -> {67};
67 -> {74};
68 -> {69};
69 -> {70};
70 -> {71};
71 -> {72};
72 -> {73};
73 -> {74};
74 -> {75};
75 -> {76};
76 -> {77};
78 -> {79};
79 -> {80};
80 -> {81};
81 -> {82};
82 -> {48} [color=green];
}
compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/lambdaInWhenBranch.kt
Vendored
+23
View File
@@ -0,0 +1,23 @@
// ISSUE: KT-39080
// !DUMP_CFG
private sealed class Sealed
private data class SubClass1(val t: String) : Sealed()
private data class SubClass2 : Sealed()
private fun foo(p: Sealed) {
when (p) {
is SubClass1 -> "".let {
it
}
is SubClass2 -> ""
}
p.<!UNRESOLVED_REFERENCE!>t<!> // should not be resolved, but it has a smartcast to SubClass1 because of the lambda
when (p) {
is SubClass1 -> p.t
is SubClass2 -> "2"
}.length // should be resolved, but when is not considered as sealed because type of p is not a sealed class
}
compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/lambdaInWhenBranch.txt
Vendored
+52
View File
@@ -0,0 +1,52 @@
FILE: lambdaInWhenBranch.kt
private sealed class Sealed : R|kotlin/Any| {
private constructor(): R|Sealed| {
super<R|kotlin/Any|>()
}
}
private final data class SubClass1 : R|Sealed| {
public[private] constructor(t: R|kotlin/String|): R|SubClass1| {
super<R|Sealed|>()
}
public[private] final val t: R|kotlin/String| = R|<local>/t|
public get(): R|kotlin/String|
public[private] final fun component1(): R|kotlin/String|
public[private] final fun copy(t: R|kotlin/String| = this@R|/SubClass1|.R|/SubClass1.t|): R|SubClass1|
}
private final data class SubClass2 : R|Sealed| {
public[private] constructor(): R|SubClass2| {
super<R|Sealed|>()
}
public[private] final fun copy(): R|SubClass2|
}
private final fun foo(p: R|Sealed|): R|kotlin/Unit| {
when (R|<local>/p|) {
($subj$ is R|SubClass1|) -> {
String().R|kotlin/let|<R|kotlin/String|, R|kotlin/String|>(<L> = let@fun <anonymous>(it: R|kotlin/String|): R|kotlin/String| <kind=EXACTLY_ONCE> {
^ R|<local>/it|
}
)
}
($subj$ is R|SubClass2|) -> {
String()
}
}
R|<local>/p|.<Unresolved name: t>#
when (R|<local>/p|) {
($subj$ is R|SubClass1|) -> {
R|<local>/p|.R|/SubClass1.t|
}
($subj$ is R|SubClass2|) -> {
String(2)
}
}
.R|kotlin/String.length|
}
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
Generated
+5
View File
@@ -2095,6 +2095,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/inPlaceLambdas.kt"); runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/inPlaceLambdas.kt");
} }
@TestMetadata("lambdaInWhenBranch.kt")
public void testLambdaInWhenBranch() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/lambdaInWhenBranch.kt");
}
@TestMetadata("smartcastOnLambda.kt") @TestMetadata("smartcastOnLambda.kt")
public void testSmartcastOnLambda() throws Exception { public void testSmartcastOnLambda() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.kt"); runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.kt");
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
Generated
+5
View File
@@ -2095,6 +2095,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/inPlaceLambdas.kt"); runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/inPlaceLambdas.kt");
} }
@TestMetadata("lambdaInWhenBranch.kt")
public void testLambdaInWhenBranch() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/lambdaInWhenBranch.kt");
}
@TestMetadata("smartcastOnLambda.kt") @TestMetadata("smartcastOnLambda.kt")
public void testSmartcastOnLambda() throws Exception { public void testSmartcastOnLambda() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.kt"); runTest("compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.kt");
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt
+4 -7
View File
@@ -493,8 +493,8 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
graphBuilder.exitWhenBranchResult(whenBranch).mergeIncomingFlow() graphBuilder.exitWhenBranchResult(whenBranch).mergeIncomingFlow()
} }
fun exitWhenExpression(whenExpression: FirWhenExpression, callCompleted: Boolean) { fun exitWhenExpression(whenExpression: FirWhenExpression) {
val (whenExitNode, syntheticElseNode, unionNode) = graphBuilder.exitWhenExpression(whenExpression, callCompleted) val (whenExitNode, syntheticElseNode) = graphBuilder.exitWhenExpression(whenExpression)
if (syntheticElseNode != null) { if (syntheticElseNode != null) {
val previousConditionExitNode = syntheticElseNode.firstPreviousNode as? WhenBranchConditionExitNode val previousConditionExitNode = syntheticElseNode.firstPreviousNode as? WhenBranchConditionExitNode
// previous node for syntheticElseNode can be not WhenBranchConditionExitNode in case of `when` without any branches // previous node for syntheticElseNode can be not WhenBranchConditionExitNode in case of `when` without any branches
@@ -512,7 +512,6 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
} }
} }
whenExitNode.mergeIncomingFlow(updateReceivers = true) whenExitNode.mergeIncomingFlow(updateReceivers = true)
unionNode?.let { unionFlowFromArguments(unionNode) }
} }
// ----------------------------------- While Loop ----------------------------------- // ----------------------------------- While Loop -----------------------------------
@@ -1040,10 +1039,8 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
} }
} }
fun exitElvis(callCompleted: Boolean) { fun exitElvis() {
val (elvisExitNode, unionNode) = graphBuilder.exitElvis(callCompleted) graphBuilder.exitElvis().mergeIncomingFlow()
elvisExitNode.mergeIncomingFlow()
unionNode?.let { unionFlowFromArguments(it) }
} }
// ------------------------------------------------------ Utils ------------------------------------------------------ // ------------------------------------------------------ Utils ------------------------------------------------------
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt
+16 -9
View File
@@ -533,10 +533,7 @@ class ControlFlowGraphBuilder {
return node return node
} }
fun exitWhenExpression( fun exitWhenExpression(whenExpression: FirWhenExpression): Pair<WhenExitNode, WhenSyntheticElseBranchNode?> {
whenExpression: FirWhenExpression,
callCompleted: Boolean
): Triple<WhenExitNode, WhenSyntheticElseBranchNode?, UnionFunctionCallArgumentsNode?> {
val whenExitNode = whenExitNodes.pop() val whenExitNode = whenExitNodes.pop()
// exit from last condition node still on stack // exit from last condition node still on stack
// we should remove it // we should remove it
@@ -549,9 +546,9 @@ class ControlFlowGraphBuilder {
} else null } else null
whenExitNode.updateDeadStatus() whenExitNode.updateDeadStatus()
lastNodes.push(whenExitNode) lastNodes.push(whenExitNode)
val (_, unionNode) = processUnionOfArguments(whenExitNode, callCompleted) dropPostponedLambdasForNonDeterministicCalls()
levelCounter-- levelCounter--
return Triple(whenExitNode, syntheticElseBranchNode, unionNode) return whenExitNode to syntheticElseBranchNode
} }
// ----------------------------------- While Loop ----------------------------------- // ----------------------------------- While Loop -----------------------------------
@@ -870,6 +867,16 @@ class ControlFlowGraphBuilder {
return node to unionNode return node to unionNode
} }
/*
* This is needed for some control flow constructions which are resolved as calls (when and elvis)
* For usual call we have invariant that all arguments will be called before function call, but for
* when and elvis only one of arguments will be actually called, so it's illegal to pass data flow info
* from lambda in one of branches
*/
private fun dropPostponedLambdasForNonDeterministicCalls() {
exitsFromCompletedPostponedAnonymousFunctions.clear()
}
private fun processUnionOfArguments( private fun processUnionOfArguments(
node: CFGNode<*>, node: CFGNode<*>,
callCompleted: Boolean callCompleted: Boolean
@@ -1010,12 +1017,12 @@ class ControlFlowGraphBuilder {
return Triple(lhsExitNode, lhsIsNotNullNode, rhsEnterNode) return Triple(lhsExitNode, lhsIsNotNullNode, rhsEnterNode)
} }
fun exitElvis(callCompleted: Boolean): Pair<ElvisExitNode, UnionFunctionCallArgumentsNode?> { fun exitElvis(): ElvisExitNode {
val exitNode = exitElvisCallNodes.pop() val exitNode = exitElvisCallNodes.pop()
addNewSimpleNode(exitNode) addNewSimpleNode(exitNode)
exitNode.updateDeadStatus() exitNode.updateDeadStatus()
val (_, unionNode) = processUnionOfArguments(exitNode, callCompleted) dropPostponedLambdasForNonDeterministicCalls()
return exitNode to unionNode return exitNode
} }
// ----------------------------------- Contract description ----------------------------------- // ----------------------------------- Contract description -----------------------------------
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirControlFlowStatementsResolveTransformer.kt
+8 -16
View File
@@ -68,19 +68,18 @@ class FirControlFlowStatementsResolveTransformer(transformer: FirBodyResolveTran
@Suppress("NAME_SHADOWING") @Suppress("NAME_SHADOWING")
var whenExpression = whenExpression.transformSubject(transformer, ResolutionMode.ContextIndependent) var whenExpression = whenExpression.transformSubject(transformer, ResolutionMode.ContextIndependent)
val callCompleted = when { when {
whenExpression.branches.isEmpty() -> true whenExpression.branches.isEmpty() -> {}
whenExpression.isOneBranch() -> { whenExpression.isOneBranch() -> {
whenExpression = whenExpression.transformBranches(transformer, ResolutionMode.ContextIndependent) whenExpression = whenExpression.transformBranches(transformer, ResolutionMode.ContextIndependent)
whenExpression.resultType = whenExpression.branches.first().result.resultType whenExpression.resultType = whenExpression.branches.first().result.resultType
true
} }
else -> { else -> {
whenExpression = whenExpression.transformBranches(transformer, ResolutionMode.ContextDependent) whenExpression = whenExpression.transformBranches(transformer, ResolutionMode.ContextDependent)
whenExpression = syntheticCallGenerator.generateCalleeForWhenExpression(whenExpression) ?: run { whenExpression = syntheticCallGenerator.generateCalleeForWhenExpression(whenExpression) ?: run {
whenExpression = whenExpression.transformSingle(whenExhaustivenessTransformer, null) whenExpression = whenExpression.transformSingle(whenExhaustivenessTransformer, null)
dataFlowAnalyzer.exitWhenExpression(whenExpression, callCompleted = true) dataFlowAnalyzer.exitWhenExpression(whenExpression)
whenExpression.resultType = buildErrorTypeRef { whenExpression.resultType = buildErrorTypeRef {
diagnostic = ConeSimpleDiagnostic("Can't resolve when expression", DiagnosticKind.InferenceError) diagnostic = ConeSimpleDiagnostic("Can't resolve when expression", DiagnosticKind.InferenceError)
} }
@@ -90,11 +89,10 @@ class FirControlFlowStatementsResolveTransformer(transformer: FirBodyResolveTran
val expectedTypeRef = data.expectedType val expectedTypeRef = data.expectedType
val completionResult = callCompleter.completeCall(whenExpression, expectedTypeRef) val completionResult = callCompleter.completeCall(whenExpression, expectedTypeRef)
whenExpression = completionResult.result whenExpression = completionResult.result
completionResult.callCompleted
} }
} }
whenExpression = whenExpression.transformSingle(whenExhaustivenessTransformer, null) whenExpression = whenExpression.transformSingle(whenExhaustivenessTransformer, null)
dataFlowAnalyzer.exitWhenExpression(whenExpression, callCompleted) dataFlowAnalyzer.exitWhenExpression(whenExpression)
whenExpression = whenExpression.replaceReturnTypeIfNotExhaustive() whenExpression = whenExpression.replaceReturnTypeIfNotExhaustive()
whenExpression.compose() whenExpression.compose()
} }
@@ -218,21 +216,15 @@ class FirControlFlowStatementsResolveTransformer(transformer: FirBodyResolveTran
dataFlowAnalyzer.exitElvisLhs(elvisCall) dataFlowAnalyzer.exitElvisLhs(elvisCall)
elvisCall.transformRhs(transformer, ResolutionMode.ContextDependent) elvisCall.transformRhs(transformer, ResolutionMode.ContextDependent)
var callCompleted = false
val result = syntheticCallGenerator.generateCalleeForElvisCall(elvisCall)?.let { val result = syntheticCallGenerator.generateCalleeForElvisCall(elvisCall)?.let {
val completionResult = callCompleter.completeCall(elvisCall, data.expectedType) callCompleter.completeCall(it, data.expectedType).result
callCompleted = completionResult.callCompleted } ?: elvisCall.also {
completionResult.result it.resultType = buildErrorTypeRef {
} ?: run {
elvisCall.resultType = buildErrorTypeRef {
diagnostic = ConeSimpleDiagnostic("Can't resolve ?: operator call", DiagnosticKind.InferenceError) diagnostic = ConeSimpleDiagnostic("Can't resolve ?: operator call", DiagnosticKind.InferenceError)
} }
callCompleted = true
elvisCall
} }
dataFlowAnalyzer.exitElvis(callCompleted) dataFlowAnalyzer.exitElvis()
return result.compose() return result.compose()
} }
} }