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

Fix codegen problem with safe-call on suspension point with two receivers

Browse Source 
#KT-16145 Fixed
This commit is contained in:
Denis Zharkov
2017-02-03 16:42:19 +03:00
parent a10c6f00f9
commit cc7f0e2d83
9 changed files with 249 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceivers.kt
Vendored
+48
View File
@@ -0,0 +1,48 @@
// WITH_RUNTIME
// WITH_COROUTINES
import kotlin.coroutines.experimental.*
import kotlin.coroutines.experimental.intrinsics.*
import kotlin.test.assertEquals
class A(val w: String) {
suspend fun String.ext(): String = suspendCoroutineOrReturn {
x ->
x.resume(this + w)
COROUTINE_SUSPENDED
}
}
suspend fun A.coroutinebug(v: String?): String {
val r = v?.ext()
if (r == null) return "null"
return r
}
suspend fun A.coroutinebug2(v: String?): String {
val r = v?.ext() ?: "null"
return r
}
fun builder(c: suspend () -> Unit) {
c.startCoroutine(EmptyContinuation)
}
fun box(): String {
var result = "fail 2"
builder {
val a = A("K")
val x1 = a.coroutinebug(null)
if (x1 != "null") throw RuntimeException("fail 1: $x1")
val x2 = a.coroutinebug(null)
if (x2 != "null") throw RuntimeException("fail 2: $x2")
val x3 = a.coroutinebug2(null)
if (x3 != "null") throw RuntimeException("fail 3: $x3")
result = a.coroutinebug2("O")
}
return result
}
compiler/testData/codegen/box/coroutines/featureIntersection/safeCallOnTwoReceiversLong.kt
Vendored
+51
View File
@@ -0,0 +1,51 @@
// WITH_RUNTIME
// WITH_COROUTINES
import kotlin.coroutines.experimental.*
import kotlin.coroutines.experimental.intrinsics.*
import kotlin.test.assertEquals
class A(val w: String) {
suspend fun Long.ext(): String = suspendCoroutineOrReturn {
x ->
x.resume(this.toString() + w)
COROUTINE_SUSPENDED
}
}
suspend fun A.coroutinebug(v: Long?): String {
val r = v?.ext()
if (r == null) return "null"
return r
}
suspend fun A.coroutinebug2(v: Long?): String {
val r = v?.ext() ?: "null"
return r
}
fun builder(c: suspend () -> Unit) {
c.startCoroutine(EmptyContinuation)
}
fun box(): String {
var result = "fail 2"
builder {
val a = A("#test")
val x1 = a.coroutinebug(null)
if (x1 != "null") throw RuntimeException("fail 1: $x1")
val x2 = a.coroutinebug(123456789012345)
if (x2 != "123456789012345#test") throw RuntimeException("fail 2: $x2")
val x3 = a.coroutinebug2(null)
if (x3 != "null") throw RuntimeException("fail 3: $x3")
val x4 = a.coroutinebug2(123456789012345)
if (x4 != "123456789012345#test") throw RuntimeException("fail 4: $x4")
result = "OK"
}
return result
}
compiler/testData/codegen/light-analysis/coroutines/featureIntersection/safeCallOnTwoReceivers.txt
Vendored
+40
View File
@@ -0,0 +1,40 @@
@kotlin.Metadata
public final class A {
private final @org.jetbrains.annotations.NotNull field w: java.lang.String
public method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
public final @org.jetbrains.annotations.Nullable method ext(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object
public final @org.jetbrains.annotations.NotNull method getW(): java.lang.String
}
@kotlin.Metadata
public final class CoroutineUtilKt {
public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation
public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation
}
@kotlin.Metadata
public class EmptyContinuation {
public final static field Companion: EmptyContinuation.Companion
private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext
inner class EmptyContinuation/Companion
public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method <init>(): void
public method <init>(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void
public synthetic method <init>(p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void
public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext
public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
}
@kotlin.Metadata
public final static class EmptyContinuation/Companion {
inner class EmptyContinuation/Companion
private method <init>(): void
}
@kotlin.Metadata
public final class SafeCallOnTwoReceiversKt {
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.Nullable method coroutinebug(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.Nullable p1: java.lang.String, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.experimental.Continuation): java.lang.Object
public final static @org.jetbrains.annotations.Nullable method coroutinebug2(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.Nullable p1: java.lang.String, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.experimental.Continuation): java.lang.Object
}
compiler/testData/codegen/light-analysis/coroutines/featureIntersection/safeCallOnTwoReceiversLong.txt
Vendored
+40
View File
@@ -0,0 +1,40 @@
@kotlin.Metadata
public final class A {
private final @org.jetbrains.annotations.NotNull field w: java.lang.String
public method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
public final @org.jetbrains.annotations.Nullable method ext(p0: long, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object
public final @org.jetbrains.annotations.NotNull method getW(): java.lang.String
}
@kotlin.Metadata
public final class CoroutineUtilKt {
public final static @org.jetbrains.annotations.NotNull method handleExceptionContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation
public final static @org.jetbrains.annotations.NotNull method handleResultContinuation(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function1): kotlin.coroutines.experimental.Continuation
}
@kotlin.Metadata
public class EmptyContinuation {
public final static field Companion: EmptyContinuation.Companion
private final @org.jetbrains.annotations.NotNull field context: kotlin.coroutines.experimental.CoroutineContext
inner class EmptyContinuation/Companion
public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method <init>(): void
public method <init>(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext): void
public synthetic method <init>(p0: kotlin.coroutines.experimental.CoroutineContext, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void
public @org.jetbrains.annotations.NotNull method getContext(): kotlin.coroutines.experimental.CoroutineContext
public method resume(@org.jetbrains.annotations.Nullable p0: java.lang.Object): void
public method resumeWithException(@org.jetbrains.annotations.NotNull p0: java.lang.Throwable): void
}
@kotlin.Metadata
public final static class EmptyContinuation/Companion {
inner class EmptyContinuation/Companion
private method <init>(): void
}
@kotlin.Metadata
public final class SafeCallOnTwoReceiversLongKt {
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.Nullable method coroutinebug(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.Nullable p1: java.lang.Long, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.experimental.Continuation): java.lang.Object
public final static @org.jetbrains.annotations.Nullable method coroutinebug2(@org.jetbrains.annotations.NotNull p0: A, @org.jetbrains.annotations.Nullable p1: java.lang.Long, @org.jetbrains.annotations.NotNull p2: kotlin.coroutines.experimental.Continuation): java.lang.Object
}