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

Do not generate state-machines for suspend lambdas, which capture any

Browse Source 
crossinline lambda, not only suspend.
 #KT-29912 Fixed
This commit is contained in:
Ilmir Usmanov
2019-02-18 19:57:15 +03:00
parent 931e1aa213
commit 6e120b2173
13 changed files with 262 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/coroutines/tailCallOptimizations/epam.kt
Vendored
+34
View File
@@ -0,0 +1,34 @@
// IGNORE_BACKEND: JVM_IR
// FULL_JDK
// COMMON_COROUTINES_TEST
// WITH_RUNTIME
// WITH_COROUTINES
// CHECK_BYTECODE_LISTING
import helpers.*
import COROUTINES_PACKAGE.*
class MyDeferred<T>(val t: suspend () -> T) {
suspend fun await() = t()
}
fun <T> async(block: suspend () -> T) = MyDeferred(block)
inline fun <T1, T2, R> zip(source1: MyDeferred<T1>, source2: MyDeferred<T2>, crossinline zipper: (T1, T2) -> R) =
async {
zipper(source1.await(), source2.await())
}
fun builder(c: suspend () -> Unit) {
c.startCoroutine(EmptyContinuation)
}
fun box(): String {
val first = MyDeferred { 1 }
val second = MyDeferred { 2 }
var result = -1
builder {
result = zip(first, second) { firstValue: Int, secondValue: Int -> firstValue + secondValue }.await()
}
return if (result == 3) "OK" else "FAIL $result"
}
compiler/testData/codegen/box/coroutines/tailCallOptimizations/epam.txt
Vendored
+82
View File
@@ -0,0 +1,82 @@
@kotlin.Metadata
public final class EpamKt$box$1$invokeSuspend$$inlined$zip$1 {
synthetic final field $source1: MyDeferred
synthetic final field $source2: MyDeferred
field L$0: java.lang.Object
field label: int
inner class EpamKt$box$1$invokeSuspend$$inlined$zip$1
public method <init>(p0: MyDeferred, p1: MyDeferred, p2: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
public final method invoke(p0: java.lang.Object): java.lang.Object
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
}
@kotlin.coroutines.jvm.internal.DebugMetadata
@kotlin.Metadata
final class EpamKt$box$1 {
synthetic final field $first: MyDeferred
synthetic final field $result: kotlin.jvm.internal.Ref$IntRef
synthetic final field $second: MyDeferred
field L$0: java.lang.Object
field label: int
inner class EpamKt$box$1
method <init>(p0: kotlin.jvm.internal.Ref$IntRef, p1: MyDeferred, p2: MyDeferred, p3: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
public final method invoke(p0: java.lang.Object): java.lang.Object
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
}
@kotlin.coroutines.jvm.internal.DebugMetadata
@kotlin.Metadata
final class EpamKt$box$first$1 {
field label: int
inner class EpamKt$box$first$1
method <init>(p0: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
public final method invoke(p0: java.lang.Object): java.lang.Object
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
}
@kotlin.coroutines.jvm.internal.DebugMetadata
@kotlin.Metadata
final class EpamKt$box$second$1 {
field label: int
inner class EpamKt$box$second$1
method <init>(p0: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
public final method invoke(p0: java.lang.Object): java.lang.Object
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
public final class EpamKt$zip$1 {
synthetic final field $source1: MyDeferred
synthetic final field $source2: MyDeferred
synthetic final field $zipper: kotlin.jvm.functions.Function2
field label: int
inner class EpamKt$zip$1
public method <init>(p0: kotlin.jvm.functions.Function2, p1: MyDeferred, p2: MyDeferred, p3: kotlin.coroutines.Continuation): void
public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
public final method invoke(p0: java.lang.Object): java.lang.Object
public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
public final class EpamKt {
inner class EpamKt$box$1
inner class EpamKt$box$first$1
inner class EpamKt$box$second$1
inner class EpamKt$zip$1
public final static @org.jetbrains.annotations.NotNull method async(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): MyDeferred
public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
public final static @org.jetbrains.annotations.NotNull method zip(@org.jetbrains.annotations.NotNull p0: MyDeferred, @org.jetbrains.annotations.NotNull p1: MyDeferred, @org.jetbrains.annotations.NotNull p2: kotlin.jvm.functions.Function2): MyDeferred
}
@kotlin.Metadata
public final class MyDeferred {
private final @org.jetbrains.annotations.NotNull field t: kotlin.jvm.functions.Function1
public method <init>(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
public final @org.jetbrains.annotations.Nullable method await(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
public final @org.jetbrains.annotations.NotNull method getT(): kotlin.jvm.functions.Function1
}
compiler/testData/codegen/box/coroutines/tailCallOptimizations/epam_1_2.txt
Vendored
+74
View File
@@ -0,0 +1,74 @@
@kotlin.Metadata
public final class EpamKt$box$1$doResume$$inlined$zip$1 {
synthetic final field $source1: MyDeferred
synthetic final field $source2: MyDeferred
field L$0: java.lang.Object
inner class EpamKt$box$1$doResume$$inlined$zip$1
public method <init>(p0: MyDeferred, p1: MyDeferred, p2: kotlin.coroutines.experimental.Continuation): void
public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation
public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object
public final method invoke(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
final class EpamKt$box$1 {
synthetic final field $first: MyDeferred
synthetic final field $result: kotlin.jvm.internal.Ref$IntRef
synthetic final field $second: MyDeferred
field L$0: java.lang.Object
inner class EpamKt$box$1
method <init>(p0: kotlin.jvm.internal.Ref$IntRef, p1: MyDeferred, p2: MyDeferred, p3: kotlin.coroutines.experimental.Continuation): void
public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation
public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object
public final method invoke(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
final class EpamKt$box$first$1 {
inner class EpamKt$box$first$1
method <init>(p0: kotlin.coroutines.experimental.Continuation): void
public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation
public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object
public final method invoke(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
final class EpamKt$box$second$1 {
inner class EpamKt$box$second$1
method <init>(p0: kotlin.coroutines.experimental.Continuation): void
public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation
public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object
public final method invoke(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
public final class EpamKt$zip$1 {
synthetic final field $source1: MyDeferred
synthetic final field $source2: MyDeferred
synthetic final field $zipper: kotlin.jvm.functions.Function2
inner class EpamKt$zip$1
public method <init>(p0: kotlin.jvm.functions.Function2, p1: MyDeferred, p2: MyDeferred, p3: kotlin.coroutines.experimental.Continuation): void
public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation
public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object
public final method invoke(p0: java.lang.Object): java.lang.Object
}
@kotlin.Metadata
public final class EpamKt {
inner class EpamKt$box$1
inner class EpamKt$box$first$1
inner class EpamKt$box$second$1
inner class EpamKt$zip$1
public final static @org.jetbrains.annotations.NotNull method async(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): MyDeferred
public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
public final static method builder(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
public final static @org.jetbrains.annotations.NotNull method zip(@org.jetbrains.annotations.NotNull p0: MyDeferred, @org.jetbrains.annotations.NotNull p1: MyDeferred, @org.jetbrains.annotations.NotNull p2: kotlin.jvm.functions.Function2): MyDeferred
}
@kotlin.Metadata
public final class MyDeferred {
private final @org.jetbrains.annotations.NotNull field t: kotlin.jvm.functions.Function1
public method <init>(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): void
public final @org.jetbrains.annotations.Nullable method await(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object
public final @org.jetbrains.annotations.NotNull method getT(): kotlin.jvm.functions.Function1
}