JVM IR: Avoid direct lambda invokes in inline tests

compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInline2.kt

@@ -4,7 +4,7 @@
 package test
 
 inline fun bar(crossinline y: () -> String) = {
-    { { call(y) }() }()
+    { { call(y) }.let { it() } }.let { it() }
 }
 
 public inline fun <T> call(f: () -> T): T = f()

compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInline3.kt

@@ -4,10 +4,10 @@
 package test
 
 inline fun bar(crossinline y: () -> String) = {
-    { { call(y) }() }()
+    { { call(y) }.let { it() } }.let { it() }
 }
 
-public inline fun <T> call(crossinline f: () -> T): T = {{ f() }()}()
+public inline fun <T> call(crossinline f: () -> T): T = {{ f() }.let { it() }}.let { it() }
 
 // FILE: 2.kt
 
@@ -20,5 +20,5 @@ fun box(): String {
 }
 
 inline fun bar2(crossinline y: () -> String) = {
-    { { call(y) }() }()
+    { { call(y) }.let { it() } }.let { it() }
 }

compiler/testData/codegen/boxInline/anonymousObject/constructorVisibilityInConstLambda.kt

@@ -6,7 +6,7 @@ internal class A {
     inline fun doSomething(): String  {
         return {
             "OK"
-        }()
+        }.let { it() }
     }
 }
 

compiler/testData/codegen/boxInline/anonymousObject/constructorVisibilityInLambda.kt

@@ -6,7 +6,7 @@ internal class A {
     inline fun doSomething(s: String): String  {
         return {
             s
-        }()
+        }.let { it() }
     }
 }
 

compiler/testData/codegen/boxInline/anonymousObject/kt13133.kt

@@ -5,11 +5,13 @@
 package test
 
 inline fun inf(crossinline cif: Any.() -> String): () -> String {
-    return {
+    // Approximate the types manually to avoid running into KT-30696
+    val factory: () -> () -> String = {
         object : () -> String {
             override fun invoke() = cif()
         }
-    }()
+    }
+    return factory()
 }
 // FILE: 2.kt
 

compiler/testData/codegen/boxInline/anonymousObject/kt13182.kt

@@ -4,7 +4,7 @@ package test
 
 inline fun test(cond: Boolean, crossinline cif: () -> String): String {
     return if (cond) {
-        { cif() }()
+        { cif() }.let { it() }
     }
     else {
         cif()
@@ -19,6 +19,6 @@ fun box(): String {
     return test(true) {
         {
             s
-        }()
+        }.let { it() }
     }
 }

compiler/testData/codegen/boxInline/anonymousObject/kt14011.kt

@@ -3,7 +3,7 @@ package test
 
 inline fun inline1(crossinline action: () -> Unit) {
     action();
-    { action() }()
+    { action() }.let { it() }
 }
 
 inline fun inline2(crossinline action: () -> Unit) = { action() }

compiler/testData/codegen/boxInline/anonymousObject/kt14011_3.kt

@@ -17,7 +17,7 @@ import test.*
 var result = "fail"
 fun box(): String {
     inline1 {
-        inline2 { { result ="OK" }() }()
+        inline2 { { result ="OK" }.let { it() } }()
     }
 
     return result

compiler/testData/codegen/boxInline/anonymousObject/kt19399.kt

@@ -26,7 +26,7 @@ class Foo {
                 ifNotBusyPerform {
                     ifNotBusySayHello()
                 }
-            }()
+            }.let { it() }
         }
     }
 }

compiler/testData/codegen/boxInline/anonymousObject/kt42815.kt

@@ -10,7 +10,7 @@ import test.*
 class C {
     val x: String
     init {
-        val y = myRun { { "OK" }() }
+        val y = myRun { { "OK" }.let { it() } }
         x = y
     }
 

compiler/testData/codegen/boxInline/anonymousObject/kt42815_delegated.kt

@@ -19,7 +19,7 @@ import test.*
 class C {
     val x: String
     init {
-        val y by myRun { { "OK" }() }
+        val y by myRun { { "OK" }.let { it() } }
         x = y
     }
 

compiler/testData/codegen/boxInline/anonymousObject/kt9877.kt

@@ -27,7 +27,7 @@ fun box(): String {
             {
                 locusMap = value
                 gene = "OK"
-            }()
+            }.let { it() }
         }
     }
     return gene

compiler/testData/codegen/boxInline/anonymousObject/kt9877_2.kt

@@ -20,7 +20,7 @@ fun box(): String {
             {
                 value
                 gene = "OK"
-            }()
+            }.let { it() }
         }
     }
 

compiler/testData/codegen/boxInline/anonymousObject/properRecapturing/inlineChain.kt

@@ -15,7 +15,7 @@ inline fun testNested(crossinline f: (String) -> Unit) {
 }
 
 inline fun test(crossinline f: (String) -> Unit) {
-    testNested { it ->  { f(it) }()}
+    testNested { it ->  { f(it) }.let { it() } }
 }
 
 // FILE: 2.kt

compiler/testData/codegen/boxInline/anonymousObject/properRecapturing/lambdaChain.kt

@@ -20,10 +20,10 @@ fun box(): String {
                 {
                     {
                         result = param + c + a
-                    }()
-                }()
+                    }.let { it() }
+                }.let { it() }
             }
-        }()
+        }.let { it() }
     }
 
     return if (result == "start12") "OK" else "fail: $result"

compiler/testData/codegen/boxInline/anonymousObject/properRecapturing/lambdaChainSimple.kt

@@ -5,7 +5,7 @@ package test
 inline fun <T> inlineFun(arg: T, crossinline f: (T) -> Unit) {
     {
         f(arg)
-    }()
+    }.let { it() }
 }
 
 // FILE: 2.kt
@@ -19,7 +19,7 @@ fun box(): String {
     inlineFun("2") { a ->
         {
             result = param + a
-        }()
+        }.let { it() }
     }
 
 

compiler/testData/codegen/boxInline/anonymousObject/properRecapturing/lambdaChain_2.kt

@@ -5,7 +5,7 @@ package test
 inline fun <T> inlineFun(arg: T, crossinline f: (T) -> Unit) {
     {
         f(arg)
-    }()
+    }.let { it() }
 }
 
 // FILE: 2.kt
@@ -21,10 +21,10 @@ fun box(): String {
                 {
                     {
                         result = param + c + a
-                    }()
-                }()
+                    }.let { it() }
+                }.let { it() }
             }
-        }()
+        }.let { it() }
     }
 
     return if (result == "start12") "OK" else "fail: $result"

compiler/testData/codegen/boxInline/anonymousObject/properRecapturing/lambdaChain_3.kt

@@ -5,7 +5,7 @@ package test
 inline fun <T> inlineFun(arg: T, crossinline f: (T) -> Unit) {
     {
         f(arg)
-    }()
+    }.let { it() }
 }
 
 // FILE: 2.kt
@@ -20,9 +20,9 @@ fun box(): String {
             inlineFun("2") { a ->
                 {
                     result = param + c + a
-                }()
+                }.let { it() }
             }
-        }()
+        }.let { it() }
     }
 
     return if (result == "start12") "OK" else "fail: $result"

compiler/testData/codegen/boxInline/anonymousObject/properRecapturing/noInlineLambda.kt

@@ -15,7 +15,7 @@ inline fun testNested(crossinline f: (String) -> Unit) {
 }
 
 fun test(f: (String) -> Unit) {
-    testNested { it ->  { f(it) }()}
+    testNested { it ->  { f(it) }.let { it() } }
 }
 
 // FILE: 2.kt

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/inlineChain.kt

@@ -17,7 +17,7 @@ class B(val o: String, val k: String) {
     }
 
     inline fun test(crossinline f: (String) -> Unit) {
-        testNested { it -> { f(it + k) }() }
+        testNested { it -> { f(it + k) }.let { it() } }
     }
 
 

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/inlinelambdaChain.kt

@@ -11,7 +11,7 @@ class A {
     inline fun inlineFun(arg: String, crossinline f: (String) -> Unit) {
         {
             f(arg + addParam)
-        }()
+        }.let { it() }
     }
 
     fun box(): String {
@@ -21,12 +21,12 @@ class A {
                     {
                         {
                             result = param + c + a
-                        }()
-                    }()
+                        }.let { it() }
+                    }.let { it() }
                 }
 
             }
-        }()
+        }.let { it() }
 
         return if (result == "start1_additional_2_additional_") "OK" else "fail: $result"
     }

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/lambdaChain.kt

@@ -19,10 +19,10 @@ class A {
                     {
                         {
                             result = param + c + a
-                        }()
-                    }()
+                        }.let { it() }
+                    }.let { it() }
                 }
-            }()
+            }.let { it() }
         }
 
         return if (result == "start1_additional_2_additional_") "OK" else "fail: $result"

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/lambdaChainSimple.kt

@@ -11,7 +11,7 @@ class A {
     inline fun inlineFun(arg: String, crossinline f: (String) -> Unit) {
         {
             f(arg + addParam)
-        }()
+        }.let { it() }
     }
 
 
@@ -19,7 +19,7 @@ class A {
         inlineFun("2") { a ->
             {
                 result = param + a
-            }()
+            }.let { it() }
         }
         return if (result == "start2_additional_") "OK" else "fail: $result"
     }

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/lambdaChainSimple_2.kt

@@ -11,7 +11,7 @@ class A {
     inline fun inlineFun(arg: String, crossinline f: (String) -> Unit) {
         {
             f(arg + addParam)
-        }()
+        }.let { it() }
     }
 
 
@@ -20,9 +20,9 @@ class A {
             inlineFun("2") { a ->
                 {
                     result = param + a
-                }()
+                }.let { it() }
             }
-        }()
+        }.let { it() }
         return if (result == "start2_additional_") "OK" else "fail: $result"
     }
 

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/lambdaChain_2.kt

@@ -11,7 +11,7 @@ class A {
     inline fun inlineFun(arg: String, crossinline f: (String) -> Unit) {
         {
             f(arg + addParam)
-        }()
+        }.let { it() }
     }
 
     fun box(): String {
@@ -21,10 +21,10 @@ class A {
                     {
                         {
                             result = param + c + a
-                        }()
-                    }()
+                        }.let { it() }
+                    }.let { it() }
                 }
-            }()
+            }.let { it() }
         }
 
         return if (result == "start1_additional_2_additional_") "OK" else "fail: $result"

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/lambdaChain_3.kt

@@ -11,7 +11,7 @@ class A {
     inline fun inlineFun(arg: String, crossinline f: (String) -> Unit) {
         {
             f(arg + addParam)
-        }()
+        }.let { it() }
     }
 
     fun box(): String {
@@ -20,9 +20,9 @@ class A {
                 inlineFun("2") { a ->
                     {
                         result = param + c + a
-                    }()
+                    }.let { it() }
                 }
-            }()
+            }.let { it() }
         }
 
         return if (result == "start1_additional_2_additional_") "OK" else "fail: $result"

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/noCapturedThisOnCallSite.kt

@@ -17,7 +17,7 @@ class B(val o: String, val k: String) {
     }
 
     inline fun test(crossinline f: (String) -> Unit) {
-        testNested { it -> { f(it + "K") }() }
+        testNested { it -> { f(it + "K") }.let { it() } }
     }
 
 }

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/noInlineLambda.kt

@@ -18,7 +18,7 @@ class B(val o: String, val k: String) {
     }
 
     fun test(f: (String) -> Unit) {
-        testNested { it -> { f(it + k) }() }
+        testNested { it -> { f(it + k) }.let { it() } }
     }
 
 

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/twoInlineLambdaComplex.kt

@@ -20,8 +20,8 @@ class B(val o: String, val k: String) {
     inline fun test(crossinline f: (String) -> Unit) {
         call {
             {
-                testNested ({ it -> { f(it + o) }() }) { it -> { f(it + k) }() }
-            }()
+                testNested ({ it -> { f(it + o) }.let { it() } }) { it -> { f(it + k) }.let { it() } }
+            }.let { it() }
         }
     }
 

compiler/testData/codegen/boxInline/anonymousObject/properRecapturingInClass/twoInlineLambdaComplex_2.kt

@@ -21,8 +21,8 @@ class B(val o: String, val k: String) {
         call {
             f("start");
             {
-                testNested ({ it -> { f(it + o) }() }) { it -> { f(it + k) }() }
-            }()
+                testNested ({ it -> { f(it + o) }.let { it() } }) { it -> { f(it + k) }.let { it() } }
+            }.let { it() }
         }
     }
 

compiler/testData/codegen/boxInline/anonymousObject/safeCall.kt

@@ -7,7 +7,7 @@ class W(val value: Any)
 inline fun W.safe(crossinline body : Any.() -> Unit) {
     {
         this.value?.body()
-    }()
+    }.let { it() }
 }
 
 // FILE: 2.kt

compiler/testData/codegen/boxInline/anonymousObject/safeCall_2.kt

@@ -7,7 +7,7 @@ class W(val value: Any)
 inline fun W.safe(crossinline body : Any.() -> Unit) {
     {
         this.value?.body()
-    }()
+    }.let { it() }
 }
 
 // FILE: 2.kt
@@ -19,7 +19,7 @@ fun box(): String {
     W("OK").safe {
         {
             result = this as String
-        }()
+        }.let { it() }
     }
 
     return result

compiler/testData/codegen/boxInline/anonymousObject/sam/kt17091.kt

@@ -6,7 +6,7 @@ package test
 
 inline fun foo(value: String, crossinline s: () -> String): String {
     val x = { value }
-    return java.util.concurrent.Callable(x).call() + { s() }()
+    return java.util.concurrent.Callable(x).call() + { s() }.let { it() }
 }
 
 

compiler/testData/codegen/boxInline/anonymousObject/sam/kt21671_3.kt

@@ -6,7 +6,7 @@ package test
 import java.util.concurrent.Executors
 
 inline fun doWork(noinline job: ()-> Unit) {
-    { Executors.callable(job).call() } ()
+    { Executors.callable(job).call() }.let { it() }
     Executors.callable(job).call()
 }
 

compiler/testData/codegen/boxInline/anonymousObject/sam/kt22304.kt

@@ -10,7 +10,7 @@ fun test(): String  = ""
 
 inline fun String.switchMapOnce(crossinline mapper: (String) -> String): String {
     Callable(::test)
-    return { mapper(this) }()
+    return { mapper(this) }.let { it() }
 }
 // FILE: 2.kt
 

compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668.kt

@@ -18,7 +18,7 @@ class A {
     inline fun test(crossinline l: () -> String): String {
         return {
             l() + callK()
-        }()
+        }.let { it() }
     }
 }
 

compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_nested.kt

@@ -5,7 +5,7 @@ class C(val x: String) {
     fun f(y: String) = C(y).g { x }
 
     inline fun g(crossinline h: () -> String) =
-        { { h() + x }() }()
+        { { h() + x }.let { it() } }.let { it() }
 }
 
 // FILE: 2.kt

compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_nested_2.kt

@@ -5,7 +5,7 @@ class C(val x: String) {
     inline fun f(crossinline h: () -> String) = C("").g { x + h() }
 
     inline fun g(crossinline h: () -> String) =
-        { { h() + x }() }()
+        { { h() + x }.let { it() } }.let { it() }
 }
 
 // FILE: 2.kt