JVM_IR: fix primitive comparison optimizations

1. the `primitive == object?.something` fusion should not apply to
    `primitive.equals(object?.something)` because it can't;

 2. coercions to Int are there for a reason - don't remove them;

 3. better optimize `primitive == object?.something` -- the result
    should be subject to if-null fusion, so it needs to have a specific
    pattern that resembles safe calls.

 #KT-47597 Fixed
This commit is contained in:
pyos
2021-07-05 12:38:34 +02:00
committed by TeamCityServer
parent 7e70c93cbf
commit c3a91efea3
15 changed files with 229 additions and 115 deletions
@@ -1,10 +1,25 @@
// FILE: J.java
import org.jetbrains.annotations.NotNull;
public interface J {
@NotNull
public Integer foo();
}
// FILE: test.kt
fun Long.id() = this
fun Short.id() = this
fun String.drop2() = if (length >= 2) subSequence(2, length) else null
fun doSimple1(s: String?) = s?.length == 3
fun doLongReceiver1(x: Long) = x?.id() == 3L
fun doJava1(s: String?, j: J) = s?.length == j.foo()
fun doLongReceiver1(x: Long?) = x?.id() == 3L
fun doShortReceiver1(x: Short?, y: Short) = x?.id() == y
fun doChain1(s: String?) = s?.drop2()?.length == 1
@@ -13,11 +28,16 @@ fun doIf1(s: String?) =
fun doSimple2(s: String?) = 3 == s?.length
fun doLongReceiver2(x: Long) = 3L == x?.id()
fun doJava2(s: String?, j: J) = j.foo() == s?.length
fun doLongReceiver2(x: Long?) = 3L == x?.id()
fun doShortReceiver2(x: Short?, y: Short) = y == x?.id()
fun doChain2(s: String?) = 1 == s?.drop2()?.length
fun doIf2(s: String?) =
if (1 == s?.length) "A" else "B"
// 0 valueOf
// `doJava1`/`doJava2` box `s?.length` instead of unboxing `j.foo()`:
// 2 valueOf
@@ -1,5 +1,4 @@
// !LANGUAGE: +ProperIeee754Comparisons
// IGNORE_BACKEND_FIR: JVM_IR
fun equals3(a: Byte?, b: Byte?) = a != null && b != null && a == b
fun equals4(a: Byte?, b: Byte?) = if (a is Byte && b is Byte) a == b else null!!
@@ -21,10 +20,9 @@ fun less5(a: Any?, b: Any?) = if (a is Byte && b is Byte) a < b else true
// 3 IF_ICMPGE
// JVM_IR_TEMPLATES
// 2 Intrinsics\.areEqual
// 0 Intrinsics\.areEqual
// 0 Intrinsics\.compare
// 4 INVOKEVIRTUAL java/lang/Byte\.byteValue \(\)B
// 8 INVOKEVIRTUAL java/lang/Byte\.byteValue \(\)B
// 4 INVOKEVIRTUAL java/lang/Number\.byteValue \(\)B
// 0 IFGE
// 3 IF_ICMPGE
@@ -1,6 +1,4 @@
// !LANGUAGE: -ProperIeee754Comparisons
// IGNORE_BACKEND_FIR: JVM_IR
fun equals3(a: Byte?, b: Byte?) = a != null && b != null && a == b
fun equals4(a: Byte?, b: Byte?) = if (a is Byte && b is Byte) a == b else null!!
@@ -21,9 +19,9 @@ fun less5(a: Any?, b: Any?) = if (a is Byte && b is Byte) a < b else true
// 0 IF_ICMPGE
// JVM_IR_TEMPLATES
// 2 Intrinsics\.areEqual
// 0 Intrinsics\.areEqual
// 0 Intrinsics\.compare
// 4 INVOKEVIRTUAL java/lang/Byte\.byteValue \(\)B
// 8 INVOKEVIRTUAL java/lang/Byte\.byteValue \(\)B
// 4 INVOKEVIRTUAL java/lang/Number\.byteValue \(\)B
// 0 IFGE
// 3 IF_ICMPGE
// 3 IF_ICMPGE