FIR Java: map classes to make java type-parameters have correct bounds

Really, this commit implements early J2K mapping for all Java types.
It's questionable and probably wrong at least for super-types,
because, for example, we cannot resolve spliterator() in classes
derived from java.lang.Iterable

compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt

@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.fir.java
 
+import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.fir.FirSession
@@ -142,7 +143,9 @@ internal fun JavaClassifierType.toConeKotlinTypeWithNullability(
 ): ConeLookupTagBasedType {
     return when (val classifier = classifier) {
         is JavaClass -> {
-            val classId = classifier.classId!!
+            //val classId = classifier.classId!!
+            val classId = JavaToKotlinClassMap.mapJavaToKotlin(classifier.fqName!!) ?: classifier.classId!!
+
             val lookupTag = ConeClassLikeLookupTagImpl(classId)
             lookupTag.constructClassType(
                 typeArguments.mapIndexed { index, argument ->

compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt

@@ -1,6 +1,6 @@
-@R|java/lang/annotation/Documented|() @R|javax/annotation/meta/TypeQualifierNickname|() @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) public abstract annotation class MyNullable : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Documented|() @R|javax/annotation/meta/TypeQualifierNickname|() @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) public abstract annotation class MyNullable : R|kotlin/Annotation| {
 }
-public open class NonNullNever : R|java/lang/Object| {
+public open class NonNullNever : R|kotlin/Any| {
     @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) public open var field: R|kotlin/String|?
         public get(): R|kotlin/String|?
         public set(value: R|kotlin/String|?): kotlin/Unit

compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt

@@ -1,4 +1,4 @@
-public open class Simple : R|java/lang/Object| {
+public open class Simple : R|kotlin/Any| {
     @R|javax/annotation/Nullable|() public open var field: R|kotlin/String|?
         public get(): R|kotlin/String|?
         public set(value: R|kotlin/String|?): kotlin/Unit

compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt

@@ -1,4 +1,4 @@
-public open class Strange : R|java/lang/Object| {
+public open class Strange : R|kotlin/Any| {
     @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) public open var field: R|ft<kotlin/String, kotlin/String?>|!
         public get(): R|ft<kotlin/String, kotlin/String?>|!
         public set(value: R|ft<kotlin/String, kotlin/String?>|!): kotlin/Unit

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt

@@ -1,4 +1,4 @@
-@R|FieldsAreNullable|() public open class A : R|java/lang/Object| {
+@R|FieldsAreNullable|() public open class A : R|kotlin/Any| {
     public open var field: R|kotlin/String|?
         public get(): R|kotlin/String|?
         public set(value: R|kotlin/String|?): kotlin/Unit
@@ -12,5 +12,5 @@
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
 }
-@R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/CheckForNull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class FieldsAreNullable : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/CheckForNull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class FieldsAreNullable : R|kotlin/Annotation| {
 }

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt

@@ -1,14 +1,14 @@
-@R|spr/NonNullApi|() public open class A : R|java/lang/Object| {
+@R|spr/NonNullApi|() public open class A : R|kotlin/Any| {
     public open operator fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|kotlin/String|
 
     @R|spr/ForceFlexibility|() public open operator fun bar(x: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() y: R|kotlin/CharSequence|): R|ft<kotlin/String, kotlin/String?>|!
 
 }
-@R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|spr/UnknownNullability|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class ForceFlexibility : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|spr/UnknownNullability|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class ForceFlexibility : R|kotlin/Annotation| {
 }
-@R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.TYPE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class NonNullApi : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.TYPE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class NonNullApi : R|kotlin/Annotation| {
 }
-@R|java/lang/annotation/Target|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) @R|javax/annotation/meta/TypeQualifierNickname|() public abstract annotation class Nullable : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Target|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) @R|javax/annotation/meta/TypeQualifierNickname|() public abstract annotation class Nullable : R|kotlin/Annotation| {
 }
-@R|java/lang/annotation/Documented|() @R|javax/annotation/meta/TypeQualifierNickname|() @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) public abstract annotation class UnknownNullability : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Documented|() @R|javax/annotation/meta/TypeQualifierNickname|() @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) public abstract annotation class UnknownNullability : R|kotlin/Annotation| {
 }

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt

@@ -1,4 +1,4 @@
-@R|spr/NonNullApi|() public open class A : R|java/lang/Object|, R|B| {
+@R|spr/NonNullApi|() public open class A : R|kotlin/Any|, R|B| {
     @R|spr/ForceFlexibility|() public open operator fun foo(x: R|kotlin/String|): R|kotlin/Unit|
 
     public open operator fun bar(@R|spr/ForceFlexibility|() x: R|kotlin/String|): R|kotlin/Unit|
@@ -8,7 +8,7 @@
     public open operator fun foobar(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
 }
-public abstract interface B : R|java/lang/Object| {
+public abstract interface B : R|kotlin/Any| {
     public abstract operator fun foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit|
 
     public abstract operator fun bar(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit|
@@ -18,9 +18,9 @@ public abstract interface B : R|java/lang/Object| {
     public abstract operator fun foobar(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit|
 
 }
-@R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|spr/UnknownNullability|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class ForceFlexibility : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|spr/UnknownNullability|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class ForceFlexibility : R|kotlin/Annotation| {
 }
-@R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.TYPE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class NonNullApi : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.TYPE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class NonNullApi : R|kotlin/Annotation| {
 }
-@R|java/lang/annotation/Documented|() @R|javax/annotation/meta/TypeQualifierNickname|() @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) public abstract annotation class UnknownNullability : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Documented|() @R|javax/annotation/meta/TypeQualifierNickname|() @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) public abstract annotation class UnknownNullability : R|kotlin/Annotation| {
 }

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt

@@ -1,4 +1,4 @@
-@R|NonNullApi|() public open class A : R|java/lang/Object| {
+@R|NonNullApi|() public open class A : R|kotlin/Any| {
     public open operator fun foo1(x: R|kotlin/String|): R|kotlin/String|
 
     public open operator fun foo2(x: R|kotlin/String|): R|kotlin/String|
@@ -12,7 +12,7 @@
     public open operator fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
 
 }
-@R|NonNullApi|() public abstract interface AInt : R|java/lang/Object| {
+@R|NonNullApi|() public abstract interface AInt : R|kotlin/Any| {
     public abstract operator fun foo1(x: R|kotlin/String|): R|kotlin/CharSequence|
 
     public abstract operator fun foo2(x: R|kotlin/String|): R|kotlin/CharSequence|
@@ -48,7 +48,7 @@
     public open operator fun baz(x: R|kotlin/String|): R|kotlin/String|
 
 }
-@R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.TYPE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|(), R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class NonNullApi : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.TYPE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|(), R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class NonNullApi : R|kotlin/Annotation| {
 }
-@R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.TYPE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/CheckForNull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|(), R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class NullableApi : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.TYPE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/CheckForNull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|(), R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class NullableApi : R|kotlin/Annotation| {
 }

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt

@@ -1,4 +1,4 @@
-@R|NonNullApi|() public open class A : R|java/lang/Object| {
+@R|NonNullApi|() public open class A : R|kotlin/Any| {
     public open var field: R|kotlin/String|
         public get(): R|kotlin/String|
         public set(value: R|kotlin/String|): kotlin/Unit
@@ -12,9 +12,9 @@
     @R|javax/annotation/Nullable|() public open operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|?
 
 }
-@R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/CheckForNull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class FieldsAreNullable : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/CheckForNull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class FieldsAreNullable : R|kotlin/Annotation| {
 }
-@R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|(), R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class NonNullApi : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|(), R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class NonNullApi : R|kotlin/Annotation| {
 }
-@R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/CheckForNull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|(), R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class NullableApi : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/CheckForNull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|(), R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class NullableApi : R|kotlin/Annotation| {
 }

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt

@@ -1,4 +1,4 @@
-@R|javax/annotation/ParametersAreNonnullByDefault|() public open class A : R|java/lang/Object| {
+@R|javax/annotation/ParametersAreNonnullByDefault|() public open class A : R|kotlin/Any| {
     @R|javax/annotation/Nullable|() public open var field: R|kotlin/String|?
         public get(): R|kotlin/String|?
         public set(value: R|kotlin/String|?): kotlin/Unit

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt

@@ -1,4 +1,4 @@
-public open class A : R|java/lang/Object| {
+public open class A : R|kotlin/Any| {
     @R|javax/annotation/Nullable|() public open var field: R|kotlin/String|?
         public get(): R|kotlin/String|?
         public set(value: R|kotlin/String|?): kotlin/Unit
@@ -8,7 +8,7 @@ public open class A : R|java/lang/Object| {
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
 }
-public open class A2 : R|java/lang/Object| {
+public open class A2 : R|kotlin/Any| {
     @R|javax/annotation/Nullable|() public open var field: R|kotlin/String|?
         public get(): R|kotlin/String|?
         public set(value: R|kotlin/String|?): kotlin/Unit

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt

@@ -1,4 +1,4 @@
-@R|spr/NonNullApi|() public open class A : R|java/lang/Object| {
+@R|spr/NonNullApi|() public open class A : R|kotlin/Any| {
     public open var field: R|ft<kotlin/String, kotlin/String?>|!
         public get(): R|ft<kotlin/String, kotlin/String?>|!
         public set(value: R|ft<kotlin/String, kotlin/String?>|!): kotlin/Unit
@@ -10,7 +10,7 @@
     @R|spr/Nullable|() public open operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|?
 
 }
-@R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.TYPE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class NonNullApi : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.TYPE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class NonNullApi : R|kotlin/Annotation| {
 }
-@R|java/lang/annotation/Target|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) @R|javax/annotation/meta/TypeQualifierNickname|() public abstract annotation class Nullable : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Target|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) @R|javax/annotation/meta/TypeQualifierNickname|() public abstract annotation class Nullable : R|kotlin/Annotation| {
 }

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt

@@ -1,4 +1,4 @@
-public open class A : R|java/lang/Object| {
+public open class A : R|kotlin/Any| {
     public open var field: R|ft<kotlin/String, kotlin/String?>|!
         public get(): R|ft<kotlin/String, kotlin/String?>|!
         public set(value: R|ft<kotlin/String, kotlin/String?>|!): kotlin/Unit
@@ -10,7 +10,7 @@ public open class A : R|java/lang/Object| {
     @R|spr/Nullable|() public open operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|?
 
 }
-@R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.PACKAGE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class NonNullApi : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.PACKAGE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class NonNullApi : R|kotlin/Annotation| {
 }
-@R|java/lang/annotation/Target|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) @R|javax/annotation/meta/TypeQualifierNickname|() public abstract annotation class Nullable : R|java/lang/annotation/Annotation| {
+@R|java/lang/annotation/Target|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) @R|javax/annotation/meta/TypeQualifierNickname|() public abstract annotation class Nullable : R|kotlin/Annotation| {
 }

compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt

@@ -1,4 +1,4 @@
-public/*package*/ open class A : R|java/lang/Object| {
+public/*package*/ open class A : R|kotlin/Any| {
     public open operator fun a(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(HELLO)) arg: R|ft<Signs, Signs?>|! = R|/Signs.HELLO|): R|ft<Signs, Signs?>|!
 
     public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(X)) arg: R|ft<Signs, Signs?>|! = R|/Signs.X|): R|ft<Signs, Signs?>|!
@@ -8,12 +8,12 @@ public/*package*/ open class A : R|java/lang/Object| {
     public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Mixed, Mixed?>|! = R|/Mixed.NOT_ENTRY_EITHER|): R|ft<Mixed, Mixed?>|!
 
 }
-public final enum class Mixed : R|java/lang/Enum<Mixed>| {
+public final enum class Mixed : R|kotlin/Enum<Mixed>| {
     public final static val NOT_ENTRY_EITHER: R|ft<Mixed, Mixed?>|!
         public get(): R|ft<Mixed, Mixed?>|!
 
 }
-public final enum class Signs : R|java/lang/Enum<Signs>| {
+public final enum class Signs : R|kotlin/Enum<Signs>| {
     public final static val HELLO: R|ft<Signs, Signs?>|!
         public get(): R|ft<Signs, Signs?>|!
 

compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt

@@ -1,4 +1,4 @@
-public open class A : R|java/lang/Object| {
+public open class A : R|kotlin/Any| {
     public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x1F)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(31)): R|kotlin/Unit|
 
     public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0X1F)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(31)): R|kotlin/Unit|
@@ -8,7 +8,7 @@ public open class A : R|java/lang/Object| {
     public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1010)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(10)): R|kotlin/Unit|
 
 }
-public open class B : R|java/lang/Object| {
+public open class B : R|kotlin/Any| {
     public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
 
     public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0xZZ)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|

compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt

@@ -1,10 +1,10 @@
-public open class A : R|java/lang/Object| {
+public open class A : R|kotlin/Any| {
     public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
 
     public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|kotlin/Int| = Null(null)): R|kotlin/Unit|
 
 }
-public open class B<T> : R|java/lang/Object| {
+public open class B<T> : R|kotlin/Any| {
     public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() t: R|ft<T, T?>|! = Null(null)): R|kotlin/Unit|
 
 }

compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt

@@ -1,4 +1,4 @@
-public open class A : R|java/lang/Object| {
+public open class A : R|kotlin/Any| {
     public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() i: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
 
     public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
@@ -8,7 +8,7 @@ public open class A : R|java/lang/Object| {
     public open operator fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
 
 }
-public abstract interface AInt : R|java/lang/Object| {
+public abstract interface AInt : R|kotlin/Any| {
     public abstract operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) i: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
 
     public abstract operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|

compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt

@@ -1,4 +1,4 @@
-public/*package*/ open class A : R|java/lang/Object| {
+public/*package*/ open class A : R|kotlin/Any| {
     public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) value: R|ft<kotlin/String, kotlin/String?>|! = String(hello)): R|kotlin/Unit|
 
     public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<kotlin/String, kotlin/String?>|! = String(first), @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) b: R|ft<kotlin/String, kotlin/String?>|! = String(second)): R|kotlin/Unit|

compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt

@@ -1,4 +1,4 @@
-public/*package*/ open class A : R|java/lang/Object| {
+public/*package*/ open class A : R|kotlin/Any| {
     public open operator fun emptyName(@R|kotlin/annotations/jvm/internal/ParameterName|(String()) first: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|kotlin/Int|): R|kotlin/Unit|
 
     public open operator fun missingName(@R|kotlin/annotations/jvm/internal/ParameterName|() first: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|

compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt

@@ -1,4 +1,4 @@
-public open class A : R|java/lang/Object| {
+public open class A : R|kotlin/Any| {
     public open operator fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(port)) port: R|kotlin/Int|): R|kotlin/Unit|
 
 }

compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt

@@ -1,4 +1,4 @@
-public open class A : R|java/lang/Object| {
+public open class A : R|kotlin/Any| {
     public open operator fun same(@R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) first: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
 }

compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt

@@ -1,4 +1,4 @@
-public open class A : R|java/lang/Object| {
+public open class A : R|kotlin/Any| {
     public open operator fun dollarName(@R|kotlin/annotations/jvm/internal/ParameterName|(String($)) host: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
     public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(String(42)) field: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|

compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt

@@ -1,4 +1,4 @@
-public/*package*/ open class A : R|java/lang/Object| {
+public/*package*/ open class A : R|kotlin/Any| {
     public open static operator fun withDefault(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(OK)) arg: R|ft<kotlin/String, kotlin/String?>|! = String(OK)): R|ft<kotlin/String, kotlin/String?>|!
 
 }

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

@@ -1,4 +1,4 @@
-public final class ArrayTypeVariance : R|java/lang/Object| {
-    public final operator fun toArray(p0: R|kotlin/Array<ft<java/lang/Object, java/lang/Object?>>|): R|kotlin/Array<ft<java/lang/Object, java/lang/Object?>>|
+public final class ArrayTypeVariance : R|kotlin/Any| {
+    public final operator fun toArray(p0: R|kotlin/Array<ft<kotlin/Any, kotlin/Any?>>|): R|kotlin/Array<ft<kotlin/Any, kotlin/Any?>>|
 
 }

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

@@ -1,4 +1,4 @@
-public final class ClassWithConstVal : R|java/lang/Object| {
+public final class ClassWithConstVal : R|kotlin/Any| {
     public final val f: R|kotlin/Int|
         public get(): R|kotlin/Int|
 

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

@@ -1,2 +1,2 @@
-public final class ClassWithTypeP<P> : R|java/lang/Object| {
+public final class ClassWithTypeP<P> : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public abstract class ClassWithTypePExtendsIterableP<P> : R|java/lang/Object|, R|java/lang/Iterable<P>| {
+public abstract class ClassWithTypePExtendsIterableP<P> : R|kotlin/Any|, R|kotlin/collections/Iterable<P>| {
 }

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

@@ -1,2 +1,2 @@
-public final class ClassWithTypePP<P, Q : R|P|> : R|java/lang/Object| {
+public final class ClassWithTypePP<P, Q : R|P|> : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public open class ClassWithTypePRefNext<R : R|java/lang/Iterable<P>|, P> : R|java/lang/Object| {
+public open class ClassWithTypePRefNext<R : R|kotlin/collections/Iterable<P>|, P> : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public final class ClassWithTypePRefSelf<P : R|java/lang/Enum<P>|> : R|java/lang/Object| {
+public final class ClassWithTypePRefSelf<P : R|kotlin/Enum<P>|> : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public final class ClassWithTypePRefSelfAndClass<P : R|test/ClassWithTypePRefSelfAndClass<P>|> : R|java/lang/Object| {
+public final class ClassWithTypePRefSelfAndClass<P : R|test/ClassWithTypePRefSelfAndClass<P>|> : R|kotlin/Any| {
 }

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

@@ -1,4 +1,4 @@
-public final class FieldAsVar : R|java/lang/Object| {
+public final class FieldAsVar : R|kotlin/Any| {
     public open var f: R|kotlin/Int|
         public get(): R|kotlin/Int|
         public set(value: R|kotlin/Int|): kotlin/Unit

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

@@ -1,4 +1,4 @@
-public open class FieldOfArrayType : R|java/lang/Object| {
+public open class FieldOfArrayType : R|kotlin/Any| {
     public open var files: R|kotlin/Array<ft<java/io/File, java/io/File?>>|
         public get(): R|kotlin/Array<ft<java/io/File, java/io/File?>>|
         public set(value: R|kotlin/Array<ft<java/io/File, java/io/File?>>|): kotlin/Unit

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

@@ -1,4 +1,4 @@
-public final class FinalFieldAsVal : R|java/lang/Object| {
+public final class FinalFieldAsVal : R|kotlin/Any| {
     public final val f: R|kotlin/Int|
         public get(): R|kotlin/Int|
 

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

@@ -1,2 +1,2 @@
-public final class InheritMethodsDifferentReturnTypes : R|java/lang/Object| {
+public final class InheritMethodsDifferentReturnTypes : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public final class InheritMethodsDifferentReturnTypesGeneric : R|java/lang/Object| {
+public final class InheritMethodsDifferentReturnTypesGeneric : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public open class InnerClass : R|java/lang/Object| {
+public open class InnerClass : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public open class InnerClassReferencesOuterTP<P> : R|java/lang/Object| {
+public open class InnerClassReferencesOuterTP<P> : R|kotlin/Any| {
 }

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

@@ -1,4 +1,4 @@
-public open class InnerClassTypeMultipleGeneric : R|java/lang/Object| {
+public open class InnerClassTypeMultipleGeneric : R|kotlin/Any| {
     public open operator 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?>>?>|!
 
 }

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

@@ -1,2 +1,2 @@
-public open class InnerClassesInGeneric<P, Q> : R|java/lang/Object| {
+public open class InnerClassesInGeneric<P, Q> : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public open class InnerOfGeneric : R|java/lang/Object| {
+public open class InnerOfGeneric : R|kotlin/Any| {
 }

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

@@ -1,4 +1,4 @@
-public abstract interface IntrinsicCompanionObject : R|java/lang/Object| {
+public abstract interface IntrinsicCompanionObject : R|kotlin/Any| {
     public abstract operator fun testInt(i: R|ft<kotlin/Int.Companion, kotlin/Int.Companion?>|!): R|kotlin/Unit|
 
     public abstract operator fun testChar(c: R|ft<kotlin/Char.Companion, kotlin/Char.Companion?>|!): R|kotlin/Unit|

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

@@ -1,2 +1,2 @@
-public final class MethodReferencesOuterClassTP<P> : R|java/lang/Object| {
+public final class MethodReferencesOuterClassTP<P> : R|kotlin/Any| {
 }

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

@@ -1,4 +1,4 @@
-public open class MethodTypePOneUpperBound : R|java/lang/Object| {
-    public open operator fun <T : R|java/lang/Cloneable|> bar(): R|kotlin/Unit|
+public open class MethodTypePOneUpperBound : R|kotlin/Any| {
+    public open operator fun <T : R|kotlin/Cloneable|> bar(): R|kotlin/Unit|
 
 }

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

@@ -1,4 +1,4 @@
-public open class MethodTypePTwoUpperBounds : R|java/lang/Object| {
-    public open operator fun <T : R|java/lang/Cloneable|, R|java/lang/Runnable|> foo(): R|kotlin/Unit|
+public open class MethodTypePTwoUpperBounds : R|kotlin/Any| {
+    public open operator fun <T : R|kotlin/Cloneable|, R|java/lang/Runnable|> foo(): R|kotlin/Unit|
 
 }

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

@@ -1,4 +1,4 @@
-public final class MethodWithTypeP : R|java/lang/Object| {
+public final class MethodWithTypeP : R|kotlin/Any| {
     public final operator fun <P> f(): R|kotlin/Unit|
 
 }

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

@@ -1,4 +1,4 @@
-public final class MethodWithTypePP : R|java/lang/Object| {
+public final class MethodWithTypePP : R|kotlin/Any| {
     public final operator fun <P, Q : R|P|> f(): R|kotlin/Unit|
 
 }

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

@@ -1,4 +1,4 @@
-public open class MethodWithTypePRefClassP<P> : R|java/lang/Object| {
+public open class MethodWithTypePRefClassP<P> : R|kotlin/Any| {
     public final operator fun <Q : R|P|> f(): R|kotlin/Unit|
 
 }

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

@@ -1,4 +1,4 @@
-public final class MethosWithPRefTP : R|java/lang/Object| {
+public final class MethosWithPRefTP : R|kotlin/Any| {
     public final operator fun <P> f(p: R|ft<P, P?>|!): R|kotlin/Unit|
 
 }

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

@@ -1,4 +1,4 @@
-public open class MyException : R|java/lang/Object| {
+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|
 
 }

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

@@ -1,2 +1,2 @@
-public open class NestedClass : R|java/lang/Object| {
+public open class NestedClass : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public open class OverrideMethod : R|java/lang/Object| {
+public open class OverrideMethod : R|kotlin/Any| {
 }

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

@@ -1,4 +1,4 @@
-public open class Frame : R|java/lang/Object| {
+public open class Frame : R|kotlin/Any| {
     public/*package*/ open var accessibleContext: R|ft<kotlin/String, kotlin/String?>|!
         public/*package*/ get(): R|ft<kotlin/String, kotlin/String?>|!
         public/*package*/ set(value: R|ft<kotlin/String, kotlin/String?>|!): kotlin/Unit

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

@@ -1,4 +1,4 @@
-public open class PrivateMembers : R|java/lang/Object| {
+public open class PrivateMembers : R|kotlin/Any| {
     private open var field: R|kotlin/Int|
         private get(): R|kotlin/Int|
         private set(value: R|kotlin/Int|): kotlin/Unit

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

@@ -1,2 +1,2 @@
-public open class PrivateMembersInHierarchy : R|java/lang/Object| {
+public open class PrivateMembersInHierarchy : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public open class RawOverrides : R|java/lang/Object| {
+public open class RawOverrides : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public abstract interface RawTypeWithUpperBound : R|java/lang/Object| {
+public abstract interface RawTypeWithUpperBound : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public abstract interface RawUpperBound<T : R|test/RawUpperBound<*>|> : R|java/lang/Object| {
+public abstract interface RawUpperBound<T : R|test/RawUpperBound<*>|> : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public abstract interface RecursiveRawUpperBound<T : R|test/RecursiveRawUpperBound<*>|> : R|java/lang/Object| {
+public abstract interface RecursiveRawUpperBound<T : R|test/RecursiveRawUpperBound<*>|> : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public abstract interface RecursiveWildcardUpperBound<T : R|test/RecursiveWildcardUpperBound<*>|> : R|java/lang/Object| {
+public abstract interface RecursiveWildcardUpperBound<T : R|test/RecursiveWildcardUpperBound<*>|> : R|kotlin/Any| {
 }

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

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

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

@@ -1,4 +1,4 @@
-public final class Simple : R|java/lang/Object| {
+public final class Simple : R|kotlin/Any| {
     public constructor(): R|test/Simple|
 
 }

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

@@ -1,4 +1,4 @@
-public open class TopLevel$Class : R|java/lang/Object| {
+public open class TopLevel$Class : R|kotlin/Any| {
     public open operator fun foo(other: R|ft<test/TopLevel$Class, test/TopLevel$Class?>|!): R|kotlin/Unit|
 
 }

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

@@ -1,4 +1,4 @@
-public final class TwoFields : R|java/lang/Object| {
+public final class TwoFields : R|kotlin/Any| {
     public open var a: R|kotlin/Int|
         public get(): R|kotlin/Int|
         public set(value: R|kotlin/Int|): kotlin/Unit

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

@@ -1,4 +1,4 @@
-public final class UnboundWildcard : R|java/lang/Object| {
+public final class UnboundWildcard : R|kotlin/Any| {
     public final operator fun foo(): R|ft<test/UnboundWildcard.MyClass<*>, test/UnboundWildcard.MyClass<*>?>|!
 
     public final operator fun collection(): R|ft<kotlin/collections/MutableCollection<*>, kotlin/collections/Collection<*>?>|!

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

@@ -1,4 +1,4 @@
-public open class WildcardBounds : R|java/lang/Object| {
-    public/*package*/ open operator fun foo(x: R|ft<test/WildcardBounds.A<out java/lang/CharSequence>, test/WildcardBounds.A<out java/lang/CharSequence>?>|!, y: R|ft<test/WildcardBounds.A<in java/lang/String>, test/WildcardBounds.A<in java/lang/String>?>|!): R|kotlin/Unit|
+public open class WildcardBounds : R|kotlin/Any| {
+    public/*package*/ open operator 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|
 
 }

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

@@ -1,2 +1,2 @@
-@R|test/AnnotatedAnnotation|() public abstract annotation class AnnotatedAnnotation : R|java/lang/annotation/Annotation| {
+@R|test/AnnotatedAnnotation|() public abstract annotation class AnnotatedAnnotation : R|kotlin/Annotation| {
 }

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

@@ -1,4 +1,4 @@
-public open class AnnotatedConstructor : R|java/lang/Object| {
+public open class AnnotatedConstructor : R|kotlin/Any| {
     @R|test/AnnotatedConstructor.Anno|(String(constructor)) public constructor(): R|test/AnnotatedConstructor|
 
 }

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

@@ -1,4 +1,4 @@
-public final enum class AnnotatedEnumEntry : R|java/lang/Enum<test/AnnotatedEnumEntry>| {
+public final enum class AnnotatedEnumEntry : R|kotlin/Enum<test/AnnotatedEnumEntry>| {
     @R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static val E1: R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
         public get(): R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
 

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

@@ -1,4 +1,4 @@
-public open class AnnotatedField : R|java/lang/Object| {
+public open class AnnotatedField : R|kotlin/Any| {
     @R|test/AnnotatedField.Anno|(String(static)) public final static val x: R|kotlin/Int|
         public get(): R|kotlin/Int|
 

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

@@ -1,4 +1,4 @@
-public open class AnnotatedMethod : R|java/lang/Object| {
+public open class AnnotatedMethod : R|kotlin/Any| {
     @R|test/AnnotatedMethod.Anno|(Int(42)) public open operator fun f(): R|kotlin/Unit|
 
 }

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

@@ -1,2 +1,2 @@
-public/*package*/ open class AnnotatedParameterInInnerClassConstructor : R|java/lang/Object| {
+public/*package*/ open class AnnotatedParameterInInnerClassConstructor : R|kotlin/Any| {
 }

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

@@ -1,4 +1,4 @@
-public/*package*/ open class AnnotatedTypeInFun : R|java/lang/Object| {
+public/*package*/ open class AnnotatedTypeInFun : R|kotlin/Any| {
     public/*package*/ open operator fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft<kotlin/String, kotlin/String?>|!, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
 }

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

@@ -1,4 +1,4 @@
-public open class AnnotatedValueParameter : R|java/lang/Object| {
+public open class AnnotatedValueParameter : R|kotlin/Any| {
     public open operator fun f(@R|test/AnnotatedValueParameter.Anno|(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|
 
 }

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

@@ -1,2 +1,2 @@
-public abstract interface AnnotationInParam : R|java/lang/Object| {
+public abstract interface AnnotationInParam : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public open class AnnotationRetentions : R|java/lang/Object| {
+public open class AnnotationRetentions : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public open class AnnotationTargets : R|java/lang/Object| {
+public open class AnnotationTargets : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public open class ArithmeticExpressionInParam : R|java/lang/Object| {
+public open class ArithmeticExpressionInParam : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public abstract interface ArrayOfEnumInParam : R|java/lang/Object| {
+public abstract interface ArrayOfEnumInParam : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public abstract interface ArrayOfStringInParam : R|java/lang/Object| {
+public abstract interface ArrayOfStringInParam : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public open class ClassObjectArrayInParam : R|java/lang/Object| {
+public open class ClassObjectArrayInParam : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public open class ClassObjectInParam : R|java/lang/Object| {
+public open class ClassObjectInParam : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public open class ClassObjectInParamRaw : R|java/lang/Object| {
+public open class ClassObjectInParamRaw : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public open class ClassObjectInParamVariance : R|java/lang/Object| {
+public open class ClassObjectInParamVariance : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public abstract interface CustomAnnotation : R|java/lang/Object| {
+public abstract interface CustomAnnotation : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public abstract interface CustomAnnotationWithDefaultParameter : R|java/lang/Object| {
+public abstract interface CustomAnnotationWithDefaultParameter : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public abstract interface EmptyArrayInParam : R|java/lang/Object| {
+public abstract interface EmptyArrayInParam : R|kotlin/Any| {
 }

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

@@ -1,4 +1,4 @@
-public open class EnumArgumentWithCustomToString : R|java/lang/Object| {
+public open class EnumArgumentWithCustomToString : R|kotlin/Any| {
     @R|test/EnumArgumentWithCustomToString.EnumAnno|(R|test/EnumArgumentWithCustomToString.E.CAKE|()) @R|test/EnumArgumentWithCustomToString.EnumArrayAnno|(<implicitArrayOf>(R|test/EnumArgumentWithCustomToString.E.CAKE|(), R|test/EnumArgumentWithCustomToString.E.CAKE|())) public/*package*/ open operator fun annotated(): R|kotlin/Unit|
 
 }

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

@@ -1,4 +1,4 @@
-public final enum class EnumConstructorParameter : R|java/lang/Enum<test/EnumConstructorParameter>| {
+public final enum class EnumConstructorParameter : R|kotlin/Enum<test/EnumConstructorParameter>| {
     public final static val INSTANCE: R|ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>|!
         public get(): R|ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>|!
 

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

@@ -1,2 +1,2 @@
-public abstract interface EnumInParam : R|java/lang/Object| {
+public abstract interface EnumInParam : R|kotlin/Any| {
 }

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

@@ -1,4 +1,4 @@
-public open class JavaDocDeprecated : R|java/lang/Object| {
+public open class JavaDocDeprecated : R|kotlin/Any| {
     public open operator fun getFoo(text: R|ft<kotlin/String, kotlin/String?>|!): R|ft<kotlin/String, kotlin/String?>|!
 
 }

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

@@ -1,4 +1,4 @@
-public open class NestedEnumArgument : R|java/lang/Object| {
+public open class NestedEnumArgument : R|kotlin/Any| {
     @R|test/NestedEnumArgument.Anno|(R|test/NestedEnumArgument.E.FIRST|()) public/*package*/ open operator fun foo(): R|kotlin/Unit|
 
 }

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

@@ -1,2 +1,2 @@
-public abstract interface PrimitiveValueInParam : R|java/lang/Object| {
+public abstract interface PrimitiveValueInParam : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public abstract interface RecursiveAnnotation : R|java/lang/Object| {
+public abstract interface RecursiveAnnotation : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public abstract interface RecursiveAnnotation2 : R|java/lang/Object| {
+public abstract interface RecursiveAnnotation2 : R|kotlin/Any| {
 }

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

@@ -1,2 +1,2 @@
-public abstract annotation class SimpleAnnotation : R|java/lang/annotation/Annotation| {
+public abstract annotation class SimpleAnnotation : R|kotlin/Annotation| {
 }

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

@@ -1,2 +1,2 @@
-public abstract interface StringConcatenationInParam : R|java/lang/Object| {
+public abstract interface StringConcatenationInParam : R|kotlin/Any| {
 }

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

@@ -1,4 +1,4 @@
-public abstract interface StringConstantInParam : R|java/lang/Object| {
+public abstract interface StringConstantInParam : R|kotlin/Any| {
     public final static val HEL: R|ft<kotlin/String, kotlin/String?>|!
         public get(): R|ft<kotlin/String, kotlin/String?>|!
 

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

@@ -1,2 +1,2 @@
-public abstract interface StringInParam : R|java/lang/Object| {
+public abstract interface StringInParam : R|kotlin/Any| {
 }

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

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