Limit "always null" scope: only for !!, is and dot; senseless comparison rolled back; "smart constant" information for nulls #KT-10029 Fixed

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.kt

@@ -7,7 +7,7 @@ fun foo() {
     val x: Int? = null
     val a = Array<Int>(3, {0})
 
-    if (x != null) bar(a[<!DEBUG_INFO_SMARTCAST!>x<!>]) else bar(a[<!ALWAYS_NULL, TYPE_MISMATCH!>x<!>])
+    if (x != null) bar(a[<!DEBUG_INFO_SMARTCAST!>x<!>]) else bar(a[<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>x<!>])
     bar(a[if (x == null) 0 else <!DEBUG_INFO_SMARTCAST!>x<!>])
     bar(a[<!TYPE_MISMATCH!>x<!>])
     

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.kt

@@ -5,6 +5,6 @@ fun foo() {
     val x: Int? = null
 
     bar(1 + (if (x == null) 0 else x))
-    bar(if (x == null) <!ALWAYS_NULL, TYPE_MISMATCH!>x<!> else x)
+    bar(if (x == null) <!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>x<!> else x)
     if (x != null) bar(x + x/(x-x*x))
 }

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.kt

@@ -16,15 +16,15 @@ fun foo() {
         }
         if (<!SENSELESS_COMPARISON!>x == null<!>) bar(x) else bar(x)
         bar(bar(x))
-    } else if (<!ALWAYS_NULL!>x<!> == null) {
-        bar(<!ALWAYS_NULL, TYPE_MISMATCH!>x<!>)
-        if (<!ALWAYS_NULL!>x<!> != null) {
+    } else if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>x<!> == null<!>) {
+        bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>x<!>)
+        if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>x<!> != null<!>) {
             bar(x)
             if (<!SENSELESS_COMPARISON!>x == null<!>) bar(x)
             if (<!SENSELESS_COMPARISON!>x == null<!>) bar(x) else bar(x)
             bar(bar(x) + bar(x))
-        } else if (<!ALWAYS_NULL!>x<!> == null) {
-            bar(<!ALWAYS_NULL, TYPE_MISMATCH!>x<!>)
+        } else if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>x<!> == null<!>) {
+            bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>x<!>)
         }
     }
 

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.kt

@@ -12,5 +12,5 @@ fun foo() {
     do {
         bar(<!TYPE_MISMATCH!>y<!>)
     } while (y != null)
-    bar(<!ALWAYS_NULL, TYPE_MISMATCH!>y<!>)
+    bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>y<!>)
 }

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.kt

@@ -6,7 +6,7 @@ fun foo() {
     bar(if (x == null) 0 else <!DEBUG_INFO_SMARTCAST!>x<!>)
 
     if (x == null) {
-        bar(<!ALWAYS_NULL, TYPE_MISMATCH!>x<!>)
+        bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>x<!>)
         return
     } else {
         bar(<!DEBUG_INFO_SMARTCAST!>x<!>)

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.kt

@@ -5,6 +5,6 @@ fun foo() {
 
     val <!UNUSED_VARIABLE!>a<!> = object {
         fun baz() = bar(if (x == null) 0 else <!DEBUG_INFO_SMARTCAST!>x<!>)
-        fun quux(): Int = if (x == null) <!ALWAYS_NULL, TYPE_MISMATCH!>x<!> else <!DEBUG_INFO_SMARTCAST!>x<!>
+        fun quux(): Int = if (x == null) <!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>x<!> else <!DEBUG_INFO_SMARTCAST!>x<!>
     }
 }

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.kt

@@ -8,10 +8,10 @@ fun foo(): Int {
     if (x != null) return x
     
     val y: Int? = null
-    if (y == null) return if (<!ALWAYS_NULL!>y<!> != null) y else <!ALWAYS_NULL, TYPE_MISMATCH!>y<!>
+    if (y == null) return if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>y<!> != null<!>) y else <!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>y<!>
     
     val z: Int? = null
     if (z != null) return if (<!SENSELESS_COMPARISON!>z == null<!>) z else z
     
-    return <!ALWAYS_NULL, TYPE_MISMATCH!>z<!>
+    return <!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>z<!>
 }

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.kt

@@ -16,6 +16,6 @@ class Derived : Base() {
 
         val y: Int? = null
         if (y != null) super.bar(this.baz(<!DEBUG_INFO_SMARTCAST!>y<!>))
-        else this.baz(super.bar(<!ALWAYS_NULL, TYPE_MISMATCH!>y<!>))
+        else this.baz(super.bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>y<!>))
     }
 }

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.kt

@@ -3,7 +3,7 @@ fun bar(x: Int): RuntimeException = RuntimeException(x.toString())
 fun foo() {
     val x: Int? = null
 
-    if (x == null) throw bar(<!ALWAYS_NULL, TYPE_MISMATCH!>x<!>)
+    if (x == null) throw bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>x<!>)
     throw bar(<!DEBUG_INFO_SMARTCAST!>x<!>)
     <!UNREACHABLE_CODE!>throw bar(<!DEBUG_INFO_SMARTCAST!>x<!>)<!>
 }

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.kt

@@ -3,7 +3,7 @@ fun bar(x: Int): Int = x + 1
 fun foo() {
     val x: Int? = null
     while (x == null) {
-        bar(<!ALWAYS_NULL, TYPE_MISMATCH!>x<!>)
+        bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>x<!>)
     }
     bar(<!DEBUG_INFO_SMARTCAST!>x<!>)
     
@@ -11,11 +11,11 @@ fun foo() {
     while (y != null) {
         bar(<!DEBUG_INFO_SMARTCAST!>y<!>)
     }
-    bar(<!ALWAYS_NULL, TYPE_MISMATCH!>y<!>)
+    bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>y<!>)
     
     val z: Int? = null
     while (z == null) {
-        bar(<!ALWAYS_NULL, TYPE_MISMATCH!>z<!>)
+        bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>z<!>)
         break
     }
     bar(<!TYPE_MISMATCH!>z<!>)