Correcting rewrite type info after compete call.

#KT-10934 Fixed
#KT-10896 Fixed

compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.kt

@@ -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
+}