Fix for KT-14597: "When" over smartcasted enum is broken and breaks all other "when"

#KT-14597 Fixed
This commit is contained in:
Mikhael Bogdanov
2017-01-23 16:04:26 +01:00
parent ee9a174c1f
commit df8394bcd2
22 changed files with 443 additions and 8 deletions
@@ -0,0 +1,62 @@
enum class En { A, B, С }
fun main(args: Array<String>) {
}
fun box(): String {
var res1 = "fail"
var res2 = "fail2"
val en: En = En.A
when (en) {
En.A -> {res1 = ""}
En.B -> {}
En.С -> {}
}
when (en as En) {
En.A -> {res1 += "O"}
En.B -> {}
En.С -> {}
}
// nullable variable
val en2: Any? = En.A
if (en2 is En) {
when (en2) {
En.A -> {res1 += "K"}
En.B -> {}
En.С -> {}
}
when (en2 as En) {
En.A -> {res2 = ""}
En.B -> {}
En.С -> {}
}
}
// not nullable variable
val en1: Any = En.A
if (en1 is En) {
when (en1) {
En.A -> {res2 += "O"}
En.B -> {}
En.С -> {}
}
// Working without other examples
when (en1 as En) {
En.A -> {res2 += "K"}
En.B -> {}
En.С -> {}
}
}
if (res1 != res2) return "different results: $res1 != $res2"
return res1
}
// 6 TABLESWITCH
@@ -0,0 +1,27 @@
class EncapsulatedEnum<T : Enum<T>>(val value: T)
enum class MyEnum(val value: String) {
VALUE_A("OK"),
VALUE_B("fail"),
}
private fun crash(encapsulated: EncapsulatedEnum<*>) {
val myEnum = encapsulated.value
if (myEnum !is MyEnum) {
return
}
when (myEnum) {
MyEnum.VALUE_A -> res = myEnum.value
MyEnum.VALUE_B -> res = myEnum.value
}
}
var res = "fail"
fun box(): String {
crash(EncapsulatedEnum(MyEnum.VALUE_A))
return res
}
// 1 LOOKUPSWITCH
@@ -0,0 +1,27 @@
private fun Any?.doTheThing(): String {
when (this) {
is String -> return this
is Level -> {
when (this) {
Level.O -> return Level.O.name
Level.K -> return Level.K.name
}
}
else -> return "fail"
}
}
enum class Level {
O,
K
}
fun box(): String {
return "O".doTheThing() + Level.K.doTheThing()
}
// 1 LOOKUPSWITCH