K2: repeat K1 representation for flexible type parameters

This commit changes the behavior of KT-59138 effectively declining it in 2.0.
However, we plan to implement KT-59138 behavior under a feature
flag in 2.0 (see KT-66447), and switch this feature on version 2.x.

Also, this commit implements the LC resolution about postponing
KT-57014 change. We don't have KT-57014 described behavior in 2.0 anymore.
However, we plan to implement a deprecation warning here, see KT-65578.

After this commit, 6 diagnostic tests become incorrectly broken:
- 5 tests from PurelyImplementedCollection group
- a test platformTypes/nullableTypeArgument.kt

This commit also breaks currently fixed-in-k2 KT-50134
(it is fixed again in the following commits),
as well as KT-58933 (it will remain not fixed till we enable KT-59138
behavior again).

#KT-65596 In Progress
#KT-57014 In Progress
#KT-58933 Submitted

compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt

@@ -1,4 +1,4 @@
-public abstract class ClassWithTypePExtendsIterableP<P : R|kotlin/Any!|> : R|kotlin/Any|, R|kotlin/collections/MutableIterable<ft<P & Any, P?>>| {
+public abstract class ClassWithTypePExtendsIterableP<P : R|kotlin/Any!|> : R|kotlin/Any|, R|kotlin/collections/MutableIterable<P!>| {
     public constructor<P : R|kotlin/Any!|>(): R|test/ClassWithTypePExtendsIterableP<P>|
 
 }

compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt

@@ -1,4 +1,4 @@
-public final class ClassWithTypePP<P : R|kotlin/Any!|, Q : R|ft<P & Any, P?>|> : R|kotlin/Any| {
-    public constructor<P : R|kotlin/Any!|, Q : R|ft<P & Any, P?>|>(): R|test/ClassWithTypePP<P, Q>|
+public final class ClassWithTypePP<P : R|kotlin/Any!|, Q : R|P!|> : R|kotlin/Any| {
+    public constructor<P : R|kotlin/Any!|, Q : R|P!|>(): R|test/ClassWithTypePP<P, Q>|
 
 }

compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt

@@ -1,4 +1,4 @@
-public open class ClassWithTypePRefNext<R : R|ft<kotlin/collections/MutableIterable<ft<P & Any, P?>>, kotlin/collections/Iterable<ft<P & Any, P?>>?>|, P : R|kotlin/Any!|> : R|kotlin/Any| {
-    public constructor<R : R|ft<kotlin/collections/MutableIterable<ft<P & Any, P?>>, kotlin/collections/Iterable<ft<P & Any, P?>>?>|, P : R|kotlin/Any!|>(): R|test/ClassWithTypePRefNext<R, P>|
+public open class ClassWithTypePRefNext<R : R|ft<kotlin/collections/MutableIterable<P!>, kotlin/collections/Iterable<P!>?>|, P : R|kotlin/Any!|> : R|kotlin/Any| {
+    public constructor<R : R|ft<kotlin/collections/MutableIterable<P!>, kotlin/collections/Iterable<P!>?>|, P : R|kotlin/Any!|>(): R|test/ClassWithTypePRefNext<R, P>|
 
 }

compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt

@@ -1,4 +1,4 @@
-public final class ClassWithTypePRefSelf<P : R|ft<kotlin/Enum<ft<P & Any, P?>>, kotlin/Enum<ft<P & Any, P?>>?>|> : R|kotlin/Any| {
-    public constructor<P : R|ft<kotlin/Enum<ft<P & Any, P?>>, kotlin/Enum<ft<P & Any, P?>>?>|>(): R|test/ClassWithTypePRefSelf<P>|
+public final class ClassWithTypePRefSelf<P : R|ft<kotlin/Enum<P!>, kotlin/Enum<P!>?>|> : R|kotlin/Any| {
+    public constructor<P : R|ft<kotlin/Enum<P!>, kotlin/Enum<P!>?>|>(): R|test/ClassWithTypePRefSelf<P>|
 
 }

compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt

@@ -1,4 +1,4 @@
-public final class ClassWithTypePRefSelfAndClass<P : R|ft<test/ClassWithTypePRefSelfAndClass<ft<P & Any, P?>>, test/ClassWithTypePRefSelfAndClass<ft<P & Any, P?>>?>|> : R|kotlin/Any| {
-    public constructor<P : R|ft<test/ClassWithTypePRefSelfAndClass<ft<P & Any, P?>>, test/ClassWithTypePRefSelfAndClass<ft<P & Any, P?>>?>|>(): R|test/ClassWithTypePRefSelfAndClass<P>|
+public final class ClassWithTypePRefSelfAndClass<P : R|ft<test/ClassWithTypePRefSelfAndClass<P!>, test/ClassWithTypePRefSelfAndClass<P!>?>|> : R|kotlin/Any| {
+    public constructor<P : R|ft<test/ClassWithTypePRefSelfAndClass<P!>, test/ClassWithTypePRefSelfAndClass<P!>?>|>(): R|test/ClassWithTypePRefSelfAndClass<P>|
 
 }

compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt

@@ -4,15 +4,15 @@ public final class InheritMethodsDifferentReturnTypesGeneric : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypesGeneric.Super1<kotlin/String!, kotlin/CharSequence!>|, R|test/InheritMethodsDifferentReturnTypesGeneric.Super2<kotlin/CharSequence!, kotlin/String!>| {
     }
     public abstract interface Super1<F : R|kotlin/Any!|, B : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<F & Any, F?>|
+        public abstract fun foo(): R|F!|
 
-        public abstract fun bar(): R|ft<B & Any, B?>|
+        public abstract fun bar(): R|B!|
 
     }
     public abstract interface Super2<FF : R|kotlin/Any!|, BB : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<FF & Any, FF?>|
+        public abstract fun foo(): R|FF!|
 
-        public abstract fun bar(): R|ft<BB & Any, BB?>|
+        public abstract fun bar(): R|BB!|
 
     }
 }

compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt

@@ -1,8 +1,8 @@
 public open class InnerClassReferencesOuterTP<P : R|kotlin/Any!|> : R|kotlin/Any| {
     public constructor<P : R|kotlin/Any!|>(): R|test/InnerClassReferencesOuterTP<P>|
 
-    public open inner class Inner<Q : R|ft<P & Any, P?>|, Outer(P) : R|kotlin/Any!|> : R|kotlin/Any| {
-        public test/InnerClassReferencesOuterTP<P>.constructor<Q : R|ft<P & Any, P?>|>(): R|test/InnerClassReferencesOuterTP.Inner<Q, P>|
+    public open inner class Inner<Q : R|P!|, Outer(P) : R|kotlin/Any!|> : R|kotlin/Any| {
+        public test/InnerClassReferencesOuterTP<P>.constructor<Q : R|P!|>(): R|test/InnerClassReferencesOuterTP.Inner<Q, P>|
 
     }
 }

compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt

@@ -11,12 +11,12 @@ public open class InnerClassTypeMultipleGeneric : R|kotlin/Any| {
 
         }
     }
-    public open inner class Outer<E1 : R|kotlin/Any!|, E2 : R|kotlin/Any!|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter<kotlin/Int!, ft<E1 & Any, E1?>>| {
-        public open fun bar(): R|ft<test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<java/lang/Class<*>, java/lang/Class<*>?>, kotlin/CharSequence!, kotlin/Int!, ft<E1 & Any, E1?>>, test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<java/lang/Class<*>, java/lang/Class<*>?>, kotlin/CharSequence!, kotlin/Int!, ft<E1 & Any, E1?>>?>|
+    public open inner class Outer<E1 : R|kotlin/Any!|, E2 : R|kotlin/Any!|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter<kotlin/Int!, E1!>| {
+        public open fun bar(): R|ft<test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<java/lang/Class<*>, java/lang/Class<*>?>, kotlin/CharSequence!, kotlin/Int!, E1!>, test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<java/lang/Class<*>, java/lang/Class<*>?>, kotlin/CharSequence!, kotlin/Int!, E1!>?>|
 
         public test/InnerClassTypeMultipleGeneric.constructor<E1 : R|kotlin/Any!|, E2 : R|kotlin/Any!|>(): R|test/InnerClassTypeMultipleGeneric.Outer<E1, E2>|
 
-        public open inner class Inner<E3 : R|kotlin/Any!|, Outer(E1) : R|kotlin/Any!|, Outer(E2) : R|kotlin/Any!|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<kotlin/Double!, kotlin/String!, ft<E2 & Any, E2?>, ft<E3 & Any, E3?>>| {
+        public open inner class Inner<E3 : R|kotlin/Any!|, Outer(E1) : R|kotlin/Any!|, Outer(E2) : R|kotlin/Any!|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<kotlin/Double!, kotlin/String!, E2!, E3!>| {
             public test/InnerClassTypeMultipleGeneric.Outer<E1, E2>.constructor<E3 : R|kotlin/Any!|>(): R|test/InnerClassTypeMultipleGeneric.Outer.Inner<E3, E1, E2>|
 
         }

compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt

@@ -5,8 +5,8 @@ public open class InnerClassesInGeneric<P : R|kotlin/Any!|, Q : R|kotlin/Any!|>
         public test/InnerClassesInGeneric<P, Q>.constructor(): R|test/InnerClassesInGeneric.Inner<P, Q>|
 
     }
-    public open inner class Inner2<Outer(P) : R|kotlin/Any!|, Outer(Q) : R|kotlin/Any!|> : R|test/InnerClassesInGeneric.Inner<ft<P & Any, P?>, ft<Q & Any, Q?>>| {
-        public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<P & Any, P?>>, kotlin/collections/Iterator<ft<P & Any, P?>>?>|
+    public open inner class Inner2<Outer(P) : R|kotlin/Any!|, Outer(Q) : R|kotlin/Any!|> : R|test/InnerClassesInGeneric.Inner<P!, Q!>| {
+        public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<P!>, kotlin/collections/Iterator<P!>?>|
 
         public test/InnerClassesInGeneric<P, Q>.constructor(): R|test/InnerClassesInGeneric.Inner2<P, Q>|
 

compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt

@@ -4,23 +4,23 @@ public open class InnerOfGeneric : R|kotlin/Any| {
     public abstract inner class A<K : R|kotlin/Any!|> : R|kotlin/Any| {
         public test/InnerOfGeneric.constructor<K : R|kotlin/Any!|>(): R|test/InnerOfGeneric.A<K>|
 
-        public abstract inner class Inner<Outer(K) : R|kotlin/Any!|> : R|test/InnerOfGeneric.S<ft<K & Any, K?>>| {
+        public abstract inner class Inner<Outer(K) : R|kotlin/Any!|> : R|test/InnerOfGeneric.S<K!>| {
             public test/InnerOfGeneric.A<K>.constructor(): R|test/InnerOfGeneric.A.Inner<K>|
 
         }
     }
-    public open inner class B<L : R|kotlin/Any!|> : R|test/InnerOfGeneric.A<ft<L & Any, L?>>| {
+    public open inner class B<L : R|kotlin/Any!|> : R|test/InnerOfGeneric.A<L!>| {
         public test/InnerOfGeneric.constructor<L : R|kotlin/Any!|>(): R|test/InnerOfGeneric.B<L>|
 
-        public open inner class SubInner<Outer(L) : R|kotlin/Any!|> : R|test/InnerOfGeneric.A.Inner<ft<L & Any, L?>>| {
-            @R|java/lang/Override|() public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<L & Any, L?>>, kotlin/collections/Iterator<ft<L & Any, L?>>?>|
+        public open inner class SubInner<Outer(L) : R|kotlin/Any!|> : R|test/InnerOfGeneric.A.Inner<L!>| {
+            @R|java/lang/Override|() public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<L!>, kotlin/collections/Iterator<L!>?>|
 
             public test/InnerOfGeneric.B<L>.constructor(): R|test/InnerOfGeneric.B.SubInner<L>|
 
         }
     }
     public open inner class S<E : R|kotlin/Any!|> : R|kotlin/Any| {
-        public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<E & Any, E?>>, kotlin/collections/Iterator<ft<E & Any, E?>>?>|
+        public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<E!>, kotlin/collections/Iterator<E!>?>|
 
         public test/InnerOfGeneric.constructor<E : R|kotlin/Any!|>(): R|test/InnerOfGeneric.S<E>|
 

compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt

@@ -2,7 +2,7 @@ public final class MethodReferencesOuterClassTP<P : R|kotlin/Any!|> : R|kotlin/A
     public constructor<P : R|kotlin/Any!|>(): R|test/MethodReferencesOuterClassTP<P>|
 
     public final inner class Inner<Outer(P) : R|kotlin/Any!|> : R|kotlin/Any| {
-        public final fun <Q : R|ft<P & Any, P?>|> f(): R|kotlin/Unit|
+        public final fun <Q : R|P!|> f(): R|kotlin/Unit|
 
         public test/MethodReferencesOuterClassTP<P>.constructor(): R|test/MethodReferencesOuterClassTP.Inner<P>|
 

compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt

@@ -1,5 +1,5 @@
 public final class MethodWithTypePP : R|kotlin/Any| {
-    public final fun <P : R|kotlin/Any!|, Q : R|ft<P & Any, P?>|> f(): R|kotlin/Unit|
+    public final fun <P : R|kotlin/Any!|, Q : R|P!|> f(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypePP|
 

compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt

@@ -1,5 +1,5 @@
 public open class MethodWithTypePRefClassP<P : R|kotlin/Any!|> : R|kotlin/Any| {
-    public final fun <Q : R|ft<P & Any, P?>|> f(): R|kotlin/Unit|
+    public final fun <Q : R|P!|> f(): R|kotlin/Unit|
 
     public constructor<P : R|kotlin/Any!|>(): R|test/MethodWithTypePRefClassP<P>|
 

compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt

@@ -1,5 +1,5 @@
 public final class MethosWithPRefTP : R|kotlin/Any| {
-    public final fun <P : R|kotlin/Any!|> f(p: R|ft<P & Any, P?>|): R|kotlin/Unit|
+    public final fun <P : R|kotlin/Any!|> f(p: R|P!|): R|kotlin/Unit|
 
     public constructor(): R|test/MethosWithPRefTP|
 

compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt

@@ -2,7 +2,7 @@ public open class RawOverrides : R|kotlin/Any| {
     public constructor(): R|test/RawOverrides|
 
     public abstract interface A<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun <E : R|kotlin/CharSequence!|> foo(x: R|ft<T & Any, T?>|, y: R|ft<kotlin/collections/MutableList<out ft<T & Any, T?>>, kotlin/collections/List<out ft<T & Any, T?>>?>|): R|ft<E & Any, E?>|
+        public abstract fun <E : R|kotlin/CharSequence!|> foo(x: R|T!|, y: R|ft<kotlin/collections/MutableList<out T!>, kotlin/collections/List<out T!>?>|): R|E!|
 
     }
     public open inner class B : R|kotlin/Any|, R|Raw type test/RawOverrides.A<kotlin/Any!>| {
@@ -12,7 +12,7 @@ public open class RawOverrides : R|kotlin/Any| {
 
     }
     public open inner class C : R|kotlin/Any| {
-        public/*package*/ open fun <E : R|kotlin/CharSequence!|, F : R|ft<E & Any, E?>|> bar(x: R|ft<F & Any, F?>|, y: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap<ft<E & Any, E?>, ft<F & Any, F?>>, kotlin/collections/Map<ft<E & Any, E?>, ft<F & Any, F?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap<ft<E & Any, E?>, ft<F & Any, F?>>, kotlin/collections/Map<ft<E & Any, E?>, ft<F & Any, F?>>?>>?>|): R|ft<E & Any, E?>|
+        public/*package*/ open fun <E : R|kotlin/CharSequence!|, F : R|E!|> bar(x: R|F!|, y: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap<E!, F!>, kotlin/collections/Map<E!, F!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap<E!, F!>, kotlin/collections/Map<E!, F!>?>>?>|): R|E!|
 
         public test/RawOverrides.constructor(): R|test/RawOverrides.C|
 
@@ -20,7 +20,7 @@ public open class RawOverrides : R|kotlin/Any| {
     public open inner class D : R|test/RawOverrides.C| {
         @R|java/lang/Override|() public open fun bar(x: R|kotlin/CharSequence!|, y: R|ft<Raw type kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|): R|kotlin/String!|
 
-        public/*package*/ open fun <E : R|kotlin/CharSequence!|, F : R|ft<E & Any, E?>|> bar(x: R|ft<F & Any, F?>|, y: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap<ft<E & Any, E?>, ft<F & Any, F?>>, kotlin/collections/Map<ft<E & Any, E?>, ft<F & Any, F?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap<ft<E & Any, E?>, ft<F & Any, F?>>, kotlin/collections/Map<ft<E & Any, E?>, ft<F & Any, F?>>?>>?>|): R|ft<E & Any, E?>|
+        public/*package*/ open fun <E : R|kotlin/CharSequence!|, F : R|E!|> bar(x: R|F!|, y: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap<E!, F!>, kotlin/collections/Map<E!, F!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap<E!, F!>, kotlin/collections/Map<E!, F!>?>>?>|): R|E!|
 
         public test/RawOverrides.constructor(): R|test/RawOverrides.D|
 

compiler/testData/loadJava/compiledJava/ReferenceCycleThroughAnnotation.fir.txt

@@ -7,8 +7,8 @@ public open class ReferenceCycleThroughAnnotation : R|kotlin/Any| {
         public test/ReferenceCycleThroughAnnotation.constructor<T : R|kotlin/Any!|>(): R|test/ReferenceCycleThroughAnnotation.A<T>|
 
     }
-    public open inner class B<T : R|ft<test/ReferenceCycleThroughAnnotation.A<ft<T & Any, T?>>, test/ReferenceCycleThroughAnnotation.A<ft<T & Any, T?>>?>|> : R|kotlin/Any| {
-        public test/ReferenceCycleThroughAnnotation.constructor<T : R|ft<test/ReferenceCycleThroughAnnotation.A<ft<T & Any, T?>>, test/ReferenceCycleThroughAnnotation.A<ft<T & Any, T?>>?>|>(): R|test/ReferenceCycleThroughAnnotation.B<T>|
+    public open inner class B<T : R|ft<test/ReferenceCycleThroughAnnotation.A<T!>, test/ReferenceCycleThroughAnnotation.A<T!>?>|> : R|kotlin/Any| {
+        public test/ReferenceCycleThroughAnnotation.constructor<T : R|ft<test/ReferenceCycleThroughAnnotation.A<T!>, test/ReferenceCycleThroughAnnotation.A<T!>?>|>(): R|test/ReferenceCycleThroughAnnotation.B<T>|
 
     }
     public final annotation class C : R|kotlin/Annotation| {

compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorGenericDeep : R|kotlin/Any| {
-    public constructor<P : R|kotlin/Any!|>(cl: R|ft<java/lang/Class<ft<P & Any, P?>>, java/lang/Class<ft<P & Any, P?>>?>|): R|test/ConstructorGenericDeep|
+    public constructor<P : R|kotlin/Any!|>(cl: R|ft<java/lang/Class<P!>, java/lang/Class<P!>?>|): R|test/ConstructorGenericDeep|
 
 }

compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorGenericSimple : R|kotlin/Any| {
-    public constructor<P : R|kotlin/Any!|>(p: R|ft<P & Any, P?>|): R|test/ConstructorGenericSimple|
+    public constructor<P : R|kotlin/Any!|>(p: R|P!|): R|test/ConstructorGenericSimple|
 
 }

compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorGenericUpperBound : R|kotlin/Any| {
-    public constructor<P : R|java/util/RandomAccess!|>(p: R|ft<P & Any, P?>|): R|test/ConstructorGenericUpperBound|
+    public constructor<P : R|java/util/RandomAccess!|>(p: R|P!|): R|test/ConstructorGenericUpperBound|
 
 }

compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt

@@ -1,7 +1,7 @@
 public open class JavaBeanVarOfGenericType<P : R|kotlin/Any!|> : R|kotlin/Any| {
-    public open fun getCharacters(): R|ft<java/util/ArrayList<ft<P & Any, P?>>, java/util/ArrayList<ft<P & Any, P?>>?>|
+    public open fun getCharacters(): R|ft<java/util/ArrayList<P!>, java/util/ArrayList<P!>?>|
 
-    public open fun setCharacters(characters: R|ft<java/util/ArrayList<ft<P & Any, P?>>, java/util/ArrayList<ft<P & Any, P?>>?>|): R|kotlin/Unit|
+    public open fun setCharacters(characters: R|ft<java/util/ArrayList<P!>, java/util/ArrayList<P!>?>|): R|kotlin/Unit|
 
     public constructor<P : R|kotlin/Any!|>(): R|test/JavaBeanVarOfGenericType<P>|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorWithNewTypeParams<T : R|kotlin/Any!|> : R|kotlin/Any| {
-    public constructor<T : R|kotlin/Any!|, U : R|kotlin/Any!|>(first: R|ft<U & Any, U?>|): R|test/ConstructorWithNewTypeParams<T>|
+    public constructor<T : R|kotlin/Any!|, U : R|kotlin/Any!|>(first: R|U!|): R|test/ConstructorWithNewTypeParams<T>|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorWithParentTypeParams<T : R|kotlin/Any!|> : R|kotlin/Any| {
-    public constructor<T : R|kotlin/Any!|>(first: R|ft<T & Any, T?>|): R|test/ConstructorWithParentTypeParams<T>|
+    public constructor<T : R|kotlin/Any!|>(first: R|T!|): R|test/ConstructorWithParentTypeParams<T>|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt

@@ -1,7 +1,7 @@
 public open class MethodWithMappedClasses : R|kotlin/Any| {
-    public open fun <T : R|kotlin/Any!|> copy(dest: R|ft<kotlin/collections/MutableList<in ft<T & Any, T?>>, kotlin/collections/MutableList<in ft<T & Any, T?>>?>|, src: R|ft<kotlin/collections/MutableList<ft<T & Any, T?>>, kotlin/collections/List<ft<T & Any, T?>>?>|): R|kotlin/Unit|
+    public open fun <T : R|kotlin/Any!|> copy(dest: R|ft<kotlin/collections/MutableList<in T!>, kotlin/collections/MutableList<in T!>?>|, src: R|ft<kotlin/collections/MutableList<T!>, kotlin/collections/List<T!>?>|): R|kotlin/Unit|
 
-    public open fun <T : R|kotlin/Any!|> copyMap(dest: R|ft<kotlin/collections/MutableMap<kotlin/String!, in ft<T & Any, T?>>, kotlin/collections/MutableMap<kotlin/String!, in ft<T & Any, T?>>?>|, src: R|ft<kotlin/collections/MutableMap<kotlin/String!, ft<T & Any, T?>>, kotlin/collections/Map<kotlin/String!, ft<T & Any, T?>>?>|): R|kotlin/Unit|
+    public open fun <T : R|kotlin/Any!|> copyMap(dest: R|ft<kotlin/collections/MutableMap<kotlin/String!, in T!>, kotlin/collections/MutableMap<kotlin/String!, in T!>?>|, src: R|ft<kotlin/collections/MutableMap<kotlin/String!, T!>, kotlin/collections/Map<kotlin/String!, T!>?>|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithMappedClasses|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt

@@ -1,5 +1,5 @@
 public open class MethodWithTypeParameters : R|kotlin/Any| {
-    public open fun <A : R|kotlin/Any!|, B : R|java/lang/Runnable!|, R|ft<kotlin/collections/MutableList<kotlin/Cloneable!>, kotlin/collections/List<kotlin/Cloneable!>?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<kotlin/collections/MutableList<out ft<B & Any, B?>>, kotlin/collections/List<out ft<B & Any, B?>>?>|, list: R|ft<kotlin/collections/MutableList<in kotlin/String!>, kotlin/collections/MutableList<in kotlin/String!>?>|): R|kotlin/Unit|
+    public open fun <A : R|kotlin/Any!|, B : R|java/lang/Runnable!|, R|ft<kotlin/collections/MutableList<kotlin/Cloneable!>, kotlin/collections/List<kotlin/Cloneable!>?>|> foo(a: R|A!|, b: R|ft<kotlin/collections/MutableList<out B!>, kotlin/collections/List<out B!>?>|, list: R|ft<kotlin/collections/MutableList<in kotlin/String!>, kotlin/collections/MutableList<in kotlin/String!>?>|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypeParameters|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt

@@ -3,7 +3,7 @@ public open class PropertyArrayTypes<T : R|kotlin/Any!|> : R|kotlin/Any| {
 
     public open field array: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|
 
-    public open field genericArray: R|ft<kotlin/Array<ft<T & Any, T?>>, kotlin/Array<out ft<T & Any, T?>>?>|
+    public open field genericArray: R|ft<kotlin/Array<T!>, kotlin/Array<out T!>?>|
 
     public constructor<T : R|kotlin/Any!|>(): R|test/PropertyArrayTypes<T>|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt

@@ -1,11 +1,11 @@
 public open class PropertyComplexTypes<T : R|kotlin/Any!|> : R|kotlin/Any| {
-    public open field genericType: R|ft<T & Any, T?>|
+    public open field genericType: R|T!|
 
     public open field listDefinedGeneric: R|ft<java/util/ArrayList<kotlin/String!>, java/util/ArrayList<kotlin/String!>?>|
 
-    public open field listGeneric: R|ft<java/util/ArrayList<ft<T & Any, T?>>, java/util/ArrayList<ft<T & Any, T?>>?>|
+    public open field listGeneric: R|ft<java/util/ArrayList<T!>, java/util/ArrayList<T!>?>|
 
-    public open field listOfGenericList: R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T & Any, T?>>, java/util/ArrayList<ft<T & Any, T?>>?>>, java/util/ArrayList<ft<java/util/ArrayList<ft<T & Any, T?>>, java/util/ArrayList<ft<T & Any, T?>>?>>?>|
+    public open field listOfGenericList: R|ft<java/util/ArrayList<ft<java/util/ArrayList<T!>, java/util/ArrayList<T!>?>>, java/util/ArrayList<ft<java/util/ArrayList<T!>, java/util/ArrayList<T!>?>>?>|
 
     public constructor<T : R|kotlin/Any!|>(): R|test/PropertyComplexTypes<T>|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt

@@ -1,5 +1,5 @@
 public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| {
-    public open fun <A : R|kotlin/Any!|, B : R|java/lang/Runnable!|, R|ft<kotlin/collections/MutableList<kotlin/Cloneable!>, kotlin/collections/List<kotlin/Cloneable!>?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<kotlin/collections/MutableList<out ft<B & Any, B?>>, kotlin/collections/List<out ft<B & Any, B?>>?>|): R|kotlin/Unit|
+    public open fun <A : R|kotlin/Any!|, B : R|java/lang/Runnable!|, R|ft<kotlin/collections/MutableList<kotlin/Cloneable!>, kotlin/collections/List<kotlin/Cloneable!>?>|> foo(a: R|A!|, b: R|ft<kotlin/collections/MutableList<out B!>, kotlin/collections/List<out B!>?>|): R|kotlin/Unit|
 
     public constructor(): R|test/WrongTypeParameterBoundStructure1|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt

@@ -1,6 +1,6 @@
 public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
-    public abstract interface Middle<E : R|kotlin/Any!|> : R|test/DeeplySubstitutedClassParameter.Super<ft<E & Any, E?>>| {
-        public abstract fun foo(p: R|ft<E & Any, E?>|): R|kotlin/Unit|
+    public abstract interface Middle<E : R|kotlin/Any!|> : R|test/DeeplySubstitutedClassParameter.Super<E!>| {
+        public abstract fun foo(p: R|E!|): R|kotlin/Unit|
 
     }
     public abstract interface Sub : R|test/DeeplySubstitutedClassParameter.Middle<kotlin/String!>| {
@@ -8,7 +8,7 @@ public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
 
     }
     public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<T & Any, T?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|T!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt

@@ -1,12 +1,12 @@
 public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| {
-    public abstract interface Middle<E : R|kotlin/Any!|> : R|test/DeeplySubstitutedClassParameter2.Super<ft<E & Any, E?>>| {
+    public abstract interface Middle<E : R|kotlin/Any!|> : R|test/DeeplySubstitutedClassParameter2.Super<E!>| {
     }
     public abstract interface Sub : R|test/DeeplySubstitutedClassParameter2.Middle<kotlin/String!>| {
         public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
 
     }
     public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<T & Any, T?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|T!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt

@@ -10,7 +10,7 @@ public abstract interface Kt3302 : R|kotlin/Any| {
 
     }
     public abstract interface LinkedHashMap<K : R|kotlin/Any!|, V : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun put(key: R|ft<K & Any, K?>|, value: R|ft<V & Any, V?>|): R|ft<V & Any, V?>|
+        public abstract fun put(key: R|K!|, value: R|V!|): R|V!|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt

@@ -1,10 +1,10 @@
 public abstract interface OverrideWithErasedParameter : R|kotlin/Any| {
-    public abstract interface Sub<T : R|kotlin/Any!|> : R|test/OverrideWithErasedParameter.Super<ft<T & Any, T?>>| {
+    public abstract interface Sub<T : R|kotlin/Any!|> : R|test/OverrideWithErasedParameter.Super<T!>| {
         public abstract fun foo(o: R|kotlin/Any!|): R|kotlin/Unit|
 
     }
     public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(t: R|ft<T & Any, T?>|): R|kotlin/Unit|
+        public abstract fun foo(t: R|T!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt

@@ -1,6 +1,6 @@
 public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
     public abstract interface Generic<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(key: R|ft<T & Any, T?>|): R|kotlin/Unit|
+        public abstract fun foo(key: R|T!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt

@@ -4,7 +4,7 @@ public abstract interface SubstitutedClassParameter : R|kotlin/Any| {
 
     }
     public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<T & Any, T?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|T!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt

@@ -4,13 +4,13 @@ public abstract interface SubstitutedClassParameters : R|kotlin/Any| {
 
     }
     public abstract interface Super1<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<T & Any, T?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|T!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
     public abstract interface Super2<E : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<E & Any, E?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|E!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt

@@ -1,6 +1,6 @@
 public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
-    public abstract interface Middle<E : R|kotlin/Any!|> : R|test/DeeplySubstitutedClassParameter.Super<ft<E & Any, E?>>| {
-        public abstract fun foo(): R|ft<E & Any, E?>|
+    public abstract interface Middle<E : R|kotlin/Any!|> : R|test/DeeplySubstitutedClassParameter.Super<E!>| {
+        public abstract fun foo(): R|E!|
 
     }
     public abstract interface Sub : R|test/DeeplySubstitutedClassParameter.Middle<kotlin/String!>| {
@@ -8,7 +8,7 @@ public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
 
     }
     public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<T & Any, T?>|
+        public abstract fun foo(): R|T!|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt

@@ -1,12 +1,12 @@
 public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| {
-    public abstract interface Middle<E : R|kotlin/Any!|> : R|test/DeeplySubstitutedClassParameter2.Super<ft<E & Any, E?>>| {
+    public abstract interface Middle<E : R|kotlin/Any!|> : R|test/DeeplySubstitutedClassParameter2.Super<E!>| {
     }
     public abstract interface Sub : R|test/DeeplySubstitutedClassParameter2.Middle<kotlin/String!>| {
         public abstract fun foo(): R|kotlin/String!|
 
     }
     public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<T & Any, T?>|
+        public abstract fun foo(): R|T!|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt

@@ -9,6 +9,6 @@ public abstract interface HalfSubstitutedTypeParameters : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
-    public abstract interface TrickyList<X : R|kotlin/Any!|, E : R|kotlin/Any!|> : R|kotlin/collections/MutableList<ft<E & Any, E?>>| {
+    public abstract interface TrickyList<X : R|kotlin/Any!|, E : R|kotlin/Any!|> : R|kotlin/collections/MutableList<E!>| {
     }
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt

@@ -1,6 +1,6 @@
 public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
     public abstract interface Generic<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<T & Any, T?>|
+        public abstract fun foo(): R|T!|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt

@@ -1,4 +1,4 @@
-public abstract interface SubclassOfCollection<E : R|kotlin/Any!|> : R|kotlin/collections/MutableCollection<ft<E & Any, E?>>| {
-    public abstract operator fun iterator(): R|@EnhancedNullability kotlin/collections/MutableIterator<ft<E & Any, E?>>|
+public abstract interface SubclassOfCollection<E : R|kotlin/Any!|> : R|kotlin/collections/MutableCollection<E!>| {
+    public abstract operator fun iterator(): R|@EnhancedNullability kotlin/collections/MutableIterator<E!>|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt

@@ -1,4 +1,4 @@
-public abstract interface SubclassOfMapEntry<K : R|kotlin/Any!|, V : R|kotlin/Any!|> : R|kotlin/collections/MutableMap.MutableEntry<ft<K & Any, K?>, ft<V & Any, V?>>| {
-    public abstract fun setValue(value: R|ft<V & Any, V?>|): R|ft<V & Any, V?>|
+public abstract interface SubclassOfMapEntry<K : R|kotlin/Any!|, V : R|kotlin/Any!|> : R|kotlin/collections/MutableMap.MutableEntry<K!, V!>| {
+    public abstract fun setValue(value: R|V!|): R|V!|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt

@@ -4,7 +4,7 @@ public abstract interface SubstitutedClassParameter : R|kotlin/Any| {
 
     }
     public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<T & Any, T?>|
+        public abstract fun foo(): R|T!|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt

@@ -4,13 +4,13 @@ public abstract interface SubstitutedClassParameters : R|kotlin/Any| {
 
     }
     public abstract interface Super1<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<T & Any, T?>|
+        public abstract fun foo(): R|T!|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
     public abstract interface Super2<E : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<E & Any, E?>|
+        public abstract fun foo(): R|E!|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt

@@ -1,5 +1,5 @@
 public abstract interface TypeParamOfClass : R|kotlin/Any| {
-    public abstract interface Sub<T : R|kotlin/Any!|> : R|test/TypeParamOfClass.Super<ft<T & Any, T?>>| {
+    public abstract interface Sub<T : R|kotlin/Any!|> : R|test/TypeParamOfClass.Super<T!>| {
         public abstract fun foo(): R|@EnhancedNullability T & Any|
 
     }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt

@@ -1,10 +1,10 @@
 public abstract interface InheritNullability : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNullability.Super| {
-        public abstract fun <B : R|kotlin/CharSequence!|> foo(b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+        public abstract fun <B : R|kotlin/CharSequence!|> foo(b: R|B!|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun <A : R|kotlin/CharSequence!|> foo(a: R|ft<A & Any, A?>|): R|kotlin/Unit|
+        public abstract fun <A : R|kotlin/CharSequence!|> foo(a: R|A!|): R|kotlin/Unit|
 
     }
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt

@@ -1,10 +1,10 @@
 public abstract interface TwoBounds : R|kotlin/Any| {
     public abstract interface Sub : R|test/TwoBounds.Super| {
-        public abstract fun <B : R|kotlin/CharSequence!|, R|kotlin/Cloneable!|> foo(b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+        public abstract fun <B : R|kotlin/CharSequence!|, R|kotlin/Cloneable!|> foo(b: R|B!|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun <A : R|kotlin/CharSequence!|, R|kotlin/Cloneable!|> foo(a: R|ft<A & Any, A?>|): R|kotlin/Unit|
+        public abstract fun <A : R|kotlin/CharSequence!|, R|kotlin/Cloneable!|> foo(a: R|A!|): R|kotlin/Unit|
 
     }
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt

@@ -1,14 +1,14 @@
 public abstract interface TwoSuperclasses : R|kotlin/Any| {
     public abstract interface Sub : R|test/TwoSuperclasses.Super1|, R|test/TwoSuperclasses.Super2| {
-        public abstract fun <C : R|kotlin/CharSequence!|> foo(c: R|ft<C & Any, C?>|): R|kotlin/Unit|
+        public abstract fun <C : R|kotlin/CharSequence!|> foo(c: R|C!|): R|kotlin/Unit|
 
     }
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun <A : R|kotlin/CharSequence!|> foo(a: R|ft<A & Any, A?>|): R|kotlin/Unit|
+        public abstract fun <A : R|kotlin/CharSequence!|> foo(a: R|A!|): R|kotlin/Unit|
 
     }
     public abstract interface Super2 : R|kotlin/Any| {
-        public abstract fun <B : R|kotlin/CharSequence!|> foo(a: R|ft<B & Any, B?>|): R|kotlin/Unit|
+        public abstract fun <B : R|kotlin/CharSequence!|> foo(a: R|B!|): R|kotlin/Unit|
 
     }
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt

@@ -1,10 +1,10 @@
 public abstract interface TwoTypeParameters : R|kotlin/Any| {
     public abstract interface Sub : R|test/TwoTypeParameters.Super| {
-        public abstract fun <B : R|kotlin/CharSequence!|, A : R|kotlin/Cloneable!|> foo(b: R|ft<B & Any, B?>|, a: R|ft<A & Any, A?>|): R|kotlin/Unit|
+        public abstract fun <B : R|kotlin/CharSequence!|, A : R|kotlin/Cloneable!|> foo(b: R|B!|, a: R|A!|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun <A : R|kotlin/CharSequence!|, B : R|kotlin/Cloneable!|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+        public abstract fun <A : R|kotlin/CharSequence!|, B : R|kotlin/Cloneable!|> foo(a: R|A!|, b: R|B!|): R|kotlin/Unit|
 
     }
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt

@@ -1,12 +1,12 @@
 public abstract interface UseParameterAsUpperBound : R|kotlin/Any| {
     public abstract interface Sub : R|test/UseParameterAsUpperBound.Super| {
-        public abstract fun <B : R|kotlin/Any!|, A : R|ft<B & Any, B?>|> foo(b: R|ft<B & Any, B?>|, a: R|ft<A & Any, A?>|): R|kotlin/Unit|
+        public abstract fun <B : R|kotlin/Any!|, A : R|B!|> foo(b: R|B!|, a: R|A!|): R|kotlin/Unit|
 
-        public abstract fun <A : R|kotlin/Any!|, B : R|ft<A & Any, A?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+        public abstract fun <A : R|kotlin/Any!|, B : R|A!|> foo(a: R|A!|, b: R|B!|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun <A : R|kotlin/Any!|, B : R|ft<A & Any, A?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+        public abstract fun <A : R|kotlin/Any!|, B : R|A!|> foo(a: R|A!|, b: R|B!|): R|kotlin/Unit|
 
     }
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt

@@ -1,10 +1,10 @@
 public abstract interface UseParameterInUpperBound : R|kotlin/Any| {
     public abstract interface Sub : R|test/UseParameterInUpperBound.Super| {
-        public abstract fun <B : R|kotlin/Any!|, A : R|ft<kotlin/collections/MutableList<ft<B & Any, B?>>, kotlin/collections/List<ft<B & Any, B?>>?>|> foo(b: R|ft<B & Any, B?>|, a: R|ft<A & Any, A?>|): R|kotlin/Unit|
+        public abstract fun <B : R|kotlin/Any!|, A : R|ft<kotlin/collections/MutableList<B!>, kotlin/collections/List<B!>?>|> foo(b: R|B!|, a: R|A!|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun <A : R|kotlin/Any!|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+        public abstract fun <A : R|kotlin/Any!|, B : R|ft<kotlin/collections/MutableList<A!>, kotlin/collections/List<A!>?>|> foo(a: R|A!|, b: R|B!|): R|kotlin/Unit|
 
     }
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt

@@ -1,10 +1,10 @@
 public abstract interface UseParameterInUpperBoundWithKotlinSignature : R|kotlin/Any| {
     public abstract interface Sub : R|test/UseParameterInUpperBoundWithKotlinSignature.Super| {
-        public abstract fun <B : R|kotlin/Any!|, A : R|ft<kotlin/collections/MutableList<ft<B & Any, B?>>, kotlin/collections/List<ft<B & Any, B?>>?>|> foo(b: R|ft<B & Any, B?>|, a: R|ft<A & Any, A?>|): R|kotlin/Unit|
+        public abstract fun <B : R|kotlin/Any!|, A : R|ft<kotlin/collections/MutableList<B!>, kotlin/collections/List<B!>?>|> foo(b: R|B!|, a: R|A!|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun <A : R|kotlin/Any!|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+        public abstract fun <A : R|kotlin/Any!|, B : R|ft<kotlin/collections/MutableList<A!>, kotlin/collections/List<A!>?>|> foo(a: R|A!|, b: R|B!|): R|kotlin/Unit|
 
     }
 }

compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt

@@ -1,6 +1,6 @@
 public abstract interface LoadIterable<T : R|kotlin/Any!|> : R|kotlin/Any| {
-    public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/Iterable<ft<T & Any, T?>>?>|
+    public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<T!>, kotlin/collections/Iterable<T!>?>|
 
-    public abstract fun setIterable(Iterable: R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/Iterable<ft<T & Any, T?>>?>|): R|kotlin/Unit|
+    public abstract fun setIterable(Iterable: R|ft<kotlin/collections/MutableIterable<T!>, kotlin/collections/Iterable<T!>?>|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt

@@ -1,6 +1,6 @@
 public abstract interface LoadIterator<T : R|kotlin/Any!|> : R|kotlin/Any| {
-    public abstract fun getIterator(): R|ft<kotlin/collections/MutableIterator<ft<T & Any, T?>>, kotlin/collections/Iterator<ft<T & Any, T?>>?>|
+    public abstract fun getIterator(): R|ft<kotlin/collections/MutableIterator<T!>, kotlin/collections/Iterator<T!>?>|
 
-    public abstract fun setIterator(iterator: R|ft<kotlin/collections/MutableIterator<ft<T & Any, T?>>, kotlin/collections/Iterator<ft<T & Any, T?>>?>|): R|kotlin/Unit|
+    public abstract fun setIterator(iterator: R|ft<kotlin/collections/MutableIterator<T!>, kotlin/collections/Iterator<T!>?>|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/library/Max.fir.txt

@@ -1,5 +1,5 @@
 public open class Max : R|kotlin/Any| {
-    public open fun <T : R|kotlin/Any!|, R|ft<kotlin/Comparable<in ft<T & Any, T?>>, kotlin/Comparable<in ft<T & Any, T?>>?>|> max(coll: R|ft<kotlin/collections/MutableCollection<out ft<T & Any, T?>>, kotlin/collections/Collection<out ft<T & Any, T?>>?>|): R|ft<T & Any, T?>|
+    public open fun <T : R|kotlin/Any!|, R|ft<kotlin/Comparable<in T!>, kotlin/Comparable<in T!>?>|> max(coll: R|ft<kotlin/collections/MutableCollection<out T!>, kotlin/collections/Collection<out T!>?>|): R|T!|
 
     public constructor(): R|test/Max|
 

compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt

@@ -1,10 +1,10 @@
 public abstract interface LoadIterable<T : R|kotlin/Any!|> : R|kotlin/Any| {
-    @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/MutableIterable<ft<T & Any, T?>>?>|
+    @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<T!>, kotlin/collections/MutableIterable<T!>?>|
 
-    public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/MutableIterable<ft<T & Any, T?>>?>|): R|kotlin/Unit|
+    public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<T!>, kotlin/collections/MutableIterable<T!>?>|): R|kotlin/Unit|
 
-    @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<ft<T & Any, T?>>, kotlin/collections/Iterable<ft<T & Any, T?>>?>|
+    @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<T!>, kotlin/collections/Iterable<T!>?>|
 
-    public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft<kotlin/collections/Iterable<ft<T & Any, T?>>, kotlin/collections/Iterable<ft<T & Any, T?>>?>|): R|kotlin/Unit|
+    public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft<kotlin/collections/Iterable<T!>, kotlin/collections/Iterable<T!>?>|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt

@@ -1,6 +1,6 @@
 public abstract interface LoadIterableWithConflict<T : R|kotlin/Any!|> : R|kotlin/Any| {
-    @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/Iterable<ft<T & Any, T?>>?>|
+    @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<T!>, kotlin/collections/Iterable<T!>?>|
 
-    public abstract fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/Iterable<ft<T & Any, T?>>?>|): R|kotlin/Unit|
+    public abstract fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<T!>, kotlin/collections/Iterable<T!>?>|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt

@@ -1,10 +1,10 @@
 public abstract interface LoadIterableWithNullability<T : R|kotlin/Any!|> : R|kotlin/Any| {
-    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|@EnhancedNullability kotlin/collections/MutableIterable<ft<T & Any, T?>>|
+    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|@EnhancedNullability kotlin/collections/MutableIterable<T!>|
 
-    public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability kotlin/collections/MutableIterable<ft<T & Any, T?>>|): R|kotlin/Unit|
+    public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability kotlin/collections/MutableIterable<T!>|): R|kotlin/Unit|
 
-    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|@EnhancedNullability kotlin/collections/Iterable<ft<T & Any, T?>>|
+    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|@EnhancedNullability kotlin/collections/Iterable<T!>|
 
-    public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability kotlin/collections/Iterable<ft<T & Any, T?>>|): R|kotlin/Unit|
+    public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability kotlin/collections/Iterable<T!>|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt

@@ -1,22 +1,22 @@
 public abstract interface LoadIterableWithPropagation : R|kotlin/Any| {
     public abstract interface LoadIterable<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/MutableIterable<ft<T & Any, T?>>?>|
+        @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<T!>, kotlin/collections/MutableIterable<T!>?>|
 
-        public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/MutableIterable<ft<T & Any, T?>>?>|): R|kotlin/Unit|
+        public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<T!>, kotlin/collections/MutableIterable<T!>?>|): R|kotlin/Unit|
 
-        @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<ft<T & Any, T?>>, kotlin/collections/Iterable<ft<T & Any, T?>>?>|
+        @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<T!>, kotlin/collections/Iterable<T!>?>|
 
-        public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft<kotlin/collections/Iterable<ft<T & Any, T?>>, kotlin/collections/Iterable<ft<T & Any, T?>>?>|): R|kotlin/Unit|
+        public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft<kotlin/collections/Iterable<T!>, kotlin/collections/Iterable<T!>?>|): R|kotlin/Unit|
 
     }
-    public open class LoadIterableImpl<T : R|kotlin/Any!|> : R|kotlin/Any|, R|test/LoadIterableWithPropagation.LoadIterable<ft<T & Any, T?>>| {
-        public open fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/MutableIterable<ft<T & Any, T?>>?>|
+    public open class LoadIterableImpl<T : R|kotlin/Any!|> : R|kotlin/Any|, R|test/LoadIterableWithPropagation.LoadIterable<T!>| {
+        public open fun getIterable(): R|ft<kotlin/collections/MutableIterable<T!>, kotlin/collections/MutableIterable<T!>?>|
 
-        public open fun setIterable(Iterable: R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/MutableIterable<ft<T & Any, T?>>?>|): R|kotlin/Unit|
+        public open fun setIterable(Iterable: R|ft<kotlin/collections/MutableIterable<T!>, kotlin/collections/MutableIterable<T!>?>|): R|kotlin/Unit|
 
-        public open fun getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<ft<T & Any, T?>>, kotlin/collections/Iterable<ft<T & Any, T?>>?>|
+        public open fun getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<T!>, kotlin/collections/Iterable<T!>?>|
 
-        public open fun setReadOnlyIterable(Iterable: R|ft<kotlin/collections/Iterable<ft<T & Any, T?>>, kotlin/collections/Iterable<ft<T & Any, T?>>?>|): R|kotlin/Unit|
+        public open fun setReadOnlyIterable(Iterable: R|ft<kotlin/collections/Iterable<T!>, kotlin/collections/Iterable<T!>?>|): R|kotlin/Unit|
 
         public constructor<T : R|kotlin/Any!|>(): R|test/LoadIterableWithPropagation.LoadIterableImpl<T>|
 

compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface Comparator<T : R|kotlin/Any!|> : R|kotlin/Any| {
-    public abstract fun compare(o1: R|ft<T & Any, T?>|, o2: R|ft<T & Any, T?>|): R|kotlin/Int|
+    public abstract fun compare(o1: R|T!|, o2: R|T!|): R|kotlin/Int|
 
 }

compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt

@@ -1,4 +1,4 @@
-public abstract interface GenericInterfaceParameterWithSelfBound<T : R|ft<test/GenericInterfaceParameterWithSelfBound<ft<T & Any, T?>>, test/GenericInterfaceParameterWithSelfBound<ft<T & Any, T?>>?>|> : R|kotlin/Any| {
-    public abstract fun method(t: R|ft<T & Any, T?>|): R|ft<T & Any, T?>|
+public abstract interface GenericInterfaceParameterWithSelfBound<T : R|ft<test/GenericInterfaceParameterWithSelfBound<T!>, test/GenericInterfaceParameterWithSelfBound<T!>?>|> : R|kotlin/Any| {
+    public abstract fun method(t: R|T!|): R|T!|
 
 }

compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt

@@ -1,4 +1,4 @@
-public abstract interface GenericInterfaceParametersWithBounds<A : R|ft<kotlin/Comparable<ft<A & Any, A?>>, kotlin/Comparable<ft<A & Any, A?>>?>|, R|kotlin/Cloneable!|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> : R|kotlin/Any| {
-    public abstract fun method(a: R|ft<kotlin/Array<ft<A & Any, A?>>, kotlin/Array<out ft<A & Any, A?>>?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+public abstract interface GenericInterfaceParametersWithBounds<A : R|ft<kotlin/Comparable<A!>, kotlin/Comparable<A!>?>|, R|kotlin/Cloneable!|, B : R|ft<kotlin/collections/MutableList<A!>, kotlin/collections/List<A!>?>|> : R|kotlin/Any| {
+    public abstract fun method(a: R|ft<kotlin/Array<A!>, kotlin/Array<out A!>?>|, b: R|B!|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface GenericMethodParameters : R|kotlin/Any| {
-    public abstract fun <A : R|kotlin/CharSequence!|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> method(a: R|ft<kotlin/Array<ft<A & Any, A?>>, kotlin/Array<out ft<A & Any, A?>>?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+    public abstract fun <A : R|kotlin/CharSequence!|, B : R|ft<kotlin/collections/MutableList<A!>, kotlin/collections/List<A!>?>|> method(a: R|ft<kotlin/Array<A!>, kotlin/Array<out A!>?>|, b: R|B!|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt

@@ -6,7 +6,7 @@ public abstract interface SamSubinterfaceOfTwo : R|kotlin/Any| {
 
     }
     public abstract interface Super2<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun f(): R|ft<T & Any, T?>|
+        public abstract fun f(): R|T!|
 
     }
 }

compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt

@@ -1,5 +1,5 @@
 public open class TypeParameterOfClass<T : R|kotlin/Any!|> : R|kotlin/Any| {
-    public open fun foo(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|): R|kotlin/Unit|
+    public open fun foo(comparator: R|ft<java/util/Comparator<T!>, java/util/Comparator<T!>?>|): R|kotlin/Unit|
 
     public constructor<T : R|kotlin/Any!|>(): R|test/TypeParameterOfClass<T>|
 

compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt

@@ -1,9 +1,9 @@
 public open class TypeParameterOfMethod : R|kotlin/Any| {
-    public open static fun <T : R|kotlin/Any!|> max(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|, value1: R|ft<T & Any, T?>|, value2: R|ft<T & Any, T?>|): R|ft<T & Any, T?>|
+    public open static fun <T : R|kotlin/Any!|> max(comparator: R|ft<java/util/Comparator<T!>, java/util/Comparator<T!>?>|, value1: R|T!|, value2: R|T!|): R|T!|
 
-    public open static fun <T : R|kotlin/CharSequence!|> max2(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|, value1: R|ft<T & Any, T?>|, value2: R|ft<T & Any, T?>|): R|ft<T & Any, T?>|
+    public open static fun <T : R|kotlin/CharSequence!|> max2(comparator: R|ft<java/util/Comparator<T!>, java/util/Comparator<T!>?>|, value1: R|T!|, value2: R|T!|): R|T!|
 
-    public open static fun <A : R|kotlin/CharSequence!|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> method(a: R|ft<java/util/Comparator<ft<A & Any, A?>>, java/util/Comparator<ft<A & Any, A?>>?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+    public open static fun <A : R|kotlin/CharSequence!|, B : R|ft<kotlin/collections/MutableList<A!>, kotlin/collections/List<A!>?>|> method(a: R|ft<java/util/Comparator<A!>, java/util/Comparator<A!>?>|, b: R|B!|): R|kotlin/Unit|
 
     public constructor(): R|test/TypeParameterOfMethod|
 

compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt

@@ -2,7 +2,7 @@ public open class TypeParameterOfOuterClass<T : R|kotlin/Any!|> : R|kotlin/Any|
     public constructor<T : R|kotlin/Any!|>(): R|test/TypeParameterOfOuterClass<T>|
 
     public open inner class Inner<Outer(T) : R|kotlin/Any!|> : R|kotlin/Any| {
-        public open fun foo(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|): R|kotlin/Unit|
+        public open fun foo(comparator: R|ft<java/util/Comparator<T!>, java/util/Comparator<T!>?>|): R|kotlin/Unit|
 
         public test/TypeParameterOfOuterClass<T>.constructor(): R|test/TypeParameterOfOuterClass.Inner<T>|
 

compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt

@@ -6,7 +6,7 @@ public abstract interface InheritedSameAdaptersWithSubstitution : R|kotlin/Any|
 
     }
     public abstract interface Super2<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|ft<java/util/Comparator<T!>, java/util/Comparator<T!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super2Substituted : R|test/InheritedSameAdaptersWithSubstitution.Super2<kotlin/String!>| {

compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt

@@ -4,7 +4,7 @@ public abstract interface ArraysInSubtypes : R|kotlin/Any| {
 
         public abstract fun listOfArray(): R|ft<kotlin/collections/MutableList<out ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>, kotlin/collections/List<out ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>?>|
 
-        public abstract fun objArray(): R|ft<kotlin/Array<ft<T & Any, T?>>, kotlin/Array<out ft<T & Any, T?>>?>|
+        public abstract fun objArray(): R|ft<kotlin/Array<T!>, kotlin/Array<out T!>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {

compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt

@@ -1,6 +1,6 @@
 public abstract interface MethodTypeParameterErased : R|kotlin/Any| {
     public abstract interface Bug<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun <RET : R|ft<test/MethodTypeParameterErased.Bug<ft<T & Any, T?>>, test/MethodTypeParameterErased.Bug<ft<T & Any, T?>>?>|> save(): R|ft<RET & Any, RET?>|
+        public abstract fun <RET : R|ft<test/MethodTypeParameterErased.Bug<T!>, test/MethodTypeParameterErased.Bug<T!>?>|> save(): R|RET!|
 
     }
     public open class SubBug : R|kotlin/Any|, R|test/MethodTypeParameterErased.Bug<kotlin/Any!>| {

compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt

@@ -10,7 +10,7 @@ public open class RawSuperType : R|kotlin/Any| {
 
     }
     public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
-        public abstract fun foo(t: R|ft<T & Any, T?>|): R|kotlin/Unit|
+        public abstract fun foo(t: R|T!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt

@@ -14,7 +14,7 @@ public open class RawSuperTypeWithBound : R|kotlin/Any| {
 
     }
     public abstract interface Super<T : R|test/RawSuperTypeWithBound.Bound!|> : R|kotlin/Any| {
-        public abstract fun foo(t: R|ft<T & Any, T?>|): R|kotlin/Unit|
+        public abstract fun foo(t: R|T!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt

@@ -11,8 +11,8 @@ public open class RawSuperTypeWithRecursiveBound : R|kotlin/Any| {
         public test/RawSuperTypeWithRecursiveBound.constructor(): R|test/RawSuperTypeWithRecursiveBound.Derived|
 
     }
-    public abstract interface Super<T : R|ft<test/RawSuperTypeWithRecursiveBound.Super<ft<T & Any, T?>>, test/RawSuperTypeWithRecursiveBound.Super<ft<T & Any, T?>>?>|> : R|kotlin/Any| {
-        public abstract fun foo(t: R|ft<T & Any, T?>|): R|kotlin/Unit|
+    public abstract interface Super<T : R|ft<test/RawSuperTypeWithRecursiveBound.Super<T!>, test/RawSuperTypeWithRecursiveBound.Super<T!>?>|> : R|kotlin/Any| {
+        public abstract fun foo(t: R|T!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt

@@ -11,8 +11,8 @@ public open class RawSuperTypeWithRecursiveBoundMultipleParameters : R|kotlin/An
         public test/RawSuperTypeWithRecursiveBoundMultipleParameters.constructor(): R|test/RawSuperTypeWithRecursiveBoundMultipleParameters.Derived|
 
     }
-    public abstract interface Super<R : R|kotlin/Any!|, T : R|ft<test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<ft<R & Any, R?>, ft<T & Any, T?>>, test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<ft<R & Any, R?>, ft<T & Any, T?>>?>|> : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<R & Any, R?>|, t: R|ft<T & Any, T?>|): R|kotlin/Unit|
+    public abstract interface Super<R : R|kotlin/Any!|, T : R|ft<test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<R!, T!>, test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<R!, T!>?>|> : R|kotlin/Any| {
+        public abstract fun foo(r: R|R!|, t: R|T!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt

@@ -1,9 +1,9 @@
 public abstract interface ReturnInnerSubclassOfSupersInner : R|kotlin/Any| {
-    public open class Sub<B : R|kotlin/Any!|> : R|test/ReturnInnerSubclassOfSupersInner.Super<ft<B & Any, B?>>| {
+    public open class Sub<B : R|kotlin/Any!|> : R|test/ReturnInnerSubclassOfSupersInner.Super<B!>| {
         public constructor<B : R|kotlin/Any!|>(): R|test/ReturnInnerSubclassOfSupersInner.Sub<B>|
 
-        public/*package*/ open inner class Inner<Outer(B) : R|kotlin/Any!|> : R|test/ReturnInnerSubclassOfSupersInner.Super.Inner<ft<B & Any, B?>>| {
-            public/*package*/ open fun get(): R|ft<test/ReturnInnerSubclassOfSupersInner.Sub<ft<B & Any, B?>>, test/ReturnInnerSubclassOfSupersInner.Sub<ft<B & Any, B?>>?>|
+        public/*package*/ open inner class Inner<Outer(B) : R|kotlin/Any!|> : R|test/ReturnInnerSubclassOfSupersInner.Super.Inner<B!>| {
+            public/*package*/ open fun get(): R|ft<test/ReturnInnerSubclassOfSupersInner.Sub<B!>, test/ReturnInnerSubclassOfSupersInner.Sub<B!>?>|
 
             public/*package*/ test/ReturnInnerSubclassOfSupersInner.Sub<B>.constructor(): R|test/ReturnInnerSubclassOfSupersInner.Sub.Inner<B>|
 
@@ -13,7 +13,7 @@ public abstract interface ReturnInnerSubclassOfSupersInner : R|kotlin/Any| {
         public constructor<A : R|kotlin/Any!|>(): R|test/ReturnInnerSubclassOfSupersInner.Super<A>|
 
         public/*package*/ open inner class Inner<Outer(A) : R|kotlin/Any!|> : R|kotlin/Any| {
-            public/*package*/ open fun get(): R|ft<test/ReturnInnerSubclassOfSupersInner.Super<ft<A & Any, A?>>, test/ReturnInnerSubclassOfSupersInner.Super<ft<A & Any, A?>>?>|
+            public/*package*/ open fun get(): R|ft<test/ReturnInnerSubclassOfSupersInner.Super<A!>, test/ReturnInnerSubclassOfSupersInner.Super<A!>?>|
 
             public/*package*/ test/ReturnInnerSubclassOfSupersInner.Super<A>.constructor(): R|test/ReturnInnerSubclassOfSupersInner.Super.Inner<A>|