Implementation of exhaustive whens in control flow analysis.
Now control flow analyzer knows when is exhaustive. If despite of this all conditions are accidentally false, jump to error is generated. A set of tests (diagnostic, control flow). #KT-5113 Fixed. #KT-6046 Fixed. #KT-1882 Fixed.
This commit is contained in:
@@ -0,0 +1,46 @@
|
||||
== foo ==
|
||||
fun foo(flag: Boolean): Int {
|
||||
when (flag) {
|
||||
true -> return 1
|
||||
false -> return 0
|
||||
}
|
||||
}
|
||||
---------------------
|
||||
L0:
|
||||
1 <START>
|
||||
v(flag: Boolean)
|
||||
magic[FAKE_INITIALIZER](flag: Boolean) -> <v0>
|
||||
w(flag|<v0>)
|
||||
2 mark({ when (flag) { true -> return 1 false -> return 0 } })
|
||||
mark(when (flag) { true -> return 1 false -> return 0 })
|
||||
r(flag) -> <v1>
|
||||
mark(true -> return 1)
|
||||
mark(true)
|
||||
r(true) -> <v2>
|
||||
magic[EQUALS_IN_WHEN_CONDITION](true|<v1>, <v2>) -> <v3>
|
||||
jmp?(L4|<v3>) NEXT:[mark(false -> return 0), r(1) -> <v4>]
|
||||
L3 ['when' entry body]:
|
||||
r(1) -> <v4>
|
||||
ret(*|<v4>) L1 NEXT:[<END>]
|
||||
- jmp(L2) NEXT:[merge(when (flag) { true -> return 1 false -> return 0 }|!<v8>, !<v9>) -> <v10>] PREV:[]
|
||||
L4 [next 'when' entry]:
|
||||
mark(false -> return 0) PREV:[jmp?(L4|<v3>)]
|
||||
mark(false)
|
||||
r(false) -> <v5>
|
||||
magic[EQUALS_IN_WHEN_CONDITION](false|<v1>, <v5>) -> <v6>
|
||||
jmp?(L6|<v6>) NEXT:[jmp(error), r(0) -> <v7>]
|
||||
L5 ['when' entry body]:
|
||||
r(0) -> <v7>
|
||||
ret(*|<v7>) L1 NEXT:[<END>]
|
||||
- jmp(L2) NEXT:[merge(when (flag) { true -> return 1 false -> return 0 }|!<v8>, !<v9>) -> <v10>] PREV:[]
|
||||
L6 [next 'when' entry]:
|
||||
jmp(error) NEXT:[<ERROR>] PREV:[jmp?(L6|<v6>)]
|
||||
L2 [after 'when' expression]:
|
||||
- merge(when (flag) { true -> return 1 false -> return 0 }|!<v8>, !<v9>) -> <v10> PREV:[]
|
||||
L1:
|
||||
1 <END> NEXT:[<SINK>] PREV:[ret(*|<v4>) L1, ret(*|<v7>) L1]
|
||||
error:
|
||||
<ERROR> PREV:[jmp(error)]
|
||||
sink:
|
||||
<SINK> PREV:[<ERROR>, <END>]
|
||||
=====================
|
||||
@@ -0,0 +1,6 @@
|
||||
fun foo(flag: Boolean): Int {
|
||||
when (flag) {
|
||||
true -> return 1
|
||||
false -> return 0
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
== foo ==
|
||||
fun foo(flag: Boolean): Int {
|
||||
when (flag) {
|
||||
true -> return 1
|
||||
false -> return 0
|
||||
}
|
||||
}
|
||||
---------------------
|
||||
<v0>: Boolean NEW: magic[FAKE_INITIALIZER](flag: Boolean) -> <v0>
|
||||
flag <v1>: * NEW: r(flag) -> <v1>
|
||||
true <v2>: * NEW: r(true) -> <v2>
|
||||
true <v3>: * NEW: magic[EQUALS_IN_WHEN_CONDITION](true|<v1>, <v2>) -> <v3>
|
||||
1 <v4>: Int NEW: r(1) -> <v4>
|
||||
return 1 !<v8>: *
|
||||
false <v5>: * NEW: r(false) -> <v5>
|
||||
false <v6>: * NEW: magic[EQUALS_IN_WHEN_CONDITION](false|<v1>, <v5>) -> <v6>
|
||||
0 <v7>: Int NEW: r(0) -> <v7>
|
||||
return 0 !<v9>: *
|
||||
when (flag) { true -> return 1 false -> return 0 } <v10>: * NEW: merge(when (flag) { true -> return 1 false -> return 0 }|!<v8>, !<v9>) -> <v10>
|
||||
{ when (flag) { true -> return 1 false -> return 0 } } <v10>: * COPY
|
||||
=====================
|
||||
Reference in New Issue
Block a user