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

JVM IR: Avoid direct lambda invokes in inline tests

Browse Source
This commit is contained in:
Steven Schäfer
2022-06-13 15:13:04 +02:00
committed by Alexander Udalov
parent f0760e0550
commit 2acfb3a41f
117 changed files with 211 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxInline/smap/anonymous/kt19175.kt
Vendored
+2 -2
View File
@@ -4,8 +4,8 @@
package test
abstract class Introspector {
abstract inner class SchemaRetriever(val transaction: String) {
inline fun inSchema(crossinline modifier: (String) -> Unit) =
{ modifier.invoke(transaction) }()
inline fun inSchema(crossinline modifier: (String) -> Unit)
{ val lambda = { modifier.invoke(transaction) }; lambda() }
}
}
compiler/testData/codegen/boxInline/smap/anonymous/kt19175.smap
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/Introspector$SchemaRetriever$inSchema$1
test/Introspector$SchemaRetriever$inSchema$lambda$1
*L
1#1,12:1
*E
@@ -37,7 +37,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/Introspector$SchemaRetriever$inSchema$1
test/Introspector$SchemaRetriever$inSchema$lambda$1
+ 2 2.kt
IntrospectorImpl$SchemaRetriever
*L
compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt
Vendored
+2 -2
View File
@@ -5,9 +5,9 @@
package builders
inline fun call(crossinline init: () -> Unit) {
return {
val lambda = {
init()
}()
}; lambda()
}
// FILE: 2.kt
compiler/testData/codegen/boxInline/smap/anonymous/lambda.smap
Vendored
+4 -4
View File
@@ -5,7 +5,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
builders/_1Kt$call$1
builders/_1Kt$call$lambda$1
*L
1#1,13:1
*E
@@ -22,13 +22,13 @@ _2Kt
builders/_1Kt
*L
1#1,31:1
8#2:32
8#2,4:32
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
20#1:32
20#1:32,4
*E
SMAP
@@ -37,7 +37,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
builders/_1Kt$call$1
builders/_1Kt$call$lambda$1
+ 2 2.kt
_2Kt
*L
compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.kt
Vendored
+2 -2
View File
@@ -17,9 +17,9 @@ fun test(): String {
var res = "Fail"
call {
{
val lambda ={
res = "OK"
}()
}; lambda()
}
return res
compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.kt
Vendored
+2 -2
View File
@@ -3,8 +3,8 @@
package test
inline fun annotatedWith2(crossinline predicate: () -> Boolean) =
{ any { predicate() } }()
inline fun annotatedWith2(crossinline predicate: () -> Boolean)
{ val lambda = { any { predicate() } }; lambda() }
inline fun annotatedWith(crossinline predicate: () -> Boolean) =
compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.smap
Vendored
+2 -2
View File
@@ -27,7 +27,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$annotatedWith2$1
test/_1Kt$annotatedWith2$lambda$1
+ 2 1.kt
test/_1Kt
+ 3 2.kt
@@ -41,7 +41,7 @@ _2Kt
*S KotlinDebug
*F
+ 1 1.kt
test/_1Kt$annotatedWith2$1
test/_1Kt$annotatedWith2$lambda$1
*L
7#1:20
7#1:23
compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.kt
Vendored
+2 -2
View File
@@ -28,10 +28,10 @@ package test
//A lot of blank lines [Don't delete]
//A lot of blank lines [Don't delete]
inline fun kValue(crossinline s: () -> String) = { s() + "K" }()
inline fun kValue(crossinline s: () -> String): String { val lambda = { s() + "K" }; return lambda() }
inline fun lParams(initParams: () -> String = {
{ "" + kValue { "O" } }()
val lambda = { "" + kValue { "O" } }; lambda()
}): String {
val z = "body"
return initParams()
compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-nonseparate-compilation
Vendored
+5 -5
View File
@@ -16,7 +16,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$lParams$1$1
test/_1Kt$lParams$1$lambda$1
+ 2 1.kt
test/_1Kt
*L
@@ -25,7 +25,7 @@ test/_1Kt
*S KotlinDebug
*F
+ 1 1.kt
test/_1Kt$lParams$1$1
test/_1Kt$lParams$1$lambda$1
*L
34#1:41
*E
@@ -36,9 +36,9 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$1
test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1$1
test/_1Kt$lParams$1$lambda$1
*L
1#1,40:1
34#2:41
@@ -50,7 +50,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$1
test/_1Kt$kValue$lambda$1
*L
1#1,40:1
*E
compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-separate-compilation
Vendored
+9 -9
View File
@@ -16,7 +16,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$lParams$1$1
test/_1Kt$lParams$1$lambda$1
+ 2 1.kt
test/_1Kt
*L
@@ -25,7 +25,7 @@ test/_1Kt
*S KotlinDebug
*F
+ 1 1.kt
test/_1Kt$lParams$1$1
test/_1Kt$lParams$1$lambda$1
*L
34#1:41
*E
@@ -36,9 +36,9 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$1
test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1$1
test/_1Kt$lParams$1$lambda$1
*L
1#1,40:1
34#2:41
@@ -50,7 +50,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$1
test/_1Kt$kValue$lambda$1
*L
1#1,40:1
*E
@@ -86,7 +86,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$lParams$1$1
test/_1Kt$lParams$1$lambda$1
+ 2 1.kt
test/_1Kt
*L
@@ -95,7 +95,7 @@ test/_1Kt
*S KotlinDebug
*F
+ 1 1.kt
test/_1Kt$lParams$1$1
test/_1Kt$lParams$1$lambda$1
*L
34#1:41
*E
@@ -106,9 +106,9 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$1
test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1$1
test/_1Kt$lParams$1$lambda$1
*L
1#1,40:1
34#2:41
compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.kt
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@ package test
//A lot of blank lines [Don't delete]
//A lot of blank lines [Don't delete]
inline fun kValue(crossinline s: () -> String) = { s() + "K" }()
inline fun kValue(crossinline s: () -> String): String { val lambda = { s() + "K" }; return lambda() }
inline fun lParams(initParams: () -> String = {
"" + kValue { "O" }
compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-nonseparate-compilation
Vendored
+2 -2
View File
@@ -25,7 +25,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$1
test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1
*L
@@ -39,7 +39,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$1
test/_1Kt$kValue$lambda$1
*L
1#1,41:1
*E
compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-separate-compilation
Vendored
+3 -3
View File
@@ -25,7 +25,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$1
test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1
*L
@@ -39,7 +39,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$1
test/_1Kt$kValue$lambda$1
*L
1#1,41:1
*E
@@ -77,7 +77,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$1
test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1
*L
compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@ package test
//A lot of blank lines [Don't delete]
//A lot of blank lines [Don't delete]
inline fun kValue(crossinline s: () -> String) = { s() + "K" }()
inline fun kValue(crossinline s: () -> String): String { val lambda = { s() + "K" }; return lambda() }
inline fun lParams(initParams: () -> String = {
"" + kValue { "O" }
compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-nonseparate-compilation
Vendored
+2 -2
View File
@@ -25,7 +25,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$1
test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1
*L
@@ -39,7 +39,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$1
test/_1Kt$kValue$lambda$1
*L
1#1,41:1
*E
compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-separate-compilation
Vendored
+3 -3
View File
@@ -25,7 +25,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$1
test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1
*L
@@ -39,7 +39,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$1
test/_1Kt$kValue$lambda$1
*L
1#1,41:1
*E
@@ -77,7 +77,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$1
test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1
*L
compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt
Vendored
+2 -2
View File
@@ -5,9 +5,9 @@
package test
inline fun inlineFun(capturedParam: String, crossinline lambda: () -> String = { capturedParam }): String {
return {
val lambda2 = {
lambda()
}()
}; return lambda2()
}
// FILE: 2.kt
compiler/testData/codegen/boxInline/smap/defaultLambda/nested.smap
Vendored
+4 -4
View File
@@ -5,7 +5,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$inlineFun$2
test/_1Kt$inlineFun$lambda2$1
*L
1#1,13:1
*E
@@ -33,13 +33,13 @@ _2Kt
test/_1Kt
*L
1#1,20:1
7#2,2:21
7#2,4:21
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
18#1:21,2
18#1:21,4
*E
SMAP
@@ -48,7 +48,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$inlineFun$2
test/_1Kt$inlineFun$lambda2$1
+ 2 1.kt
test/_1Kt$inlineFun$1
*L
compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.kt
Vendored
+2 -2
View File
@@ -8,11 +8,11 @@ inline fun myrun(s: () -> Unit) {
}
inline fun test(crossinline s: () -> Unit) {
{
val lambda = {
val z = 1;
myrun(s)
val x = 1;
}()
}; lambda()
}
// FILE: 2.kt
compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.smap
Vendored
+4 -4
View File
@@ -5,7 +5,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$test$1
test/_1Kt$test$lambda$1
+ 2 1.kt
test/_1Kt
*L
@@ -14,7 +14,7 @@ test/_1Kt
*S KotlinDebug
*F
+ 1 1.kt
test/_1Kt$test$1
test/_1Kt$test$lambda$1
*L
13#1:19,3
*E
@@ -46,7 +46,7 @@ Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$test$1
test/_1Kt$test$lambda$1
+ 2 1.kt
test/_1Kt
+ 3 2.kt
@@ -59,7 +59,7 @@ _2Kt
*S KotlinDebug
*F
+ 1 1.kt
test/_1Kt$test$1
test/_1Kt$test$lambda$1
*L
13#1:19,2
13#1:23