FIR: introduce flexible types pretty rendering for no arguments case

#KT-52020 Fixed

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

@@ -1,14 +1,14 @@
 public open class ArrayInGenericArguments : R|kotlin/Any| {
-    public final static field X: R|ft<ArrayInGenericArguments.DataKey<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>, ArrayInGenericArguments.DataKey<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>?>|
+    public final static field X: R|ft<ArrayInGenericArguments.DataKey<ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>, ArrayInGenericArguments.DataKey<ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>?>|
 
-    public final static field Y: R|ft<ArrayInGenericArguments.DataKey<ft<kotlin/IntArray, kotlin/IntArray?>>, ArrayInGenericArguments.DataKey<ft<kotlin/IntArray, kotlin/IntArray?>>?>|
+    public final static field Y: R|ft<ArrayInGenericArguments.DataKey<kotlin/IntArray!>, ArrayInGenericArguments.DataKey<kotlin/IntArray!>?>|
 
-    public final static field Z: R|ft<ArrayInGenericArguments.DataKey<out ft<kotlin/Array<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/Array<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>>, ArrayInGenericArguments.DataKey<out ft<kotlin/Array<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/Array<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>>?>|
+    public final static field Z: R|ft<ArrayInGenericArguments.DataKey<out ft<kotlin/Array<kotlin/CharSequence!>, kotlin/Array<out kotlin/CharSequence!>?>>, ArrayInGenericArguments.DataKey<out ft<kotlin/Array<kotlin/CharSequence!>, kotlin/Array<out kotlin/CharSequence!>?>>?>|
 
     public constructor(): R|ArrayInGenericArguments|
 
-    public open class DataKey<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-        public constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|ArrayInGenericArguments.DataKey<T>|
+    public open class DataKey<T : R|kotlin/Any!|> : R|kotlin/Any| {
+        public constructor<T : R|kotlin/Any!|>(): R|ArrayInGenericArguments.DataKey<T>|
 
     }
 }

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

@@ -1,5 +1,5 @@
 public final class ArrayTypeVariance : R|kotlin/Any| {
-    public final fun toArray(p0: R|ft<kotlin/Array<ft<kotlin/Any, kotlin/Any?>>, kotlin/Array<out ft<kotlin/Any, kotlin/Any?>>?>|): R|ft<kotlin/Array<ft<kotlin/Any, kotlin/Any?>>, kotlin/Array<out ft<kotlin/Any, kotlin/Any?>>?>|
+    public final fun toArray(p0: R|ft<kotlin/Array<kotlin/Any!>, kotlin/Array<out kotlin/Any!>?>|): R|ft<kotlin/Array<kotlin/Any!>, kotlin/Array<out kotlin/Any!>?>|
 
     public constructor(): R|test/ArrayTypeVariance|
 

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

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

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

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

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|ft<kotlin/Any, 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|ft<kotlin/Any, kotlin/Any?>|>(): R|test/ClassWithTypePRefNext<R, P>|
+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>|
 
 }

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

@@ -1,5 +1,5 @@
 public open class FieldOfArrayType : R|kotlin/Any| {
-    public open field files: R|ft<kotlin/Array<ft<java/io/File, java/io/File?>>, kotlin/Array<out ft<java/io/File, java/io/File?>>?>|
+    public open field files: R|ft<kotlin/Array<java/io/File!>, kotlin/Array<out java/io/File!>?>|
 
     public constructor(): R|test/FieldOfArrayType|
 

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

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

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

@@ -1,15 +1,15 @@
 public final class InheritMethodsDifferentReturnTypesGeneric : R|kotlin/Any| {
     public constructor(): R|test/InheritMethodsDifferentReturnTypesGeneric|
 
-    public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypesGeneric.Super1<ft<kotlin/String, kotlin/String?>, ft<kotlin/CharSequence, kotlin/CharSequence?>>|, R|test/InheritMethodsDifferentReturnTypesGeneric.Super2<ft<kotlin/CharSequence, kotlin/CharSequence?>, ft<kotlin/String, kotlin/String?>>| {
+    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|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    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 bar(): R|ft<B & Any, B?>|
 
     }
-    public abstract interface Super2<FF : R|ft<kotlin/Any, kotlin/Any?>|, BB : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    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 bar(): R|ft<BB & Any, BB?>|

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

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

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

@@ -1,23 +1,23 @@
 public open class InnerClassTypeMultipleGeneric : R|kotlin/Any| {
-    public open fun staticType(): R|ft<test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<kotlin/Byte, kotlin/Byte?>, ft<kotlin/Char, kotlin/Char?>, ft<kotlin/Boolean, kotlin/Boolean?>>, test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<kotlin/Byte, kotlin/Byte?>, ft<kotlin/Char, kotlin/Char?>, ft<kotlin/Boolean, kotlin/Boolean?>>?>|
+    public open fun staticType(): R|ft<test/InnerClassTypeMultipleGeneric.Outer.Inner<kotlin/Byte!, kotlin/Char!, kotlin/Boolean!>, test/InnerClassTypeMultipleGeneric.Outer.Inner<kotlin/Byte!, kotlin/Char!, kotlin/Boolean!>?>|
 
     public constructor(): R|test/InnerClassTypeMultipleGeneric|
 
-    public open inner class BaseOuter<H1 : R|ft<kotlin/Any, kotlin/Any?>|, H2 : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-        public test/InnerClassTypeMultipleGeneric.constructor<H1 : R|ft<kotlin/Any, kotlin/Any?>|, H2 : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassTypeMultipleGeneric.BaseOuter<H1, H2>|
+    public open inner class BaseOuter<H1 : R|kotlin/Any!|, H2 : R|kotlin/Any!|> : R|kotlin/Any| {
+        public test/InnerClassTypeMultipleGeneric.constructor<H1 : R|kotlin/Any!|, H2 : R|kotlin/Any!|>(): R|test/InnerClassTypeMultipleGeneric.BaseOuter<H1, H2>|
 
-        public abstract inner class BaseInner<H3 : R|ft<kotlin/Any, kotlin/Any?>|, H4 : R|ft<kotlin/Any, kotlin/Any?>|, H1 : R|ft<kotlin/Any, kotlin/Any?>|, H2 : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-            public test/InnerClassTypeMultipleGeneric.BaseOuter<H1, H2>.constructor<H3 : R|ft<kotlin/Any, kotlin/Any?>|, H4 : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<H3, H4, H1, H2>|
+        public abstract inner class BaseInner<H3 : R|kotlin/Any!|, H4 : R|kotlin/Any!|, H1 : R|kotlin/Any!|, H2 : R|kotlin/Any!|> : R|kotlin/Any| {
+            public test/InnerClassTypeMultipleGeneric.BaseOuter<H1, H2>.constructor<H3 : R|kotlin/Any!|, H4 : R|kotlin/Any!|>(): R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<H3, H4, H1, H2>|
 
         }
     }
-    public open inner class Outer<E1 : R|ft<kotlin/Any, kotlin/Any?>|, E2 : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter<ft<kotlin/Int, kotlin/Int?>, ft<E1 & Any, E1?>>| {
-        public open fun bar(): R|ft<test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<java/lang/Class<*>, java/lang/Class<*>?>, ft<kotlin/CharSequence, kotlin/CharSequence?>, ft<kotlin/Int, kotlin/Int?>, ft<E1 & Any, E1?>>, test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<java/lang/Class<*>, java/lang/Class<*>?>, ft<kotlin/CharSequence, kotlin/CharSequence?>, ft<kotlin/Int, 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!, 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 test/InnerClassTypeMultipleGeneric.constructor<E1 : R|ft<kotlin/Any, kotlin/Any?>|, E2 : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassTypeMultipleGeneric.Outer<E1, E2>|
+        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|ft<kotlin/Any, kotlin/Any?>|, E1 : R|ft<kotlin/Any, kotlin/Any?>|, E2 : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<kotlin/Double, kotlin/Double?>, ft<kotlin/String, kotlin/String?>, ft<E2 & Any, E2?>, ft<E3 & Any, E3?>>| {
-            public test/InnerClassTypeMultipleGeneric.Outer<E1, E2>.constructor<E3 : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassTypeMultipleGeneric.Outer.Inner<E3, E1, E2>|
+        public open inner class Inner<E3 : R|kotlin/Any!|, E1 : R|kotlin/Any!|, E2 : R|kotlin/Any!|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<kotlin/Double!, kotlin/String!, ft<E2 & Any, E2?>, ft<E3 & Any, 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

@@ -1,11 +1,11 @@
-public open class InnerClassesInGeneric<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassesInGeneric<P, Q>|
+public open class InnerClassesInGeneric<P : R|kotlin/Any!|, Q : R|kotlin/Any!|> : R|kotlin/Any| {
+    public constructor<P : R|kotlin/Any!|, Q : R|kotlin/Any!|>(): R|test/InnerClassesInGeneric<P, Q>|
 
-    public open inner class Inner<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public open inner class Inner<P : R|kotlin/Any!|, Q : R|kotlin/Any!|> : R|kotlin/Any| {
         public test/InnerClassesInGeneric<P, Q>.constructor(): R|test/InnerClassesInGeneric.Inner<P, Q>|
 
     }
-    public open inner class Inner2<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerClassesInGeneric.Inner<ft<P & Any, P?>, ft<Q & Any, Q?>>| {
+    public open inner class Inner2<P : R|kotlin/Any!|, 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 test/InnerClassesInGeneric<P, Q>.constructor(): R|test/InnerClassesInGeneric.Inner2<P, Q>|

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

@@ -1,28 +1,28 @@
 public open class InnerOfGeneric : R|kotlin/Any| {
     public constructor(): R|test/InnerOfGeneric|
 
-    public abstract inner class A<K : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-        public test/InnerOfGeneric.constructor<K : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerOfGeneric.A<K>|
+    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<K : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerOfGeneric.S<ft<K & Any, K?>>| {
+        public abstract inner class Inner<K : R|kotlin/Any!|> : R|test/InnerOfGeneric.S<ft<K & Any, K?>>| {
             public test/InnerOfGeneric.A<K>.constructor(): R|test/InnerOfGeneric.A.Inner<K>|
 
         }
     }
-    public open inner class B<L : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerOfGeneric.A<ft<L & Any, L?>>| {
-        public test/InnerOfGeneric.constructor<L : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerOfGeneric.B<L>|
+    public open inner class B<L : R|kotlin/Any!|> : R|test/InnerOfGeneric.A<ft<L & Any, L?>>| {
+        public test/InnerOfGeneric.constructor<L : R|kotlin/Any!|>(): R|test/InnerOfGeneric.B<L>|
 
-        public open inner class SubInner<L : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerOfGeneric.A.Inner<ft<L & Any, L?>>| {
+        public open inner class SubInner<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 test/InnerOfGeneric.B<L>.constructor(): R|test/InnerOfGeneric.B.SubInner<L>|
 
         }
     }
-    public open inner class S<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    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 test/InnerOfGeneric.constructor<E : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerOfGeneric.S<E>|
+        public test/InnerOfGeneric.constructor<E : R|kotlin/Any!|>(): R|test/InnerOfGeneric.S<E>|
 
     }
 }

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

@@ -1,12 +1,12 @@
 public abstract interface IntrinsicCompanionObject : R|kotlin/Any| {
-    public abstract fun testInt(i: R|ft<kotlin/Int.Companion, kotlin/Int.Companion?>|): R|kotlin/Unit|
+    public abstract fun testInt(i: R|kotlin/Int.Companion!|): R|kotlin/Unit|
 
-    public abstract fun testChar(c: R|ft<kotlin/Char.Companion, kotlin/Char.Companion?>|): R|kotlin/Unit|
+    public abstract fun testChar(c: R|kotlin/Char.Companion!|): R|kotlin/Unit|
 
-    public abstract fun testString(s: R|ft<kotlin/String.Companion, kotlin/String.Companion?>|): R|kotlin/Unit|
+    public abstract fun testString(s: R|kotlin/String.Companion!|): R|kotlin/Unit|
 
-    public abstract fun testBoolean(b: R|ft<kotlin/Boolean.Companion, kotlin/Boolean.Companion?>|): R|kotlin/Unit|
+    public abstract fun testBoolean(b: R|kotlin/Boolean.Companion!|): R|kotlin/Unit|
 
-    public abstract fun testEnum(e: R|ft<kotlin/Enum.Companion, kotlin/Enum.Companion?>|): R|kotlin/Unit|
+    public abstract fun testEnum(e: R|kotlin/Enum.Companion!|): R|kotlin/Unit|
 
 }

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

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

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

@@ -1,5 +1,5 @@
 public open class MethodTypePOneUpperBound : R|kotlin/Any| {
-    public open fun <T : R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> bar(): R|kotlin/Unit|
+    public open fun <T : R|kotlin/Cloneable!|> bar(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodTypePOneUpperBound|
 

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

@@ -1,5 +1,5 @@
 public open class MethodTypePTwoUpperBounds : R|kotlin/Any| {
-    public open fun <T : R|ft<kotlin/Cloneable, kotlin/Cloneable?>|, R|ft<java/lang/Runnable, java/lang/Runnable?>|> foo(): R|kotlin/Unit|
+    public open fun <T : R|kotlin/Cloneable!|, R|java/lang/Runnable!|> foo(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodTypePTwoUpperBounds|
 

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

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

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

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

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

@@ -1,6 +1,6 @@
-public open class MethodWithTypePRefClassP<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+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 constructor<P : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/MethodWithTypePRefClassP<P>|
+    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|ft<kotlin/Any, kotlin/Any?>|> f(p: R|ft<P & Any, P?>|): R|kotlin/Unit|
+    public final fun <P : R|kotlin/Any!|> f(p: R|ft<P & Any, P?>|): R|kotlin/Unit|
 
     public constructor(): R|test/MethosWithPRefTP|
 

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

@@ -1,4 +1,4 @@
 public open class MyException : R|kotlin/Any| {
-    public constructor(message: R|ft<kotlin/String, kotlin/String?>|, cause: R|ft<kotlin/Throwable, kotlin/Throwable?>|): R|test/MyException|
+    public constructor(message: R|kotlin/String!|, cause: R|kotlin/Throwable!|): R|test/MyException|
 
 }

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

@@ -2,7 +2,7 @@ public open class OverrideMethod : R|kotlin/Any| {
     public constructor(): R|test/OverrideMethod|
 
     public/*package*/ open inner class Base : R|test/OverrideMethod.SuperBase| {
-        public/*package*/ open fun foo(s: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
+        public/*package*/ open fun foo(s: R|kotlin/String!|): R|kotlin/String!|
 
         public/*package*/ open fun bar(): R|kotlin/Unit|
 
@@ -10,7 +10,7 @@ public open class OverrideMethod : R|kotlin/Any| {
 
     }
     public/*package*/ open inner class Derived : R|test/OverrideMethod.Base| {
-        @R|java/lang/Override|() public/*package*/ open fun foo(s: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
+        @R|java/lang/Override|() public/*package*/ open fun foo(s: R|kotlin/String!|): R|kotlin/String!|
 
         public/*package*/ open fun baz(): R|kotlin/Unit|
 

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

@@ -1,11 +1,11 @@
 public open class Frame : R|kotlin/Any| {
-    public/*package*/ open field accessibleContext: R|ft<kotlin/String, kotlin/String?>|
+    public/*package*/ open field accessibleContext: R|kotlin/String!|
 
     public constructor(): R|awt/Frame|
 
 }
 public open class JFrame : R|awt/Frame| {
-    protected/*protected and package*/ open field accessibleContext: R|ft<kotlin/String, kotlin/String?>|
+    protected/*protected and package*/ open field accessibleContext: R|kotlin/String!|
 
     public constructor(): R|test/JFrame|
 

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

@@ -1,26 +1,26 @@
 public open class RawOverrides : R|kotlin/Any| {
     public constructor(): R|test/RawOverrides|
 
-    public abstract interface A<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-        public abstract fun <E : R|ft<kotlin/CharSequence, 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 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 open inner class B : R|kotlin/Any|, R|test/RawOverrides.A<ft<kotlin/Any, kotlin/Any?>>| {
-        @R|java/lang/Override|() public open fun foo(x: R|ft<kotlin/Any, kotlin/Any?>|, y: R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open inner class B : R|kotlin/Any|, R|test/RawOverrides.A<kotlin/Any!>| {
+        @R|java/lang/Override|() public open fun foo(x: R|kotlin/Any!|, y: R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|): R|kotlin/String!|
 
         public test/RawOverrides.constructor(): R|test/RawOverrides.B|
 
     }
     public open inner class C : R|kotlin/Any| {
-        public/*package*/ open fun <E : R|ft<kotlin/CharSequence, 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|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 test/RawOverrides.constructor(): R|test/RawOverrides.C|
 
     }
     public open inner class D : R|test/RawOverrides.C| {
-        @R|java/lang/Override|() public open fun bar(x: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, y: R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|): R|ft<kotlin/String, kotlin/String?>|
+        @R|java/lang/Override|() public open fun bar(x: R|kotlin/CharSequence!|, y: R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|): R|kotlin/String!|
 
-        public/*package*/ open fun <E : R|ft<kotlin/CharSequence, 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|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 test/RawOverrides.constructor(): R|test/RawOverrides.D|
 

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

@@ -1,10 +1,10 @@
 public abstract interface RawTypeWithUpperBound : R|kotlin/Any| {
     public abstract interface Bar : R|kotlin/Any| {
-        public abstract fun f(f: R|ft<test/RawTypeWithUpperBound.Foo<ft<kotlin/CharSequence, kotlin/CharSequence?>>, test/RawTypeWithUpperBound.Foo<*>?>|): R|kotlin/Unit|
+        public abstract fun f(f: R|ft<test/RawTypeWithUpperBound.Foo<kotlin/CharSequence!>, test/RawTypeWithUpperBound.Foo<*>?>|): R|kotlin/Unit|
 
-        public abstract fun g(f: R|ft<kotlin/collections/MutableList<ft<test/RawTypeWithUpperBound.Foo<ft<kotlin/CharSequence, kotlin/CharSequence?>>, test/RawTypeWithUpperBound.Foo<*>?>>, kotlin/collections/List<ft<test/RawTypeWithUpperBound.Foo<ft<kotlin/CharSequence, kotlin/CharSequence?>>, test/RawTypeWithUpperBound.Foo<*>?>>?>|): R|kotlin/Unit|
+        public abstract fun g(f: R|ft<kotlin/collections/MutableList<ft<test/RawTypeWithUpperBound.Foo<kotlin/CharSequence!>, test/RawTypeWithUpperBound.Foo<*>?>>, kotlin/collections/List<ft<test/RawTypeWithUpperBound.Foo<kotlin/CharSequence!>, test/RawTypeWithUpperBound.Foo<*>?>>?>|): R|kotlin/Unit|
 
     }
-    public abstract interface Foo<T : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> : R|kotlin/Any| {
+    public abstract interface Foo<T : R|kotlin/CharSequence!|> : R|kotlin/Any| {
     }
 }

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

@@ -1,6 +1,6 @@
 public abstract interface RemoveRedundantProjectionKind : R|kotlin/Any| {
-    public abstract fun f(collection: R|ft<kotlin/collections/MutableCollection<out ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/collections/Collection<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|): R|kotlin/Unit|
+    public abstract fun f(collection: R|ft<kotlin/collections/MutableCollection<out kotlin/CharSequence!>, kotlin/collections/Collection<out kotlin/CharSequence!>?>|): R|kotlin/Unit|
 
-    public abstract fun f(comparator: R|ft<kotlin/Comparable<in ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/Comparable<in ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|): R|kotlin/Unit|
+    public abstract fun f(comparator: R|ft<kotlin/Comparable<in kotlin/CharSequence!>, kotlin/Comparable<in kotlin/CharSequence!>?>|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt

@@ -1,5 +1,5 @@
 public open class TopLevel$Class : R|kotlin/Any| {
-    public open fun foo(other: R|ft<test/TopLevel$Class, test/TopLevel$Class?>|): R|kotlin/Unit|
+    public open fun foo(other: R|test/TopLevel$Class!|): R|kotlin/Unit|
 
     public constructor(): R|test/TopLevel$Class|
 

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

@@ -5,6 +5,6 @@ public final class UnboundWildcard : R|kotlin/Any| {
 
     public constructor(): R|test/UnboundWildcard|
 
-    public abstract interface MyClass<T : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> : R|kotlin/Any| {
+    public abstract interface MyClass<T : R|kotlin/CharSequence!|> : R|kotlin/Any| {
     }
 }

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

@@ -1,10 +1,10 @@
 public open class WildcardBounds : R|kotlin/Any| {
-    public/*package*/ open fun foo(x: R|ft<test/WildcardBounds.A<out ft<kotlin/CharSequence, kotlin/CharSequence?>>, test/WildcardBounds.A<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|, y: R|ft<test/WildcardBounds.A<in ft<kotlin/String, kotlin/String?>>, test/WildcardBounds.A<in ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+    public/*package*/ open fun foo(x: R|ft<test/WildcardBounds.A<out kotlin/CharSequence!>, test/WildcardBounds.A<out kotlin/CharSequence!>?>|, y: R|ft<test/WildcardBounds.A<in kotlin/String!>, test/WildcardBounds.A<in kotlin/String!>?>|): R|kotlin/Unit|
 
     public constructor(): R|test/WildcardBounds|
 
-    public/*package*/ open class A<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-        public/*package*/ constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/WildcardBounds.A<T>|
+    public/*package*/ open class A<T : R|kotlin/Any!|> : R|kotlin/Any| {
+        public/*package*/ constructor<T : R|kotlin/Any!|>(): R|test/WildcardBounds.A<T>|
 
     }
 }

compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt

@@ -6,11 +6,11 @@ public/*package*/ open class AnnotatedParameterInInnerClassConstructor : R|kotli
 
     }
     public/*package*/ open inner class Inner : R|kotlin/Any| {
-        public/*package*/ test/AnnotatedParameterInInnerClassConstructor.constructor(@R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(a)) a: R|ft<kotlin/String, kotlin/String?>|, @R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(b)) b: R|ft<kotlin/String, kotlin/String?>|): R|test/AnnotatedParameterInInnerClassConstructor.Inner|
+        public/*package*/ test/AnnotatedParameterInInnerClassConstructor.constructor(@R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(a)) a: R|kotlin/String!|, @R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(b)) b: R|kotlin/String!|): R|test/AnnotatedParameterInInnerClassConstructor.Inner|
 
     }
-    public/*package*/ open inner class InnerGeneric<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-        public/*package*/ test/AnnotatedParameterInInnerClassConstructor.constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(@R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(a)) a: R|ft<kotlin/String, kotlin/String?>|, @R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(b)) b: R|ft<kotlin/String, kotlin/String?>|): R|test/AnnotatedParameterInInnerClassConstructor.InnerGeneric<T>|
+    public/*package*/ open inner class InnerGeneric<T : R|kotlin/Any!|> : R|kotlin/Any| {
+        public/*package*/ test/AnnotatedParameterInInnerClassConstructor.constructor<T : R|kotlin/Any!|>(@R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(a)) a: R|kotlin/String!|, @R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(b)) b: R|kotlin/String!|): R|test/AnnotatedParameterInInnerClassConstructor.InnerGeneric<T>|
 
     }
 }

compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt

@@ -1,5 +1,5 @@
 public/*package*/ open class AnnotatedTypeInFun : R|kotlin/Any| {
-    public/*package*/ open fun foo(@R|test/AnnotatedTypeInFun.Anno|(value = String(a)) a: R|ft<@R|test/AnnotatedTypeInFun.Anno|(value = String(a))  kotlin/String, @R|test/AnnotatedTypeInFun.Anno|(value = String(a))  kotlin/String?>|, @R|test/AnnotatedTypeInFun.Anno|(value = String(b)) b: R|ft<@R|test/AnnotatedTypeInFun.Anno|(value = String(b))  kotlin/String, @R|test/AnnotatedTypeInFun.Anno|(value = String(b))  kotlin/String?>|): R|kotlin/Unit|
+    public/*package*/ open fun foo(@R|test/AnnotatedTypeInFun.Anno|(value = String(a)) a: R|@R|test/AnnotatedTypeInFun.Anno|(value = String(a))  kotlin/String!|, @R|test/AnnotatedTypeInFun.Anno|(value = String(b)) b: R|@R|test/AnnotatedTypeInFun.Anno|(value = String(b))  kotlin/String!|): R|kotlin/Unit|
 
     public/*package*/ constructor(): R|test/AnnotatedTypeInFun|
 

compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt

@@ -1,5 +1,5 @@
 public open class AnnotatedValueParameter : R|kotlin/Any| {
-    public open fun f(@R|test/AnnotatedValueParameter.Anno|(value = String(non-empty)) parameter: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+    public open fun f(@R|test/AnnotatedValueParameter.Anno|(value = String(non-empty)) parameter: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
     public constructor(): R|test/AnnotatedValueParameter|
 

compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt

@@ -5,7 +5,7 @@ public open class ClassObjectArrayInParam : R|kotlin/Any| {
         public constructor(vararg value: R|kotlin/Array<kotlin/reflect/KClass<*>>|): R|test/ClassObjectArrayInParam.Anno|
 
     }
-    @R|test/ClassObjectArrayInParam.Anno|(value = <implicitArrayOf>(<getClass>(<getClass>(R|ft<test/ClassObjectArrayInParam, test/ClassObjectArrayInParam?>|)), <getClass>(<getClass>(R|ft<test/ClassObjectArrayInParam.Nested, test/ClassObjectArrayInParam.Nested?>|)), <getClass>(<getClass>(R|ft<kotlin/String, kotlin/String?>|)), <getClass>(<getClass>(R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|)), <getClass>(<getClass>(R|ft<kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>, kotlin/Array<out ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>?>|)), <getClass>(<getClass>(R|ft<kotlin/Array<ft<kotlin/IntArray, kotlin/IntArray?>>, kotlin/Array<out ft<kotlin/IntArray, kotlin/IntArray?>>?>|)), <getClass>(<getClass>(R|kotlin/Unit|)))) public open class Nested : R|kotlin/Any| {
+    @R|test/ClassObjectArrayInParam.Anno|(value = <implicitArrayOf>(<getClass>(<getClass>(R|test/ClassObjectArrayInParam!|)), <getClass>(<getClass>(R|test/ClassObjectArrayInParam.Nested!|)), <getClass>(<getClass>(R|kotlin/String!|)), <getClass>(<getClass>(R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|)), <getClass>(<getClass>(R|ft<kotlin/Array<ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>, kotlin/Array<out ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>?>|)), <getClass>(<getClass>(R|ft<kotlin/Array<kotlin/IntArray!>, kotlin/Array<out kotlin/IntArray!>?>|)), <getClass>(<getClass>(R|kotlin/Unit|)))) public open class Nested : R|kotlin/Any| {
         public constructor(): R|test/ClassObjectArrayInParam.Nested|
 
     }

compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt

@@ -5,7 +5,7 @@ public open class ClassObjectInParam : R|kotlin/Any| {
         public constructor(value: R|kotlin/reflect/KClass<*>|): R|test/ClassObjectInParam.Anno|
 
     }
-    @R|test/ClassObjectInParam.Anno|(value = <getClass>(<getClass>(R|ft<test/ClassObjectInParam, test/ClassObjectInParam?>|))) public open class Nested : R|kotlin/Any| {
+    @R|test/ClassObjectInParam.Anno|(value = <getClass>(<getClass>(R|test/ClassObjectInParam!|))) public open class Nested : R|kotlin/Any| {
         public constructor(): R|test/ClassObjectInParam.Nested|
 
     }

compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt

@@ -5,7 +5,7 @@ public open class ClassObjectInParamRaw : R|kotlin/Any| {
         public constructor(value: R|kotlin/reflect/KClass<*>|, arg: R|kotlin/Array<kotlin/reflect/KClass<*>>|): R|test/ClassObjectInParamRaw.Anno|
 
     }
-    @R|test/ClassObjectInParamRaw.Anno|(value = <getClass>(<getClass>(R|ft<test/ClassObjectInParamRaw, test/ClassObjectInParamRaw?>|)), arg = <implicitArrayOf>()) public open class Nested : R|kotlin/Any| {
+    @R|test/ClassObjectInParamRaw.Anno|(value = <getClass>(<getClass>(R|test/ClassObjectInParamRaw!|)), arg = <implicitArrayOf>()) public open class Nested : R|kotlin/Any| {
         public constructor(): R|test/ClassObjectInParamRaw.Nested|
 
     }

compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt

@@ -2,7 +2,7 @@ public open class ClassObjectInParamVariance : R|kotlin/Any| {
     public constructor(): R|test/ClassObjectInParamVariance|
 
     public final annotation class Anno : R|kotlin/Annotation| {
-        public constructor(arg1: R|kotlin/reflect/KClass<out ft<kotlin/Int, kotlin/Int?>>|, arg2: R|kotlin/reflect/KClass<in ft<kotlin/Int, kotlin/Int?>>|, arg3: R|kotlin/Array<kotlin/reflect/KClass<out ft<kotlin/Int, kotlin/Int?>>>|, arg4: R|kotlin/Array<kotlin/reflect/KClass<in ft<kotlin/Int, kotlin/Int?>>>|, arg5: R|kotlin/Array<kotlin/reflect/KClass<out ft<java/lang/Class<*>, java/lang/Class<*>?>>>|, arg6: R|kotlin/Array<kotlin/reflect/KClass<in ft<java/lang/Class<*>, java/lang/Class<*>?>>>|, arg7: R|kotlin/Array<kotlin/reflect/KClass<out ft<java/lang/Class<ft<kotlin/Int, kotlin/Int?>>, java/lang/Class<ft<kotlin/Int, kotlin/Int?>>?>>>|, arg8: R|kotlin/Array<kotlin/reflect/KClass<in ft<java/lang/Class<ft<kotlin/Int, kotlin/Int?>>, java/lang/Class<ft<kotlin/Int, kotlin/Int?>>?>>>|): R|test/ClassObjectInParamVariance.Anno|
+        public constructor(arg1: R|kotlin/reflect/KClass<out kotlin/Int!>|, arg2: R|kotlin/reflect/KClass<in kotlin/Int!>|, arg3: R|kotlin/Array<kotlin/reflect/KClass<out kotlin/Int!>>|, arg4: R|kotlin/Array<kotlin/reflect/KClass<in kotlin/Int!>>|, arg5: R|kotlin/Array<kotlin/reflect/KClass<out ft<java/lang/Class<*>, java/lang/Class<*>?>>>|, arg6: R|kotlin/Array<kotlin/reflect/KClass<in ft<java/lang/Class<*>, java/lang/Class<*>?>>>|, arg7: R|kotlin/Array<kotlin/reflect/KClass<out ft<java/lang/Class<kotlin/Int!>, java/lang/Class<kotlin/Int!>?>>>|, arg8: R|kotlin/Array<kotlin/reflect/KClass<in ft<java/lang/Class<kotlin/Int!>, java/lang/Class<kotlin/Int!>?>>>|): R|test/ClassObjectInParamVariance.Anno|
 
     }
 }

compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.fir.txt

@@ -3,7 +3,7 @@ public abstract interface CustomAnnotation : R|kotlin/Any| {
         public constructor(value: R|test/CustomAnnotation.MyEnum|): R|test/CustomAnnotation.MyAnnotation|
 
     }
-    public final enum class MyEnum : R|kotlin/Enum<ft<test/CustomAnnotation.MyEnum, test/CustomAnnotation.MyEnum?>>| {
+    public final enum class MyEnum : R|kotlin/Enum<test/CustomAnnotation.MyEnum!>| {
         public final static enum entry ONE: R|@EnhancedNullability test/CustomAnnotation.MyEnum|
         public final static fun values(): R|kotlin/Array<test/CustomAnnotation.MyEnum>| {
         }

compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt

@@ -3,7 +3,7 @@ public open class EnumArgumentWithCustomToString : R|kotlin/Any| {
 
     public constructor(): R|test/EnumArgumentWithCustomToString|
 
-    public final enum class E : R|kotlin/Enum<ft<test/EnumArgumentWithCustomToString.E, test/EnumArgumentWithCustomToString.E?>>| {
+    public final enum class E : R|kotlin/Enum<test/EnumArgumentWithCustomToString.E!>| {
         public final static enum entry CAKE: R|@EnhancedNullability test/EnumArgumentWithCustomToString.E|
         public final static fun values(): R|kotlin/Array<test/EnumArgumentWithCustomToString.E>| {
         }

compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt

@@ -1,6 +1,6 @@
-public final enum class EnumConstructorParameter : R|kotlin/Enum<ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>>| {
+public final enum class EnumConstructorParameter : R|kotlin/Enum<test/EnumConstructorParameter!>| {
     public final static enum entry INSTANCE: R|@EnhancedNullability test/EnumConstructorParameter|
-    private constructor(@R|test/EnumConstructorParameter.Anno|(value = String(string)) s: R|ft<kotlin/String, kotlin/String?>|): R|test/EnumConstructorParameter|
+    private constructor(@R|test/EnumConstructorParameter.Anno|(value = String(string)) s: R|kotlin/String!|): R|test/EnumConstructorParameter|
 
     private constructor(x: R|kotlin/Int|): R|test/EnumConstructorParameter|
 

compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt

@@ -1,5 +1,5 @@
 public open class JavaDocDeprecated : R|kotlin/Any| {
-    public open fun getFoo(text: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun getFoo(text: R|kotlin/String!|): R|kotlin/String!|
 
     public constructor(): R|test/JavaDocDeprecated|
 

compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt

@@ -7,7 +7,7 @@ public open class NestedEnumArgument : R|kotlin/Any| {
         public constructor(value: R|test/NestedEnumArgument.E|): R|test/NestedEnumArgument.Anno|
 
     }
-    public final enum class E : R|kotlin/Enum<ft<test/NestedEnumArgument.E, test/NestedEnumArgument.E?>>| {
+    public final enum class E : R|kotlin/Enum<test/NestedEnumArgument.E!>| {
         public final static enum entry FIRST: R|@EnhancedNullability test/NestedEnumArgument.E|
         public final static fun values(): R|kotlin/Array<test/NestedEnumArgument.E>| {
         }

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

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

compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt

@@ -1,4 +1,4 @@
-public final enum class EnumMembers : R|kotlin/Enum<ft<test/EnumMembers, test/EnumMembers?>>| {
+public final enum class EnumMembers : R|kotlin/Enum<test/EnumMembers!>| {
     public final static enum entry FIRST: R|@EnhancedNullability test/EnumMembers|
     public final static enum entry SECOND: R|@EnhancedNullability test/EnumMembers|
     public final field isFirst: R|kotlin/Boolean|

compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt

@@ -1,4 +1,4 @@
-public final enum class EnumWithSpecializedEntry : R|kotlin/Enum<ft<test/EnumWithSpecializedEntry, test/EnumWithSpecializedEntry?>>| {
+public final enum class EnumWithSpecializedEntry : R|kotlin/Enum<test/EnumWithSpecializedEntry!>| {
     public final static enum entry E1: R|@EnhancedNullability test/EnumWithSpecializedEntry|
     public final static enum entry E2: R|@EnhancedNullability test/EnumWithSpecializedEntry|
     public final static fun values(): R|kotlin/Array<test/EnumWithSpecializedEntry>| {

compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt

@@ -1,4 +1,4 @@
-public final enum class JavaEnum : R|kotlin/Enum<ft<test/JavaEnum, test/JavaEnum?>>| {
+public final enum class JavaEnum : R|kotlin/Enum<test/JavaEnum!>| {
     public final static enum entry ENTRY: R|@EnhancedNullability test/JavaEnum|
     public final static enum entry ANOTHER: R|@EnhancedNullability test/JavaEnum|
     public final static fun values(): R|kotlin/Array<test/JavaEnum>| {

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

@@ -1,5 +1,5 @@
 public open class DifferentGetterAndSetter : R|kotlin/Any| {
-    public open fun setSomething(color: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+    public open fun setSomething(color: R|kotlin/String!|): R|kotlin/Unit|
 
     public open fun getSomething(): R|kotlin/Int|
 

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

@@ -1,5 +1,5 @@
 public open class JavaBeanVal : R|kotlin/Any| {
-    public open fun getColor(): R|ft<kotlin/String, kotlin/String?>|
+    public open fun getColor(): R|kotlin/String!|
 
     public constructor(): R|test/JavaBeanVal|
 

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

@@ -1,7 +1,7 @@
 public open class JavaBeanVar : R|kotlin/Any| {
-    public open fun getColor(): R|ft<kotlin/String, kotlin/String?>|
+    public open fun getColor(): R|kotlin/String!|
 
-    public open fun setColor(string: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+    public open fun setColor(string: R|kotlin/String!|): R|kotlin/Unit|
 
     public constructor(): R|test/JavaBeanVar|
 

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

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

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

@@ -1,5 +1,5 @@
 public open class TwoSetters : R|kotlin/Any| {
-    public open fun setSize(size: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+    public open fun setSize(size: R|kotlin/String!|): R|kotlin/Unit|
 
     public open fun setSize(size: R|kotlin/Int|): R|kotlin/Unit|
 

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

@@ -1,5 +1,5 @@
 public open class AllBoundsInWhen : R|kotlin/Any| {
-    public open fun <T : R|ft<java/io/Serializable, java/io/Serializable?>|> foo(): R|kotlin/Unit|
+    public open fun <T : R|java/io/Serializable!|> foo(): R|kotlin/Unit|
 
     public constructor(): R|test/AllBoundsInWhen|
 

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

@@ -1,5 +1,5 @@
 public open class ArrayType : R|kotlin/Any| {
-    public open fun foo(): R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|
+    public open fun foo(): R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|
 
     public constructor(): R|test/ArrayType|
 

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

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

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

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

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

@@ -1,4 +1,4 @@
 public open class ConstructorWithSeveralParams : R|kotlin/Any| {
-    public constructor(integer: R|ft<kotlin/Int, kotlin/Int?>|, intBasic: R|kotlin/Int|, collection: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|): R|test/ConstructorWithSeveralParams|
+    public constructor(integer: R|kotlin/Int!|, intBasic: R|kotlin/Int|, collection: R|ft<java/util/ArrayList<kotlin/String!>, java/util/ArrayList<kotlin/String!>?>|): R|test/ConstructorWithSeveralParams|
 
 }

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

@@ -1,5 +1,5 @@
 public open class CustomProjectionKind : R|kotlin/Any| {
-    public open fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>>?>|
+    public open fun foo(): R|ft<kotlin/collections/MutableList<kotlin/Number!>, kotlin/collections/List<kotlin/Number!>?>|
 
     public constructor(): R|test/CustomProjectionKind|
 

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

@@ -1,5 +1,5 @@
 public open class MethodWithFunctionTypes : R|kotlin/Any| {
-    public open fun foo(f: R|ft<kotlin/Function1<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/Function1<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>|): R|ft<kotlin/Function0<ft<kotlin/String, kotlin/String?>>, kotlin/Function0<ft<kotlin/String, kotlin/String?>>?>|
+    public open fun foo(f: R|ft<kotlin/Function1<kotlin/String!, kotlin/String!>, kotlin/Function1<kotlin/String!, kotlin/String!>?>|): R|ft<kotlin/Function0<kotlin/String!>, kotlin/Function0<kotlin/String!>?>|
 
     public constructor(): R|test/MethodWithFunctionTypes|
 

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

@@ -1,5 +1,5 @@
 public open class MethodWithGenerics : R|kotlin/Any| {
-    public open fun foo(a: R|ft<kotlin/String, kotlin/String?>|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo(a: R|kotlin/String!|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<kotlin/String!, kotlin/String!>, kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<kotlin/String!, kotlin/String!>, kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>?>>?>|): R|kotlin/String!|
 
     public constructor(): R|test/MethodWithGenerics|
 

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

@@ -1,7 +1,7 @@
 public open class MethodWithMappedClasses : R|kotlin/Any| {
-    public open fun <T : R|ft<kotlin/Any, 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 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|ft<kotlin/Any, kotlin/Any?>|> copyMap(dest: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, in ft<T & Any, T?>>, kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, in ft<T & Any, T?>>?>|, src: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, ft<T & Any, T?>>, kotlin/collections/Map<ft<kotlin/String, 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 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 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|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<java/lang/Runnable, java/lang/Runnable?>|, R|ft<kotlin/collections/MutableList<ft<kotlin/Cloneable, kotlin/Cloneable?>>, kotlin/collections/List<ft<kotlin/Cloneable, 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 ft<kotlin/String, kotlin/String?>>, kotlin/collections/MutableList<in ft<kotlin/String, 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|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 constructor(): R|test/MethodWithTypeParameters|
 

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

@@ -1,5 +1,5 @@
 public open class MethodWithVararg : R|kotlin/Any| {
-    public open fun foo(vararg s: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+    public open fun foo(vararg s: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithVararg|
 

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

@@ -1,10 +1,10 @@
-public open class PropertyArrayTypes<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-    public open field arrayOfArrays: R|ft<kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>, kotlin/Array<out ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>?>|
+public open class PropertyArrayTypes<T : R|kotlin/Any!|> : R|kotlin/Any| {
+    public open field arrayOfArrays: R|ft<kotlin/Array<ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>, kotlin/Array<out ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>?>|
 
-    public open field array: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|
+    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 constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/PropertyArrayTypes<T>|
+    public constructor<T : R|kotlin/Any!|>(): R|test/PropertyArrayTypes<T>|
 
 }

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

@@ -1,12 +1,12 @@
-public open class PropertyComplexTypes<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+public open class PropertyComplexTypes<T : R|kotlin/Any!|> : R|kotlin/Any| {
     public open field genericType: R|ft<T & Any, T?>|
 
-    public open field listDefinedGeneric: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|
+    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 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 constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/PropertyComplexTypes<T>|
+    public constructor<T : R|kotlin/Any!|>(): R|test/PropertyComplexTypes<T>|
 
 }

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

@@ -1,7 +1,7 @@
 public open class PropertySimpleType : R|kotlin/Any| {
-    public open field fieldOne: R|ft<kotlin/String, kotlin/String?>|
+    public open field fieldOne: R|kotlin/String!|
 
-    public open field fieldTwo: R|ft<kotlin/String, kotlin/String?>|
+    public open field fieldTwo: R|kotlin/String!|
 
     public constructor(): R|test/PropertySimpleType|
 

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

@@ -3,6 +3,6 @@ public final class StarProjection : R|kotlin/Any| {
 
     public constructor(): R|test/StarProjection|
 
-    public abstract interface MyClass<T : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> : R|kotlin/Any| {
+    public abstract interface MyClass<T : R|kotlin/CharSequence!|> : R|kotlin/Any| {
     }
 }

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

@@ -1,5 +1,5 @@
 public open class WrongProjectionKind : R|kotlin/Any| {
-    public open fun copy(from: R|ft<kotlin/Array<ft<kotlin/Number, kotlin/Number?>>, kotlin/Array<out ft<kotlin/Number, kotlin/Number?>>?>|, to: R|ft<kotlin/Array<ft<kotlin/Number, kotlin/Number?>>, kotlin/Array<out ft<kotlin/Number, kotlin/Number?>>?>|): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>>?>|
+    public open fun copy(from: R|ft<kotlin/Array<kotlin/Number!>, kotlin/Array<out kotlin/Number!>?>|, to: R|ft<kotlin/Array<kotlin/Number!>, kotlin/Array<out kotlin/Number!>?>|): R|ft<kotlin/collections/MutableList<kotlin/Number!>, kotlin/collections/List<kotlin/Number!>?>|
 
     public constructor(): R|test/WrongProjectionKind|
 

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

@@ -1,5 +1,5 @@
 public open class WrongReturnTypeStructure : R|kotlin/Any| {
-    public open fun foo(a: R|ft<kotlin/String, kotlin/String?>|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo(a: R|kotlin/String!|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<kotlin/String!, kotlin/String!>, kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<kotlin/String!, kotlin/String!>, kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>?>>?>|): R|kotlin/String!|
 
     public constructor(): R|test/WrongReturnTypeStructure|
 

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|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<java/lang/Runnable, java/lang/Runnable?>|, R|ft<kotlin/collections/MutableList<ft<kotlin/Cloneable, kotlin/Cloneable?>>, kotlin/collections/List<ft<kotlin/Cloneable, 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|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 constructor(): R|test/WrongTypeParameterBoundStructure1|
 

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

@@ -1,5 +1,5 @@
 public open class WrongValueParameterStructure1 : R|kotlin/Any| {
-    public open fun foo(a: R|ft<kotlin/String, kotlin/String?>|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo(a: R|kotlin/String!|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<kotlin/String!, kotlin/String!>, kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<kotlin/String!, kotlin/String!>, kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>?>>?>|): R|kotlin/String!|
 
     public constructor(): R|test/WrongValueParameterStructure1|
 

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.fir.txt

@@ -1,30 +1,30 @@
 public abstract interface PropagateTypeArgumentNullable : R|kotlin/Any| {
     public abstract interface Sub : R|test/PropagateTypeArgumentNullable.Super| {
-        public abstract fun outS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun outS(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
-        public abstract fun invOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|): R|kotlin/Unit|
+        public abstract fun invOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|): R|kotlin/Unit|
 
-        public abstract fun outOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|): R|kotlin/Unit|
+        public abstract fun outOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|): R|kotlin/Unit|
 
-        public abstract fun outR(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun outR(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
-        public abstract fun invR(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun invR(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
-        public abstract fun invOutR(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+        public abstract fun invOutR(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun outS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun outS(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
-        public abstract fun invOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|): R|kotlin/Unit|
+        public abstract fun invOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|): R|kotlin/Unit|
 
-        public abstract fun outOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|): R|kotlin/Unit|
+        public abstract fun outOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|): R|kotlin/Unit|
 
-        public abstract fun outR(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun outR(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
-        public abstract fun invR(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun invR(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
-        public abstract fun invOutR(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+        public abstract fun invOutR(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|
 
     }
 }

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

@@ -1,10 +1,10 @@
 public abstract interface ChangeProjectionKind1 : R|kotlin/Any| {
     public abstract interface Sub : R|test/ChangeProjectionKind1.Super| {
-        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

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

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

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

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

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

@@ -1,10 +1,10 @@
 public abstract interface InheritNotVararg : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVararg.Super| {
-        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

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

@@ -1,10 +1,10 @@
 public abstract interface InheritNotVarargInteger : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVarargInteger.Super| {
-        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/Int!>, kotlin/Array<out kotlin/Int!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/Array<kotlin/Int!>, kotlin/Array<out kotlin/Int!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

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

@@ -1,10 +1,10 @@
 public abstract interface InheritNotVarargNotNull : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVarargNotNull.Super| {
-        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

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

@@ -1,10 +1,10 @@
 public abstract interface InheritNotVarargPrimitive : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVarargPrimitive.Super| {
-        public abstract fun foo(vararg p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p: R|kotlin/IntArray!|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|kotlin/IntArray!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

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

@@ -1,10 +1,10 @@
 public abstract interface InheritVararg : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritVararg.Super| {
-        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

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

@@ -1,10 +1,10 @@
 public abstract interface InheritVarargInteger : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritVarargInteger.Super| {
-        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/Array<kotlin/Int!>, kotlin/Array<out kotlin/Int!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/Int!>, kotlin/Array<out kotlin/Int!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

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

@@ -1,10 +1,10 @@
 public abstract interface InheritVarargNotNull : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritVarargNotNull.Super| {
-        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

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

@@ -1,10 +1,10 @@
 public abstract interface InheritVarargPrimitive : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritVarargPrimitive.Super| {
-        public abstract fun foo(p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|kotlin/IntArray!|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(vararg p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p: R|kotlin/IntArray!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

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

@@ -1,15 +1,15 @@
 public abstract interface Kt3302 : R|kotlin/Any| {
     public abstract interface BSONObject : R|kotlin/Any| {
-        public abstract fun put(@R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|, @R|org/jetbrains/annotations/NotNull|() o: R|@EnhancedNullability kotlin/Any|): R|ft<kotlin/Any, kotlin/Any?>|
+        public abstract fun put(@R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|, @R|org/jetbrains/annotations/NotNull|() o: R|@EnhancedNullability kotlin/Any|): R|kotlin/Any!|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
-    public abstract interface BasicBSONObject : R|test/Kt3302.LinkedHashMap<ft<kotlin/String, kotlin/String?>, ft<kotlin/Any, kotlin/Any?>>|, R|test/Kt3302.BSONObject| {
-        @R|java/lang/Override|() public abstract fun put(key: R|@EnhancedNullability kotlin/String|, value: R|@EnhancedNullability kotlin/Any|): R|ft<kotlin/Any, kotlin/Any?>|
+    public abstract interface BasicBSONObject : R|test/Kt3302.LinkedHashMap<kotlin/String!, kotlin/Any!>|, R|test/Kt3302.BSONObject| {
+        @R|java/lang/Override|() public abstract fun put(key: R|@EnhancedNullability kotlin/String|, value: R|@EnhancedNullability kotlin/Any|): R|kotlin/Any!|
 
     }
-    public abstract interface LinkedHashMap<K : R|ft<kotlin/Any, kotlin/Any?>|, V : R|ft<kotlin/Any, kotlin/Any?>|> : 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 dummy(): R|kotlin/Unit|

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

@@ -1,10 +1,10 @@
 public abstract interface MutableToReadOnly : R|kotlin/Any| {
     public abstract interface Sub : R|test/MutableToReadOnly.Super| {
-        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

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

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

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

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

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

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

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

@@ -1,10 +1,10 @@
 public abstract interface ReadOnlyToMutable : R|kotlin/Any| {
     public abstract interface Sub : R|test/ReadOnlyToMutable.Super| {
-        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

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

@@ -1,5 +1,5 @@
 public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
-    public abstract interface Generic<T : R|ft<kotlin/Any, kotlin/Any?>|> : 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 dummy(): R|kotlin/Unit|
@@ -11,7 +11,7 @@ public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
-    public abstract interface Sub : R|test/SubclassFromGenericAndNot.NonGeneric|, R|test/SubclassFromGenericAndNot.Generic<ft<kotlin/String, kotlin/String?>>| {
+    public abstract interface Sub : R|test/SubclassFromGenericAndNot.NonGeneric|, R|test/SubclassFromGenericAndNot.Generic<kotlin/String!>| {
         @R|java/lang/Override|() public abstract fun foo(key: R|@EnhancedNullability kotlin/String|): R|kotlin/Unit|
 
     }

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

@@ -1,9 +1,9 @@
 public abstract interface SubstitutedClassParameter : R|kotlin/Any| {
-    public abstract interface Sub : R|test/SubstitutedClassParameter.Super<ft<kotlin/String, kotlin/String?>>| {
-        public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+    public abstract interface Sub : R|test/SubstitutedClassParameter.Super<kotlin/String!>| {
+        public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
 
     }
-    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : 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 dummy(): R|kotlin/Unit|

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

@@ -1,15 +1,15 @@
 public abstract interface SubstitutedClassParameters : R|kotlin/Any| {
-    public abstract interface Sub : R|test/SubstitutedClassParameters.Super1<ft<kotlin/String, kotlin/String?>>|, R|test/SubstitutedClassParameters.Super2<ft<kotlin/String, kotlin/String?>>| {
-        public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+    public abstract interface Sub : R|test/SubstitutedClassParameters.Super1<kotlin/String!>|, R|test/SubstitutedClassParameters.Super2<kotlin/String!>| {
+        public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
 
     }
-    public abstract interface Super1<T : R|ft<kotlin/Any, kotlin/Any?>|> : 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 dummy(): R|kotlin/Unit|
 
     }
-    public abstract interface Super2<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    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 dummy(): R|kotlin/Unit|

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

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

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

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

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

@@ -1,10 +1,10 @@
 public abstract interface AddNullabilitySameGenericType1 : R|kotlin/Any| {
     public abstract interface Sub : R|test/AddNullabilitySameGenericType1.Super| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

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

@@ -1,10 +1,10 @@
 public abstract interface AddNullabilitySameGenericType2 : R|kotlin/Any| {
     public abstract interface Sub : R|test/AddNullabilitySameGenericType2.Super| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

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

@@ -1,10 +1,10 @@
 public abstract interface CantMakeImmutableInSubclass : R|kotlin/Any| {
     public abstract interface Sub : R|test/CantMakeImmutableInSubclass.Super| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Collection<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<kotlin/String!>, kotlin/collections/Collection<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 

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

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

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

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