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

[JVM_IR] Extend when to switch translation to deal with nested ors.

Browse Source 
FIR translates:

```
when (x) {
  1, 2, 3 -> action
  else -> other_action
}
```

to an IR structure with nested ors:

```
if ((x == 1 || x == 2) || (x == 3)) action
else other_action
```

This change allows that to turn into switch instructions in the
JVM backend.
This commit is contained in:
Mads Ager
2021-02-12 12:45:48 +01:00
committed by Alexander Udalov
parent 91581d6c1a
commit 05ff2b1292
18 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/bytecodeText/when/switchOptimizationDuplicates.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
fun foo(x: Int): Int {
return when (x) {
1, 1, 2 -> 1001
compiler/testData/codegen/bytecodeText/whenEnumOptimization/bigEnum.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
import kotlin.test.assertEquals
enum class BigEnum {
compiler/testData/codegen/bytecodeText/whenEnumOptimization/duplicatingItems.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
import kotlin.test.assertEquals
enum class Season {
compiler/testData/codegen/bytecodeText/whenEnumOptimization/expression.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
import kotlin.test.assertEquals
enum class Season {
compiler/testData/codegen/bytecodeText/whenEnumOptimization/manyWhensWithinClass.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
package abc.foo
enum class Season {
compiler/testData/codegen/bytecodeText/whenEnumOptimization/nullability.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
enum class Season {
WINTER,
SPRING,
compiler/testData/codegen/bytecodeText/whenEnumOptimization/whenOr.kt
Vendored
+11
View File
@@ -0,0 +1,11 @@
// IGNORE_BACKEND: JVM
fun test(x: Int): String {
when {
x == 1 || x == 3 || x == 5 -> "135"
x == 2 || x == 4 || x == 6 -> "246"
else -> "other"
}
}
// 1 TABLESWITCH
compiler/testData/codegen/bytecodeText/whenEnumOptimization/withoutElse.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
import kotlin.test.assertEquals
enum class Season {
compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItems.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
import kotlin.test.assertEquals
fun foo(x : String) : String {
compiler/testData/codegen/bytecodeText/whenStringOptimization/expression.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
fun foo(x : String) : String {
return when (x) {
"abc", "cde" -> "abc_cde"
compiler/testData/codegen/bytecodeText/whenStringOptimization/inlineStringConstInsideWhen.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
const val y = "cde"
fun foo(x : String) : String {
compiler/testData/codegen/bytecodeText/whenStringOptimization/nullability.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
fun foo1(x : String?) : String {
when (x) {
"abc", "cde" -> return "abc_cde"
compiler/testData/codegen/bytecodeText/whenStringOptimization/sameHashCode.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
fun foo(x : String) : String {
assert("abz]".hashCode() == "aby|".hashCode())
compiler/testData/codegen/bytecodeText/whenStringOptimization/statement.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
fun foo1(x : String) : String {
when (x) {
"abc", "cde" -> return "abc_cde"