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

Avoid boxing on 'primitive == boxed' when possible

Browse Source 
Similar to 'boxed == primitive' case, different bytecode due to
evaluation order.
This commit is contained in:
Dmitry Petrov
2017-07-14 12:28:05 +03:00
parent e440de3494
commit fa42f202fa
20 changed files with 704 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/primitiveTypes/equalityWithNullable/generated/boxedEqPrimitiveBoolean.kt
Vendored
+14 -8
View File
@@ -28,14 +28,20 @@ fun box(): String {
ax == false -> "Fail 13"
!(ax == true) -> "Fail 14"
!(ax != false) -> "Fail 15"
ax != bx -> "Fail 16"
ax == by -> "Fail 17"
!(ax == bx) -> "Fail 18"
!(ax != by) -> "Fail 19"
an == true -> "Fail 20"
!(an != true) -> "Fail 21"
an == bx -> "Fail 22"
!(an != bx) -> "Fail 23"
ax != x -> "Fail 16"
ax == y -> "Fail 17"
!(ax == x) -> "Fail 18"
!(ax != y) -> "Fail 19"
ax != bx -> "Fail 20"
ax == by -> "Fail 21"
!(ax == bx) -> "Fail 22"
!(ax != by) -> "Fail 23"
an == true -> "Fail 24"
!(an != true) -> "Fail 25"
an == x -> "Fail 26"
!(an != x) -> "Fail 27"
an == bx -> "Fail 28"
!(an != bx) -> "Fail 29"
else -> "OK"
}
}
compiler/testData/codegen/box/primitiveTypes/equalityWithNullable/generated/boxedEqPrimitiveByte.kt
Vendored
+14 -8
View File
@@ -28,14 +28,20 @@ fun box(): String {
ax == 1.toByte() -> "Fail 13"
!(ax == 0.toByte()) -> "Fail 14"
!(ax != 1.toByte()) -> "Fail 15"
ax != bx -> "Fail 16"
ax == by -> "Fail 17"
!(ax == bx) -> "Fail 18"
!(ax != by) -> "Fail 19"
an == 0.toByte() -> "Fail 20"
!(an != 0.toByte()) -> "Fail 21"
an == bx -> "Fail 22"
!(an != bx) -> "Fail 23"
ax != x -> "Fail 16"
ax == y -> "Fail 17"
!(ax == x) -> "Fail 18"
!(ax != y) -> "Fail 19"
ax != bx -> "Fail 20"
ax == by -> "Fail 21"
!(ax == bx) -> "Fail 22"
!(ax != by) -> "Fail 23"
an == 0.toByte() -> "Fail 24"
!(an != 0.toByte()) -> "Fail 25"
an == x -> "Fail 26"
!(an != x) -> "Fail 27"
an == bx -> "Fail 28"
!(an != bx) -> "Fail 29"
else -> "OK"
}
}
compiler/testData/codegen/box/primitiveTypes/equalityWithNullable/generated/boxedEqPrimitiveChar.kt
Vendored
+14 -8
View File
@@ -28,14 +28,20 @@ fun box(): String {
ax == '1' -> "Fail 13"
!(ax == '0') -> "Fail 14"
!(ax != '1') -> "Fail 15"
ax != bx -> "Fail 16"
ax == by -> "Fail 17"
!(ax == bx) -> "Fail 18"
!(ax != by) -> "Fail 19"
an == '0' -> "Fail 20"
!(an != '0') -> "Fail 21"
an == bx -> "Fail 22"
!(an != bx) -> "Fail 23"
ax != x -> "Fail 16"
ax == y -> "Fail 17"
!(ax == x) -> "Fail 18"
!(ax != y) -> "Fail 19"
ax != bx -> "Fail 20"
ax == by -> "Fail 21"
!(ax == bx) -> "Fail 22"
!(ax != by) -> "Fail 23"
an == '0' -> "Fail 24"
!(an != '0') -> "Fail 25"
an == x -> "Fail 26"
!(an != x) -> "Fail 27"
an == bx -> "Fail 28"
!(an != bx) -> "Fail 29"
else -> "OK"
}
}
compiler/testData/codegen/box/primitiveTypes/equalityWithNullable/generated/boxedEqPrimitiveInt.kt
Vendored
+14 -8
View File
@@ -28,14 +28,20 @@ fun box(): String {
ax == 1 -> "Fail 13"
!(ax == 0) -> "Fail 14"
!(ax != 1) -> "Fail 15"
ax != bx -> "Fail 16"
ax == by -> "Fail 17"
!(ax == bx) -> "Fail 18"
!(ax != by) -> "Fail 19"
an == 0 -> "Fail 20"
!(an != 0) -> "Fail 21"
an == bx -> "Fail 22"
!(an != bx) -> "Fail 23"
ax != x -> "Fail 16"
ax == y -> "Fail 17"
!(ax == x) -> "Fail 18"
!(ax != y) -> "Fail 19"
ax != bx -> "Fail 20"
ax == by -> "Fail 21"
!(ax == bx) -> "Fail 22"
!(ax != by) -> "Fail 23"
an == 0 -> "Fail 24"
!(an != 0) -> "Fail 25"
an == x -> "Fail 26"
!(an != x) -> "Fail 27"
an == bx -> "Fail 28"
!(an != bx) -> "Fail 29"
else -> "OK"
}
}
compiler/testData/codegen/box/primitiveTypes/equalityWithNullable/generated/boxedEqPrimitiveLong.kt
Vendored
+14 -8
View File
@@ -28,14 +28,20 @@ fun box(): String {
ax == 1L -> "Fail 13"
!(ax == 0L) -> "Fail 14"
!(ax != 1L) -> "Fail 15"
ax != bx -> "Fail 16"
ax == by -> "Fail 17"
!(ax == bx) -> "Fail 18"
!(ax != by) -> "Fail 19"
an == 0L -> "Fail 20"
!(an != 0L) -> "Fail 21"
an == bx -> "Fail 22"
!(an != bx) -> "Fail 23"
ax != x -> "Fail 16"
ax == y -> "Fail 17"
!(ax == x) -> "Fail 18"
!(ax != y) -> "Fail 19"
ax != bx -> "Fail 20"
ax == by -> "Fail 21"
!(ax == bx) -> "Fail 22"
!(ax != by) -> "Fail 23"
an == 0L -> "Fail 24"
!(an != 0L) -> "Fail 25"
an == x -> "Fail 26"
!(an != x) -> "Fail 27"
an == bx -> "Fail 28"
!(an != bx) -> "Fail 29"
else -> "OK"
}
}
compiler/testData/codegen/box/primitiveTypes/equalityWithNullable/generated/boxedEqPrimitiveShort.kt
Vendored
+14 -8
View File
@@ -28,14 +28,20 @@ fun box(): String {
ax == 1.toShort() -> "Fail 13"
!(ax == 0.toShort()) -> "Fail 14"
!(ax != 1.toShort()) -> "Fail 15"
ax != bx -> "Fail 16"
ax == by -> "Fail 17"
!(ax == bx) -> "Fail 18"
!(ax != by) -> "Fail 19"
an == 0.toShort() -> "Fail 20"
!(an != 0.toShort()) -> "Fail 21"
an == bx -> "Fail 22"
!(an != bx) -> "Fail 23"
ax != x -> "Fail 16"
ax == y -> "Fail 17"
!(ax == x) -> "Fail 18"
!(ax != y) -> "Fail 19"
ax != bx -> "Fail 20"
ax == by -> "Fail 21"
!(ax == bx) -> "Fail 22"
!(ax != by) -> "Fail 23"
an == 0.toShort() -> "Fail 24"
!(an != 0.toShort()) -> "Fail 25"
an == x -> "Fail 26"
!(an != x) -> "Fail 27"
an == bx -> "Fail 28"
!(an != bx) -> "Fail 29"
else -> "OK"
}
}
compiler/testData/codegen/box/primitiveTypes/equalityWithNullable/generated/primitiveEqBoxedBoolean.kt
Vendored
+47
View File
@@ -0,0 +1,47 @@
// Auto-generated by GeneratePrimitiveVsObjectEqualityTestData. Do not edit!
val nx: Boolean? = true
val nn: Boolean? = null
val x: Boolean = true
val y: Boolean = false
fun box(): String {
val ax: Boolean? = true
val an: Boolean? = null
val bx: Boolean = true
val by: Boolean = false
return when {
true != nx -> "Fail 0"
false == nx -> "Fail 1"
!(true == nx) -> "Fail 2"
!(false != nx) -> "Fail 3"
x != nx -> "Fail 4"
y == nx -> "Fail 5"
!(x == nx) -> "Fail 6"
!(y != nx) -> "Fail 7"
true == nn -> "Fail 8"
!(true != nn) -> "Fail 9"
x == nn -> "Fail 10"
!(x != nn) -> "Fail 11"
true != ax -> "Fail 12"
false == ax -> "Fail 13"
!(true == ax) -> "Fail 14"
!(false != ax) -> "Fail 15"
x != ax -> "Fail 16"
y == ax -> "Fail 17"
!(x == ax) -> "Fail 18"
!(y != ax) -> "Fail 19"
bx != ax -> "Fail 20"
by == ax -> "Fail 21"
!(bx == ax) -> "Fail 22"
!(by != ax) -> "Fail 23"
true == an -> "Fail 24"
!(true != an) -> "Fail 25"
x == an -> "Fail 26"
!(x != an) -> "Fail 27"
bx == an -> "Fail 28"
!(bx != an) -> "Fail 29"
else -> "OK"
}
}
compiler/testData/codegen/box/primitiveTypes/equalityWithNullable/generated/primitiveEqBoxedByte.kt
Vendored
+47
View File
@@ -0,0 +1,47 @@
// Auto-generated by GeneratePrimitiveVsObjectEqualityTestData. Do not edit!
val nx: Byte? = 0.toByte()
val nn: Byte? = null
val x: Byte = 0.toByte()
val y: Byte = 1.toByte()
fun box(): String {
val ax: Byte? = 0.toByte()
val an: Byte? = null
val bx: Byte = 0.toByte()
val by: Byte = 1.toByte()
return when {
0.toByte() != nx -> "Fail 0"
1.toByte() == nx -> "Fail 1"
!(0.toByte() == nx) -> "Fail 2"
!(1.toByte() != nx) -> "Fail 3"
x != nx -> "Fail 4"
y == nx -> "Fail 5"
!(x == nx) -> "Fail 6"
!(y != nx) -> "Fail 7"
0.toByte() == nn -> "Fail 8"
!(0.toByte() != nn) -> "Fail 9"
x == nn -> "Fail 10"
!(x != nn) -> "Fail 11"
0.toByte() != ax -> "Fail 12"
1.toByte() == ax -> "Fail 13"
!(0.toByte() == ax) -> "Fail 14"
!(1.toByte() != ax) -> "Fail 15"
x != ax -> "Fail 16"
y == ax -> "Fail 17"
!(x == ax) -> "Fail 18"
!(y != ax) -> "Fail 19"
bx != ax -> "Fail 20"
by == ax -> "Fail 21"
!(bx == ax) -> "Fail 22"
!(by != ax) -> "Fail 23"
0.toByte() == an -> "Fail 24"
!(0.toByte() != an) -> "Fail 25"
x == an -> "Fail 26"
!(x != an) -> "Fail 27"
bx == an -> "Fail 28"
!(bx != an) -> "Fail 29"
else -> "OK"
}
}
compiler/testData/codegen/box/primitiveTypes/equalityWithNullable/generated/primitiveEqBoxedChar.kt
Vendored
+47
View File
@@ -0,0 +1,47 @@
// Auto-generated by GeneratePrimitiveVsObjectEqualityTestData. Do not edit!
val nx: Char? = '0'
val nn: Char? = null
val x: Char = '0'
val y: Char = '1'
fun box(): String {
val ax: Char? = '0'
val an: Char? = null
val bx: Char = '0'
val by: Char = '1'
return when {
'0' != nx -> "Fail 0"
'1' == nx -> "Fail 1"
!('0' == nx) -> "Fail 2"
!('1' != nx) -> "Fail 3"
x != nx -> "Fail 4"
y == nx -> "Fail 5"
!(x == nx) -> "Fail 6"
!(y != nx) -> "Fail 7"
'0' == nn -> "Fail 8"
!('0' != nn) -> "Fail 9"
x == nn -> "Fail 10"
!(x != nn) -> "Fail 11"
'0' != ax -> "Fail 12"
'1' == ax -> "Fail 13"
!('0' == ax) -> "Fail 14"
!('1' != ax) -> "Fail 15"
x != ax -> "Fail 16"
y == ax -> "Fail 17"
!(x == ax) -> "Fail 18"
!(y != ax) -> "Fail 19"
bx != ax -> "Fail 20"
by == ax -> "Fail 21"
!(bx == ax) -> "Fail 22"
!(by != ax) -> "Fail 23"
'0' == an -> "Fail 24"
!('0' != an) -> "Fail 25"
x == an -> "Fail 26"
!(x != an) -> "Fail 27"
bx == an -> "Fail 28"
!(bx != an) -> "Fail 29"
else -> "OK"
}
}
compiler/testData/codegen/box/primitiveTypes/equalityWithNullable/generated/primitiveEqBoxedInt.kt
Vendored
+47
View File
@@ -0,0 +1,47 @@
// Auto-generated by GeneratePrimitiveVsObjectEqualityTestData. Do not edit!
val nx: Int? = 0
val nn: Int? = null
val x: Int = 0
val y: Int = 1
fun box(): String {
val ax: Int? = 0
val an: Int? = null
val bx: Int = 0
val by: Int = 1
return when {
0 != nx -> "Fail 0"
1 == nx -> "Fail 1"
!(0 == nx) -> "Fail 2"
!(1 != nx) -> "Fail 3"
x != nx -> "Fail 4"
y == nx -> "Fail 5"
!(x == nx) -> "Fail 6"
!(y != nx) -> "Fail 7"
0 == nn -> "Fail 8"
!(0 != nn) -> "Fail 9"
x == nn -> "Fail 10"
!(x != nn) -> "Fail 11"
0 != ax -> "Fail 12"
1 == ax -> "Fail 13"
!(0 == ax) -> "Fail 14"
!(1 != ax) -> "Fail 15"
x != ax -> "Fail 16"
y == ax -> "Fail 17"
!(x == ax) -> "Fail 18"
!(y != ax) -> "Fail 19"
bx != ax -> "Fail 20"
by == ax -> "Fail 21"
!(bx == ax) -> "Fail 22"
!(by != ax) -> "Fail 23"
0 == an -> "Fail 24"
!(0 != an) -> "Fail 25"
x == an -> "Fail 26"
!(x != an) -> "Fail 27"
bx == an -> "Fail 28"
!(bx != an) -> "Fail 29"
else -> "OK"
}
}
compiler/testData/codegen/box/primitiveTypes/equalityWithNullable/generated/primitiveEqBoxedLong.kt
Vendored
+47
View File
@@ -0,0 +1,47 @@
// Auto-generated by GeneratePrimitiveVsObjectEqualityTestData. Do not edit!
val nx: Long? = 0L
val nn: Long? = null
val x: Long = 0L
val y: Long = 1L
fun box(): String {
val ax: Long? = 0L
val an: Long? = null
val bx: Long = 0L
val by: Long = 1L
return when {
0L != nx -> "Fail 0"
1L == nx -> "Fail 1"
!(0L == nx) -> "Fail 2"
!(1L != nx) -> "Fail 3"
x != nx -> "Fail 4"
y == nx -> "Fail 5"
!(x == nx) -> "Fail 6"
!(y != nx) -> "Fail 7"
0L == nn -> "Fail 8"
!(0L != nn) -> "Fail 9"
x == nn -> "Fail 10"
!(x != nn) -> "Fail 11"
0L != ax -> "Fail 12"
1L == ax -> "Fail 13"
!(0L == ax) -> "Fail 14"
!(1L != ax) -> "Fail 15"
x != ax -> "Fail 16"
y == ax -> "Fail 17"
!(x == ax) -> "Fail 18"
!(y != ax) -> "Fail 19"
bx != ax -> "Fail 20"
by == ax -> "Fail 21"
!(bx == ax) -> "Fail 22"
!(by != ax) -> "Fail 23"
0L == an -> "Fail 24"
!(0L != an) -> "Fail 25"
x == an -> "Fail 26"
!(x != an) -> "Fail 27"
bx == an -> "Fail 28"
!(bx != an) -> "Fail 29"
else -> "OK"
}
}
compiler/testData/codegen/box/primitiveTypes/equalityWithNullable/generated/primitiveEqBoxedShort.kt
Vendored
+47
View File
@@ -0,0 +1,47 @@
// Auto-generated by GeneratePrimitiveVsObjectEqualityTestData. Do not edit!
val nx: Short? = 0.toShort()
val nn: Short? = null
val x: Short = 0.toShort()
val y: Short = 1.toShort()
fun box(): String {
val ax: Short? = 0.toShort()
val an: Short? = null
val bx: Short = 0.toShort()
val by: Short = 1.toShort()
return when {
0.toShort() != nx -> "Fail 0"
1.toShort() == nx -> "Fail 1"
!(0.toShort() == nx) -> "Fail 2"
!(1.toShort() != nx) -> "Fail 3"
x != nx -> "Fail 4"
y == nx -> "Fail 5"
!(x == nx) -> "Fail 6"
!(y != nx) -> "Fail 7"
0.toShort() == nn -> "Fail 8"
!(0.toShort() != nn) -> "Fail 9"
x == nn -> "Fail 10"
!(x != nn) -> "Fail 11"
0.toShort() != ax -> "Fail 12"
1.toShort() == ax -> "Fail 13"
!(0.toShort() == ax) -> "Fail 14"
!(1.toShort() != ax) -> "Fail 15"
x != ax -> "Fail 16"
y == ax -> "Fail 17"
!(x == ax) -> "Fail 18"
!(y != ax) -> "Fail 19"
bx != ax -> "Fail 20"
by == ax -> "Fail 21"
!(bx == ax) -> "Fail 22"
!(by != ax) -> "Fail 23"
0.toShort() == an -> "Fail 24"
!(0.toShort() != an) -> "Fail 25"
x == an -> "Fail 26"
!(x != an) -> "Fail 27"
bx == an -> "Fail 28"
!(bx != an) -> "Fail 29"
else -> "OK"
}
}