Refine smart cast check for type parameters

compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.kt

@@ -0,0 +1,49 @@
+// !DIAGNOSTICS: -UNUSED_EXPRESSION,-UNUSED_VARIABLE,-UNUSED_PARAMETER,-ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE,-UNUSED_VALUE
+
+fun <T : CharSequence> bar1(x: T) {}
+fun bar2(x: CharSequence) {}
+fun bar3(x: String) {}
+
+fun <T : CharSequence?> foo(x: T) {
+    var y1: CharSequence = ""
+    var y2: String = ""
+    if (x != null) {
+        if (<!SENSELESS_COMPARISON!>x != null<!>) {}
+
+        y1 = <!DEBUG_INFO_SMARTCAST!>x<!>
+        y2 = <!TYPE_MISMATCH!>x<!>
+
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>bar1<!>(x)
+        bar2(<!DEBUG_INFO_SMARTCAST!>x<!>)
+        bar3(<!TYPE_MISMATCH!>x<!>)
+    }
+
+    if (x is String) {
+        y1 = <!DEBUG_INFO_SMARTCAST!>x<!>
+        y2 = <!DEBUG_INFO_SMARTCAST!>x<!>
+
+        bar1(<!DEBUG_INFO_SMARTCAST!>x<!>)
+        bar2(<!DEBUG_INFO_SMARTCAST!>x<!>)
+        bar3(<!DEBUG_INFO_SMARTCAST!>x<!>)
+    }
+
+    if (x is CharSequence) {
+        y1 = <!DEBUG_INFO_SMARTCAST!>x<!>
+        y2 = <!TYPE_MISMATCH!>x<!>
+
+        bar1(<!DEBUG_INFO_SMARTCAST!>x<!>)
+        bar2(<!DEBUG_INFO_SMARTCAST!>x<!>)
+        bar3(<!TYPE_MISMATCH!>x<!>)
+    }
+
+    if (1 == 1) {
+        val y = x!!
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>bar1<!>(x)
+        bar2(<!DEBUG_INFO_SMARTCAST!>x<!>)
+        bar3(<!TYPE_MISMATCH!>x<!>)
+
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>bar1<!>(y)
+        bar2(<!DEBUG_INFO_SMARTCAST!>y<!>)
+        bar3(<!TYPE_MISMATCH!>y<!>)
+    }
+}

compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.txt

@@ -0,0 +1,6 @@
+package
+
+internal fun </*0*/ T : kotlin.CharSequence> bar1(/*0*/ x: T): kotlin.Unit
+internal fun bar2(/*0*/ x: kotlin.CharSequence): kotlin.Unit
+internal fun bar3(/*0*/ x: kotlin.String): kotlin.Unit
+internal fun </*0*/ T : kotlin.CharSequence?> foo(/*0*/ x: T): kotlin.Unit

compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.kt

@@ -28,9 +28,8 @@ class A<T : CharSequence?, E1 : T, E2: T?> {
 
         t = <!TYPE_MISMATCH!>y<!>
 
-        // Could be smart-cast
         if (y != null) {
-            t = <!TYPE_MISMATCH!>y<!>
+            t = <!DEBUG_INFO_SMARTCAST!>y<!>
         }
 
         if (tN != null) {