Correcting rewrite type info after compete call.

#KT-10934 Fixed #KT-10896 Fixed
2016-02-08 16:41:39 +03:00
parent 74b2c8cd31
commit 434bd0707d
7 changed files with 191 additions and 4 deletions
@@ -0,0 +1,54 @@
+// !CHECK_TYPE
+// See also KT-10896: Wrong inference of if / else result type
+
+interface Option<T>
+class Some<T> : Option<T>
+class None<T> : Option<T>
+
+fun <T> bind(r: Option<T>): Option<T> {
+    return if (r is Some) {
+        // Ideally we should infer Option<T> here (see KT-10896)
+        (<!TYPE_INFERENCE_FAILED_ON_SPECIAL_CONSTRUCT!>if<!> (true) <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>None()<!> else <!DEBUG_INFO_SMARTCAST!>r<!>) checkType { <!TYPE_MISMATCH!>_<!><Option<T>>() }
+        // Works correctly
+        if (true) None() else r
+    }
+    else r
+}
+
+fun <T> bind2(r: Option<T>): Option<T> {
+    return if (r is Some) {
+        // Works correctly
+        if (true) None<T>() else r
+    }
+    else r
+}
+
+fun <T, R> bind3(r: Option<T>): Option<T> {
+    return if (r is Some) {
+        // Diagnoses an error correctly
+        if (true) <!TYPE_MISMATCH!>None<R>()<!> else r
+    }
+    else r
+}
+
+fun <T> bindWhen(r: Option<T>): Option<T> {
+    return when (r) {
+        is Some -> {
+            // Works correctly
+            if (true) None() else r
+        }
+        else -> r
+    }
+}
+
+interface SimpleOption
+class SimpleSome : SimpleOption
+class SimpleNone : SimpleOption
+
+fun bindNoGeneric(r: SimpleOption): SimpleOption {
+    return if (r is SimpleSome) {
+        (if (true) SimpleNone() else r) checkType { _<SimpleOption>() }
+        if (true) SimpleNone() else r
+    }
+    else r
+}
@@ -0,0 +1,47 @@
+package
+
+public fun </*0*/ T> bind(/*0*/ r: Option<T>): Option<T>
+public fun </*0*/ T> bind2(/*0*/ r: Option<T>): Option<T>
+public fun </*0*/ T, /*1*/ R> bind3(/*0*/ r: Option<T>): Option<T>
+public fun bindNoGeneric(/*0*/ r: SimpleOption): SimpleOption
+public fun </*0*/ T> bindWhen(/*0*/ r: Option<T>): Option<T>
+
+public final class None</*0*/ T> : Option<T> {
+    public constructor None</*0*/ T>()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public interface Option</*0*/ T> {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class SimpleNone : SimpleOption {
+    public constructor SimpleNone()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public interface SimpleOption {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class SimpleSome : SimpleOption {
+    public constructor SimpleSome()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class Some</*0*/ T> : Option<T> {
+    public constructor Some</*0*/ T>()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}