[FIR] Implement UPPER_BOUND_VIOLATED_IN_TYPEALIAS_EXPANSION diagnostics, fix handling of UPPER_BOUND_VIOLATED

compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.fir.kt

@@ -4,8 +4,8 @@ typealias N<T> = Num<T>
 typealias N2<T> = N<T>
 
 val x1 = Num<<!UPPER_BOUND_VIOLATED!>String<!>>(<!ARGUMENT_TYPE_MISMATCH!>""<!>)
-val x2 = N<String>("")
-val x3 = N2<String>("")
+val x2 = N<<!UPPER_BOUND_VIOLATED!>String<!>>("")
+val x3 = N2<<!UPPER_BOUND_VIOLATED!>String<!>>("")
 
 class TColl<T, C : Collection<T>>
 
@@ -13,5 +13,5 @@ typealias TC<T, C> = TColl<T, C>
 typealias TC2<T, C> = TC<T, C>
 
 val y1 = TColl<Any, <!UPPER_BOUND_VIOLATED!>Any<!>>()
-val y2 = TC<Any, Any>()
-val y3 = TC2<Any, Any>()
+val y2 = TC<Any, <!UPPER_BOUND_VIOLATED!>Any<!>>()
+val y3 = TC2<Any, <!UPPER_BOUND_VIOLATED!>Any<!>>()

compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.fir.kt

@@ -1,16 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-
-class TColl<T, C : Collection<T>>
-
-typealias TC<T1, T2> = TColl<T1, T2>
-typealias TC2<T1, T2> = TC<T1, T2>
-
-fun test1(x: TC2<Number, Collection<Number>>) {}
-fun test2(x: TC2<Number, Collection<Int>>) {}
-fun test3(x: TC2<Number, List<Int>>) {}
-fun test4(x: TC2<Number, List<Any>>) {}
-
-val test5 = TC2<Number, Collection<Number>>()
-val test6 = TC2<Number, Collection<Int>>()
-val test7 = TC2<Number, List<Int>>()
-val test8 = TC2<Number, List<Any>>()

compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 
 class TColl<T, C : Collection<T>>

compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.fir.kt

@@ -10,22 +10,22 @@ typealias MMMM<A3> = NL<A3>
 typealias TC<T1, T2> = TColl<T1, T2>
 
 fun test1(x: NA<Int>) {}
-fun test2(x: NA<Any>) {}
+fun test2(x: <!UPPER_BOUND_VIOLATED_IN_TYPEALIAS_EXPANSION!>NA<Any><!>) {}
 fun test3(x: NL<Int>) {}
-fun test4(x: NL<Any>) {}
+fun test4(x: <!UPPER_BOUND_VIOLATED_IN_TYPEALIAS_EXPANSION!>NL<Any><!>) {}
 
 val test5 = NA<Int>()
-val test6 = NA<Any>()
+val test6 = NA<<!UPPER_BOUND_VIOLATED!>Any<!>>()
 val test7 = NL<Int>()
 val test8 = MMMM<Int>()
-val test9dwd = NL<Any>()
+val test9dwd = NL<<!UPPER_BOUND_VIOLATED!>Any<!>>()
 
 fun test9(x: TC<Number, Collection<Number>>) {}
 fun test10(x: TC<Number, Collection<Int>>) {}
 fun test11(x: TC<Number, List<Int>>) {}
-fun test12(x: TC<Number, List<Any>>) {}
+fun test12(x: <!UPPER_BOUND_VIOLATED_IN_TYPEALIAS_EXPANSION!>TC<Number, List<Any>><!>) {}
 
 val test13 = TC<Number, Collection<Number>>()
 val test14 = TC<Number, Collection<Int>>()
 val test15 = TC<Number, List<Int>>()
-val test16 = TC<Number, List<Any>>()
+val test16 = TC<Number, <!UPPER_BOUND_VIOLATED!>List<Any><!>>()

compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasRHS.fir.kt

@@ -3,18 +3,18 @@
 class TC<T, C : Collection<T>>
 
 typealias TCAlias<T, C> = TC<T, C>
-typealias TCAliasT<T> = TC<T, Any>
+typealias TCAliasT<T> = TC<T, <!UPPER_BOUND_VIOLATED!>Any<!>>
 typealias TCAliasC<C> = TC<Any, C>
-typealias TCAliasT1<T> = TCAlias<T, Any>
+typealias TCAliasT1<T> = <!UPPER_BOUND_VIOLATED_IN_TYPEALIAS_EXPANSION!>TCAlias<T, Any><!>
 typealias TCAliasC1<C> = TCAlias<Any, C>
 
-typealias Test1 = TC<Any, Any>
+typealias Test1 = TC<Any, <!UPPER_BOUND_VIOLATED!>Any<!>>
 typealias Test2 = TC<Any, Collection<Any>>
-typealias Test3 = TCAlias<Any, Any>
+typealias Test3 = <!UPPER_BOUND_VIOLATED_IN_TYPEALIAS_EXPANSION!>TCAlias<Any, Any><!>
 typealias Test4 = TCAlias<Any, Collection<Any>>
-typealias Test5 = TCAliasT<Any>
-typealias Test6 = TCAliasC<Any>
+typealias Test5 = <!UPPER_BOUND_VIOLATED_IN_TYPEALIAS_EXPANSION!>TCAliasT<Any><!>
+typealias Test6 = <!UPPER_BOUND_VIOLATED_IN_TYPEALIAS_EXPANSION!>TCAliasC<Any><!>
 typealias Test7 = TCAliasC<Collection<Any>>
-typealias Test8 = TCAliasT1<Any>
-typealias Test9 = TCAliasC1<Any>
+typealias Test8 = <!UPPER_BOUND_VIOLATED_IN_TYPEALIAS_EXPANSION!>TCAliasT1<Any><!>
+typealias Test9 = <!UPPER_BOUND_VIOLATED_IN_TYPEALIAS_EXPANSION!>TCAliasC1<Any><!>
 typealias Test10 = TCAliasC1<Collection<Any>>

compiler/testData/diagnostics/tests/typealias/kt19601.fir.kt

@@ -8,4 +8,4 @@ interface Num<T : Number>
 
 typealias N<T> = Num<T>
 
-class Test2<T : N<String>>
+class Test2<T : <!UPPER_BOUND_VIOLATED_IN_TYPEALIAS_EXPANSION!>N<String><!>>

compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.fir.kt

@@ -30,7 +30,7 @@ typealias N<T> = Num<T>
 
 val testN0 = N("")
 val testN1 = N<Int>(1)
-val testN1a = N<String>("")
+val testN1a = N<<!UPPER_BOUND_VIOLATED!>String<!>>("")
 val testN2 = <!INAPPLICABLE_CANDIDATE!>N<!><Int, Int>(1)
 
 class MyPair<T1 : CharSequence, T2 : Number>(val string: T1, val number: T2)