Take into account data flow info changes for special call (if/when/elvis/!!) arguments #KT-10824 Fixed

Smart casts on complex expressions look as no more possible

compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java

@@ -187,7 +187,7 @@ public class ControlStructureTypingUtils {
 
             @Override
             public void updateInfo(@NotNull ValueArgument valueArgument, @NotNull DataFlowInfo dataFlowInfo) {
-                //todo
+                dataFlowInfoForArgumentsMap.put(valueArgument, dataFlowInfo);
             }
 
             @NotNull

compiler/testData/codegen/box/smartCasts/smartCastInsideIf.kt

@@ -0,0 +1,15 @@
+class A(val s: String = "FAIL")
+
+private fun foo(a: A?, aOther: A?): A {
+    return if (a == null) {
+        A()
+    }
+    else {
+        if (aOther == null) {
+            return A()
+        }
+        aOther
+    }
+}
+
+fun box() = foo(A("???"), A("OK")).s

compiler/testData/diagnostics/tests/regressions/kt10824.kt

@@ -0,0 +1,52 @@
+// See KT-10824: Smart cast depending on control flow does not work inside `if`
+class A
+fun foo(a: A?, aOther: A?): A {
+    return if (a == null) {
+        A()
+    }
+    else {
+        var newA = aOther
+        if (newA == null) {
+            newA = A()
+        }
+        <!DEBUG_INFO_SMARTCAST!>newA<!>
+    }
+}
+fun bar(a: A?, aOther: A?): A {
+    return if (a == null) {
+        A()
+    }
+    else {
+        if (aOther == null) {
+            return A()
+        }
+
+        <!DEBUG_INFO_SMARTCAST!>aOther<!>
+    }
+}
+fun foo1(a: A?, aOther: A?): A {
+    val result = if (a == null) {
+        A()
+    }
+    else {
+        var newA = aOther
+        if (newA == null) {
+            newA = A()
+        }
+        <!DEBUG_INFO_SMARTCAST!>newA<!>
+    }
+    return result
+}
+fun bar1(a: A?, aOther: A?): A {
+    val result = if (a == null) {
+        A()
+    }
+    else {
+        if (aOther == null) {
+            return A()
+        }
+
+        <!DEBUG_INFO_SMARTCAST!>aOther<!>
+    }
+    return result
+}

compiler/testData/diagnostics/tests/regressions/kt10824.txt

@@ -0,0 +1,13 @@
+package
+
+public fun bar(/*0*/ a: A?, /*1*/ aOther: A?): A
+public fun bar1(/*0*/ a: A?, /*1*/ aOther: A?): A
+public fun foo(/*0*/ a: A?, /*1*/ aOther: A?): A
+public fun foo1(/*0*/ a: A?, /*1*/ aOther: A?): A
+
+public final class A {
+    public constructor A()
+    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
+}

compiler/testData/diagnostics/tests/smartCasts/elvisExprNotNull.kt

@@ -15,10 +15,10 @@ fun bar(s: Any?): String {
     else {
         val u: Any? = null
         if (u !is String) return ""
-        u
+        <!DEBUG_INFO_SMARTCAST!>u<!>
     }) ?: "xyz"
     // Ideally we should have smart cast to String here
-    return <!TYPE_MISMATCH!>t<!>
+    return t
 }
 
 fun baz(s: String?, r: String?): String {

compiler/testData/diagnostics/tests/smartCasts/ifCascadeExprNotNull.kt

@@ -5,10 +5,10 @@ fun baz(s: String?): String {
     else if (s == "") {
         val u: String? = null
         if (u == null) return ""
-        u
+        <!DEBUG_INFO_SMARTCAST!>u<!>
     }
     else {
-        s
+        <!DEBUG_INFO_SMARTCAST!>s<!>
     }
-    return <!DEBUG_INFO_SMARTCAST!>t<!>
+    return t
 }

compiler/testData/diagnostics/tests/smartCasts/ifExprInConditionNonNull.kt

@@ -1,11 +1,11 @@
 fun baz(s: String?, b: Boolean?): String {
     val t = if (if (b == null) return "" else <!DEBUG_INFO_SMARTCAST!>b<!>) {
         if (s == null) return ""
-        s
+        <!DEBUG_INFO_SMARTCAST!>s<!>
     }
     else {
         if (s != null) return <!DEBUG_INFO_SMARTCAST!>s<!>
         ""
     }
-    return <!DEBUG_INFO_SMARTCAST!>t<!>
+    return t
 }

compiler/testData/diagnostics/tests/smartCasts/ifExprInWhenSubjectNonNull.kt

@@ -1,11 +1,11 @@
 fun baz(s: String?, u: String?): String {
     val t = when(if (u == null) return "" else <!DEBUG_INFO_SMARTCAST!>u<!>) {
-        "abc" -> u
+        "abc" -> <!DEBUG_INFO_SMARTCAST!>u<!>
         "" -> {
             if (s == null) return ""
-            s
+            <!DEBUG_INFO_SMARTCAST!>s<!>
         }
-        else -> u
+        else -> <!DEBUG_INFO_SMARTCAST!>u<!>
     }
-    return <!DEBUG_INFO_SMARTCAST!>t<!>
+    return t
 }

compiler/testData/diagnostics/tests/smartCasts/ifExprNonNull.kt

@@ -7,9 +7,9 @@ fun baz(s: String?): String {
         val u: String? = null
         if (u == null) return ""
         // !! is detected as unnecessary here
-        u
+        <!DEBUG_INFO_SMARTCAST!>u<!>
     }
-    return <!DEBUG_INFO_SMARTCAST!>t<!>
+    return t
 }
 
 fun foo(s: String?): String {

compiler/testData/diagnostics/tests/smartCasts/shortIfExprNotNull.kt

@@ -1,9 +1,9 @@
 fun baz(s: String?): String {
-    val t = if (s != null) s
+    val t = if (s != null) <!DEBUG_INFO_SMARTCAST!>s<!>
     else {
         val u: String? = null
         if (u == null) return ""
-        u
+        <!DEBUG_INFO_SMARTCAST!>u<!>
     }
-    return <!DEBUG_INFO_SMARTCAST!>t<!>
+    return t
 }

compiler/testData/diagnostics/tests/smartCasts/smartCastOnIf.kt

@@ -1,10 +1,10 @@
 fun baz(s: String?): Int {
-    return <!DEBUG_INFO_SMARTCAST!>if (s == null) {
+    return if (s == null) {
         ""
     }
     else {
         val u: String? = null
         if (u == null) return 0
-        u
-    }<!>.length
+        <!DEBUG_INFO_SMARTCAST!>u<!>
+    }.length
 }

compiler/testData/diagnostics/tests/smartCasts/whenIfExprNonNull.kt

@@ -2,12 +2,12 @@ fun baz(s: String?, u: String?): String {
     val t = when(s) {
         is String -> {
             if (u == null) return <!DEBUG_INFO_SMARTCAST!>s<!>
-            u
+            <!DEBUG_INFO_SMARTCAST!>u<!>
         }
         else -> {
             if (u == null) return ""
-            u
+            <!DEBUG_INFO_SMARTCAST!>u<!>
         }
     }
-    return <!DEBUG_INFO_SMARTCAST!>t<!>
+    return t
 }

compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java

@@ -13374,6 +13374,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("kt10824.kt")
+            public void testKt10824() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt10824.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("kt127.kt")
             public void testKt127() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt127.kt");

compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java

@@ -7363,6 +7363,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("smartCastInsideIf.kt")
+        public void testSmartCastInsideIf() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/smartCasts/smartCastInsideIf.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("whenSmartCast.kt")
         public void testWhenSmartCast() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/smartCasts/whenSmartCast.kt");

idea/testData/checker/infos/SmartCastOnIf.kt

@@ -1,10 +1,10 @@
 fun baz(s: String?): Int {
-    return <info descr="Smart cast to kotlin.String">if</info> (s == null) {
+    return if (s == null) {
         ""
     }
     else {
         val u: String? = null
         if (u == null) return 0
-        u
+        <info descr="Smart cast to kotlin.String">u</info>
     }.length
 }