JVM optimize out temporary variables in bytecode

compiler/testData/codegen/bytecodeText/boxingOptimization/safeCallToPrimitiveEquality1.kt

@@ -1,12 +1,3 @@
-// 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
@@ -15,29 +6,20 @@ fun String.drop2() = if (length >= 2) subSequence(2, length) else null
 
 fun doSimple1(s: String?) = s?.length == 3
 
-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
-
 fun doIf1(s: String?) =
         if (s?.length == 1) "A" else "B"
 
 fun doSimple2(s: String?) = 3 == s?.length
 
-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"
 
-// `doJava1`/`doJava2` box `s?.length` instead of unboxing `j.foo()`:
-// 2 valueOf
+// 0 valueOf

compiler/testData/codegen/bytecodeText/boxingOptimization/safeCallToPrimitiveEquality2.kt

@@ -0,0 +1,7 @@
+fun String.drop2() = if (length >= 2) subSequence(2, length) else null
+
+fun doChain1(s: String?) = s?.drop2()?.length == 1
+
+fun doChain2(s: String?) = 1 == s?.drop2()?.length
+
+// 0 valueOf

compiler/testData/codegen/bytecodeText/boxingOptimization/safeCallToPrimitiveEquality3.kt

@@ -0,0 +1,16 @@
+// FILE: J.java
+import org.jetbrains.annotations.NotNull;
+
+public interface J {
+    @NotNull
+    public Integer foo();
+}
+
+// FILE: safeCallToPrimitiveEquality3.kt
+
+fun doJava1(s: String?, j: J) = s?.length == j.foo()
+
+fun doJava2(s: String?, j: J) = j.foo() == s?.length
+
+// `doJava1`/`doJava2` box `s?.length` instead of unboxing `j.foo()`:
+// 2 valueOf

compiler/testData/codegen/bytecodeText/coercionToUnitOptimization/safeCallWithReturnValue.kt

@@ -13,5 +13,5 @@ fun test(x: A?) {
 // 0 ACONST_NULL
 
 // JVM_IR_TEMPLATES
-// 1 POP
+// 2 POP
 // 0 ACONST_NULL

compiler/testData/codegen/bytecodeText/coercionToUnitOptimization/safeLet.kt

@@ -24,4 +24,4 @@ fun test(ss: List<String?>) {
 // 2 POP
 
 // JVM_IR_TEMPLATES
-// 1 POP
+// 2 POP

compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt

@@ -14,12 +14,12 @@ fun main(args: Array<String>) {
 @BuilderInference
 suspend fun SequenceScope<Int>.awaitSeq(): Int = 42
 
-// 1 LINENUMBER 9 L18
-
 // JVM_IR_TEMPLATES
+// 1 LINENUMBER 8 L13
 // 1 LOCALVARIABLE a I L[0-9]+ L4
 
 // JVM_TEMPLATES
+// 1 LINENUMBER 9 L18
 // 1 LOCALVARIABLE a I L[0-9]+ L18
 
 // IGNORE_BACKEND_FIR: JVM_IR

compiler/testData/codegen/bytecodeText/forLoop/loopVarInterval.kt

@@ -12,6 +12,6 @@ fun f() {
 // 1 LOCALVARIABLE c C L3 L\d+ 0
 
 // JVM_IR_TEMPLATES
-// 1 ISTORE 2\s+L4
+// 1 ISTORE 2\s+L3
 // 1 ILOAD 2\s+INVOKEVIRTUAL java/io/PrintStream.print \(C\)V
-// 1 LOCALVARIABLE c C L4 L\d+ 2
+// 1 LOCALVARIABLE c C L3 L\d+ 2

compiler/testData/codegen/bytecodeText/ifNullChain/safeCallChain1.kt

@@ -0,0 +1,8 @@
+class A(val b: B)
+class B(val c: C)
+class C(val s: String)
+
+fun test(an: A?) = an?.b?.c?.s
+
+// JVM_IR_TEMPLATES
+// 0 ASTORE

compiler/testData/codegen/bytecodeText/ifNullChain/safeCallChain2.kt

@@ -0,0 +1,8 @@
+class A(val bn: B?)
+class B(val cn: C?)
+class C(val s: String)
+
+fun test(an: A?) = an?.bn?.cn?.s
+
+// JVM_IR_TEMPLATES
+// 0 ASTORE

compiler/testData/codegen/bytecodeText/ifNullChain/safeCallChainMemberExt1.kt

@@ -0,0 +1,14 @@
+class A
+class B
+class C
+
+object Host {
+    val A.b: B get() = B()
+    val B.c: C get() = C()
+    val C.s: String get() = "s"
+
+    fun test(an: A?) = an?.b?.c?.s
+}
+
+// JVM_IR_TEMPLATES
+// 0 ASTORE

compiler/testData/codegen/bytecodeText/ifNullChain/safeCallChainMemberExt2.kt

@@ -0,0 +1,18 @@
+import Host.b
+import Host.c
+import Host.s
+
+class A
+class B
+class C
+
+object Host {
+    val A.b: B get() = B()
+    val B.c: C get() = C()
+    val C.s: String get() = "s"
+}
+
+fun test(an: A?) = an?.b?.c?.s
+
+// JVM_IR_TEMPLATES
+// 0 ASTORE