Fix coroutine-related VerifyError

The problem was that we spilled the `origin` variable (see test) as Object, because we determined the type of merge(null, String) incorrectly. #KT-15973 Fixed
2017-01-27 20:36:41 +03:00
parent 0dd3f11175
commit b0ebbe99d6
8 changed files with 116 additions and 5 deletions
@@ -0,0 +1,38 @@
+// WITH_RUNTIME
+// WITH_COROUTINES
+import kotlin.coroutines.experimental.*
+import kotlin.coroutines.experimental.intrinsics.*
+
+fun builder(c: suspend () -> Unit) {
+    c.startCoroutine(EmptyContinuation)
+}
+
+var res = ""
+
+suspend fun foo(y: A?): String {
+    val origin: String? = y?.z
+    if (origin != null) {
+        baz(origin)
+        baz(origin)
+    }
+
+    return res
+}
+
+suspend fun baz(y: String): Unit = suspendCoroutineOrReturn { x ->
+    res += y[res.length]
+    x.resume(Unit)
+    COROUTINE_SUSPENDED
+}
+
+class A(val z: String)
+
+fun box(): String {
+    var result = ""
+
+    builder {
+        result = foo(A("OK"))
+    }
+
+    return result
+}
@@ -0,0 +1,42 @@
+@kotlin.Metadata
+public final class A {
+    private final @org.jetbrains.annotations.NotNull field z: java.lang.String
+    public method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public final @org.jetbrains.annotations.NotNull method getZ(): 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 MergeNullAndStringKt {
+    private static @org.jetbrains.annotations.NotNull field res: java.lang.String
+    public final static @org.jetbrains.annotations.Nullable method baz(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object
+    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 foo(@org.jetbrains.annotations.Nullable p0: A, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object
+    public final static @org.jetbrains.annotations.NotNull method getRes(): java.lang.String
+    public final static method setRes(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+}