FIR: Adjust FirTypeEnhancement test data

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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