diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt index c2174264547..2df178b9fde 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt +++ b/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 -> diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt index 152c5173a15..4a29455f226 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt +++ b/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 diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt index 7f2dda86e45..866a7c1b10a 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt +++ b/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 diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt index fb748c65763..8c819d2630e 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt +++ b/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|! public get(): R|ft|! public set(value: R|ft|!): kotlin/Unit diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt index 4ad5f926f70..ed3aeae9acb 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt +++ b/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|((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|((R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class FieldsAreNullable : R|kotlin/Annotation| { } diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt index dd667e611a8..f4341f53c92 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt +++ b/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|!, @R|javax/annotation/Nonnull|() y: R|kotlin/CharSequence|): R|ft|! } -@R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|spr/UnknownNullability|() @R|javax/annotation/meta/TypeQualifierDefault|((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|((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|((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|((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|((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|((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| { } diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt index ec339bb9ce8..95b62269e68 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt +++ b/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|!): 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|((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|((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|((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|((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| { } diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt index d3752cbdcdf..2b0993148a7 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt +++ b/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|((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|((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|((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|((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| { } diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt index b65c0e4c841..0cd5042ebc2 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt +++ b/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/List>?>|? } -@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|((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|((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|((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|((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|((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|((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| { } diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt index c8240b31ced..04062da61e0 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt +++ b/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 diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt index 016a202edcd..5e107cc782b 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt +++ b/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 diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt index aa79d9443ba..ec0a5885afa 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt +++ b/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|! public get(): R|ft|! public set(value: R|ft|!): kotlin/Unit @@ -10,7 +10,7 @@ @R|spr/Nullable|() public open operator fun baz(): R|ft>?, kotlin/collections/List>?>|? } -@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|((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|((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|((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|((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| { } diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt index 6ab974e348c..1a451944159 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt +++ b/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|! public get(): R|ft|! public set(value: R|ft|!): 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/List>?>|? } -@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|((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|((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|((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|((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| { } diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt index 4ac43e17425..0423e2548b1 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt +++ b/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|! = R|/Signs.HELLO|): R|ft|! public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(X)) arg: R|ft|! = R|/Signs.X|): R|ft|! @@ -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|! = R|/Mixed.NOT_ENTRY_EITHER|): R|ft|! } -public final enum class Mixed : R|java/lang/Enum| { +public final enum class Mixed : R|kotlin/Enum| { public final static val NOT_ENTRY_EITHER: R|ft|! public get(): R|ft|! } -public final enum class Signs : R|java/lang/Enum| { +public final enum class Signs : R|kotlin/Enum| { public final static val HELLO: R|ft|! public get(): R|ft|! diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt index 43c1a999daa..66a1b8aa8fc 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt +++ b/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|! = Long(31)): R|kotlin/Unit| public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0X1F)) value: R|ft|! = 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|! = 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|!): R|kotlin/Unit| public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0xZZ)) value: R|ft|!): R|kotlin/Unit| diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt index dcc27e2fa97..57995fc1353 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt +++ b/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|! = 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 : R|java/lang/Object| { +public open class B : R|kotlin/Any| { public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() t: R|ft|! = Null(null)): R|kotlin/Unit| } diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt index c2131c64ad3..b828eb9b329 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt +++ b/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|! = Null(null)): R|kotlin/Unit| public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft|! = 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|! = 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|! = Int(42)): R|kotlin/Unit| public abstract operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft|! = Null(null)): R|kotlin/Unit| diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt index bf85a289e62..45579b6163c 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt +++ b/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|! = String(hello)): R|kotlin/Unit| public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft|! = String(first), @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) b: R|ft|! = String(second)): R|kotlin/Unit| diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt index 15d462735ae..de556054ed6 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt +++ b/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|!, @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|!): R|kotlin/Unit| diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt index 0786ed0601f..d237af09dd7 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt +++ b/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|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(port)) port: R|kotlin/Int|): R|kotlin/Unit| } diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt index de7c6534213..dd6f72a5ebb 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt +++ b/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|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt index b963beb8e9c..949cfd6111b 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt +++ b/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|!): R|kotlin/Unit| public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(String(42)) field: R|ft|!): R|kotlin/Unit| diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt index 49eae522f26..c9e827e37c8 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt +++ b/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|! = String(OK)): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt b/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt index 4a2697c3526..9c9f6b85a9b 100644 --- a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt +++ b/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>|): R|kotlin/Array>| +public final class ArrayTypeVariance : R|kotlin/Any| { + public final operator fun toArray(p0: R|kotlin/Array>|): R|kotlin/Array>| } diff --git a/compiler/testData/loadJava/compiledJava/ClassWithConstVal.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithConstVal.fir.txt index 06a8c3bc3f5..b64d96614a3 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithConstVal.fir.txt +++ b/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| diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt index 9b778e00785..08f9f44a2b6 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt @@ -1,2 +1,2 @@ -public final class ClassWithTypeP

: R|java/lang/Object| { +public final class ClassWithTypeP

: R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt index 75010e0ef4f..f89481ec031 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt @@ -1,2 +1,2 @@ -public abstract class ClassWithTypePExtendsIterableP

: R|java/lang/Object|, R|java/lang/Iterable

| { +public abstract class ClassWithTypePExtendsIterableP

: R|kotlin/Any|, R|kotlin/collections/Iterable

| { } diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt index e956660f7b8..7949fcc5f46 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt @@ -1,2 +1,2 @@ -public final class ClassWithTypePP : R|java/lang/Object| { +public final class ClassWithTypePP : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt index 2f7fc5d9842..04f13bacdc8 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt @@ -1,2 +1,2 @@ -public open class ClassWithTypePRefNext|, P> : R|java/lang/Object| { +public open class ClassWithTypePRefNext|, P> : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt index e73c3394292..2ca266a78ab 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt @@ -1,2 +1,2 @@ -public final class ClassWithTypePRefSelf

|> : R|java/lang/Object| { +public final class ClassWithTypePRefSelf

|> : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt index 9fb3cc0c5f2..dc2bf1dae47 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt @@ -1,2 +1,2 @@ -public final class ClassWithTypePRefSelfAndClass

|> : R|java/lang/Object| { +public final class ClassWithTypePRefSelfAndClass

|> : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/FieldAsVar.fir.txt b/compiler/testData/loadJava/compiledJava/FieldAsVar.fir.txt index 0b2c139b27c..5804f20b3a9 100644 --- a/compiler/testData/loadJava/compiledJava/FieldAsVar.fir.txt +++ b/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 diff --git a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt b/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt index 0feeadb141c..da5119a0157 100644 --- a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt +++ b/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>| public get(): R|kotlin/Array>| public set(value: R|kotlin/Array>|): kotlin/Unit diff --git a/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.fir.txt b/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.fir.txt index f53771fd0ea..fa25aa32894 100644 --- a/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.fir.txt +++ b/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| diff --git a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.fir.txt b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.fir.txt index 5d6a5c4b6a5..284a54631cf 100644 --- a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt index d69a6a6bd43..5c1ec98e9ba 100644 --- a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/InnerClass.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClass.fir.txt index 7d2dfb582a1..6c423d6f72f 100644 --- a/compiler/testData/loadJava/compiledJava/InnerClass.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt index f7a3e8f6c39..d2a032e657c 100644 --- a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt @@ -1,2 +1,2 @@ -public open class InnerClassReferencesOuterTP

: R|java/lang/Object| { +public open class InnerClassReferencesOuterTP

: R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt index 87bc25d175e..804873f659e 100644 --- a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt +++ b/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, ft, ft>, test/InnerClassTypeMultipleGeneric.Outer.Inner, ft, ft>?>|! } diff --git a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt index 64c4db94ccf..609eb1d257e 100644 --- a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt +++ b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt @@ -1,2 +1,2 @@ -public open class InnerClassesInGeneric : R|java/lang/Object| { +public open class InnerClassesInGeneric : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt index 5719f21fc33..cacb2e956c0 100644 --- a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt b/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt index 529663eb76e..f917b3c421f 100644 --- a/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt +++ b/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|!): R|kotlin/Unit| public abstract operator fun testChar(c: R|ft|!): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt index 0857abbcc39..13121c0dc84 100644 --- a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt @@ -1,2 +1,2 @@ -public final class MethodReferencesOuterClassTP

: R|java/lang/Object| { +public final class MethodReferencesOuterClassTP

: R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt index 39d258dbf41..a66818cbb67 100644 --- a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt @@ -1,4 +1,4 @@ -public open class MethodTypePOneUpperBound : R|java/lang/Object| { - public open operator fun bar(): R|kotlin/Unit| +public open class MethodTypePOneUpperBound : R|kotlin/Any| { + public open operator fun bar(): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt index fde40d2f8af..8aae055bfe3 100644 --- a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt @@ -1,4 +1,4 @@ -public open class MethodTypePTwoUpperBounds : R|java/lang/Object| { - public open operator fun foo(): R|kotlin/Unit| +public open class MethodTypePTwoUpperBounds : R|kotlin/Any| { + public open operator fun foo(): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt index 9b2da20e095..26afacdf88c 100644 --- a/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt +++ b/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

f(): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt index 213a125b8dc..707656f1012 100644 --- a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt +++ b/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 f(): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt index a57651ef662..411160484c2 100644 --- a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt @@ -1,4 +1,4 @@ -public open class MethodWithTypePRefClassP

: R|java/lang/Object| { +public open class MethodWithTypePRefClassP

: R|kotlin/Any| { public final operator fun f(): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt index dff7ff10626..f6330bdebc0 100644 --- a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt +++ b/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

f(p: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/MyException.fir.txt b/compiler/testData/loadJava/compiledJava/MyException.fir.txt index 967288c0825..9d02dfc182f 100644 --- a/compiler/testData/loadJava/compiledJava/MyException.fir.txt +++ b/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|!, cause: R|ft|!): R|test/MyException| } diff --git a/compiler/testData/loadJava/compiledJava/NestedClass.fir.txt b/compiler/testData/loadJava/compiledJava/NestedClass.fir.txt index 020c6332aac..3ef34d72cba 100644 --- a/compiler/testData/loadJava/compiledJava/NestedClass.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/OverrideMethod.fir.txt b/compiler/testData/loadJava/compiledJava/OverrideMethod.fir.txt index 44b4d9a9628..ba05a63a5a7 100644 --- a/compiler/testData/loadJava/compiledJava/OverrideMethod.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt index 753d2463a75..95c40b8ffdb 100644 --- a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt +++ b/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|! public/*package*/ get(): R|ft|! public/*package*/ set(value: R|ft|!): kotlin/Unit diff --git a/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt b/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt index 466e01078ae..943232202ff 100644 --- a/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt +++ b/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 diff --git a/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.fir.txt b/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.fir.txt index 8fee6313542..bd138396b06 100644 --- a/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt index 559b3273ab6..8277f5cbc2c 100644 --- a/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.fir.txt index 5dca77fcd4c..8ed99bdda3d 100644 --- a/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt index a334596576a..2fa45c790db 100644 --- a/compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt @@ -1,2 +1,2 @@ -public abstract interface RawUpperBound|> : R|java/lang/Object| { +public abstract interface RawUpperBound|> : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt index 0b9cf69db72..e2cffc65849 100644 --- a/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt @@ -1,2 +1,2 @@ -public abstract interface RecursiveRawUpperBound|> : R|java/lang/Object| { +public abstract interface RecursiveRawUpperBound|> : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt index 6194b16dda8..6e3d3b70fe1 100644 --- a/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt @@ -1,2 +1,2 @@ -public abstract interface RecursiveWildcardUpperBound|> : R|java/lang/Object| { +public abstract interface RecursiveWildcardUpperBound|> : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt index 6db28f3854d..fb78090fa03 100644 --- a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt +++ b/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/Collection?>|!): R|kotlin/Unit| +public abstract interface RemoveRedundantProjectionKind : R|kotlin/Any| { + public abstract operator fun f(collection: R|ft, kotlin/collections/Collection?>|!): R|kotlin/Unit| - public abstract operator fun f(comparator: R|ft, kotlin/Comparable?>|!): R|kotlin/Unit| + public abstract operator fun f(comparator: R|ft, kotlin/Comparable?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/Simple.fir.txt b/compiler/testData/loadJava/compiledJava/Simple.fir.txt index 197f1dfe676..7e56454ef27 100644 --- a/compiler/testData/loadJava/compiledJava/Simple.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt b/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt index 1b75245eb59..cf16b09afeb 100644 --- a/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt +++ b/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|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/TwoFields.fir.txt b/compiler/testData/loadJava/compiledJava/TwoFields.fir.txt index f459b614d06..738156800a3 100644 --- a/compiler/testData/loadJava/compiledJava/TwoFields.fir.txt +++ b/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 diff --git a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt b/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt index d382d40077b..2b69b6cbfbb 100644 --- a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt +++ b/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<*>?>|! public final operator fun collection(): R|ft, kotlin/collections/Collection<*>?>|! diff --git a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt b/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt index de6edb9a8f3..67dee53d1a6 100644 --- a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt +++ b/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?>|!, y: R|ft, test/WildcardBounds.A?>|!): R|kotlin/Unit| +public open class WildcardBounds : R|kotlin/Any| { + public/*package*/ open operator fun foo(x: R|ft, test/WildcardBounds.A?>|!, y: R|ft, test/WildcardBounds.A?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.fir.txt index be2bc785f1b..93a4b7e9df9 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.fir.txt index f5defcf9eb9..a60be606ac5 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt index 554ab7039f2..aa1e77ce7df 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt @@ -1,4 +1,4 @@ -public final enum class AnnotatedEnumEntry : R|java/lang/Enum| { +public final enum class AnnotatedEnumEntry : R|kotlin/Enum| { @R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static val E1: R|ft|! public get(): R|ft|! diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt index 59f6a9eed55..7481c733e08 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt +++ b/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| diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt index 55eca670b77..8b180ff81a8 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt index 959fddeb39f..22d8ed87645 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt index f48560f6397..341cc8af381 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt +++ b/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|!, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt index 61c9cc0ea38..13c74e91d06 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt +++ b/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/List>?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.fir.txt index 3d61d7fd358..9223a7c130a 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.fir.txt index 7cf7022274c..2392aa7891a 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.fir.txt index 3fbee81feff..8600ddf4a22 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.fir.txt index 699826cb262..3f42c993451 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.fir.txt index 4d157436d34..57fdfc61e4b 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.fir.txt index 2fc2f8f0f9f..b0fb5241300 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt index e7c9c4fdac7..bdba4392e37 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt index ba6e3badac8..246bfd1b5d8 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt index cc63baa8a79..b145b152832 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt index cbf19eb5e53..268096abf98 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.fir.txt index 10d56902fa1..5ad89fb1da2 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.fir.txt index 6c55b01e9a5..81494af26f7 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.fir.txt index eb72449e468..61d8382cb3b 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt index 4fff793a4d2..b18e67dbafe 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt +++ b/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|((R|test/EnumArgumentWithCustomToString.E.CAKE|(), R|test/EnumArgumentWithCustomToString.E.CAKE|())) public/*package*/ open operator fun annotated(): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt index 856212e7c3f..e35018306fd 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt @@ -1,4 +1,4 @@ -public final enum class EnumConstructorParameter : R|java/lang/Enum| { +public final enum class EnumConstructorParameter : R|kotlin/Enum| { public final static val INSTANCE: R|ft|! public get(): R|ft|! diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.fir.txt index 4cef4eabd1d..3858bc954b8 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt index 7eba5c5b3a9..7a85eec3d60 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt +++ b/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|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt index 9a1db9d6e38..ccacdcc5b5a 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.fir.txt index 2b7bfbb693a..3e4b81f33df 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.fir.txt index e243707d1b6..d38c9ea07d7 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.fir.txt index ae1400161bd..c51ebdd9764 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.fir.txt index 9e2b3f31af6..ac21c69f935 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.fir.txt index 9d595fbfe9f..7b887cc4916 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt index 3a692f3433b..dc4c17e61a5 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt +++ b/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|! public get(): R|ft|! diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/StringInParam.fir.txt index ba64462bb2c..b41313f8829 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/StringInParam.fir.txt +++ b/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| { } diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt index ea593adf21d..1209745d4f1 100644 --- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt +++ b/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

(cl: R|ft>, java/lang/Class>?>|!): R|test/ConstructorGenericDeep| } diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt index 6df2397340e..e88567dbb3a 100644 --- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt +++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt @@ -1,4 +1,4 @@ -public open class ConstructorGenericSimple : R|java/lang/Object| { +public open class ConstructorGenericSimple : R|kotlin/Any| { public constructor

(p: R|ft|!): R|test/ConstructorGenericSimple| } diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt index 66ef61fca46..9fb5acdfbff 100644 --- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt @@ -1,4 +1,4 @@ -public open class ConstructorGenericUpperBound : R|java/lang/Object| { +public open class ConstructorGenericUpperBound : R|kotlin/Any| { public constructor

(p: R|ft|!): R|test/ConstructorGenericUpperBound| } diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt index 274af85e378..c6b279ae0c2 100644 --- a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt +++ b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt @@ -1,4 +1,4 @@ -public final enum class EnumMembers : R|java/lang/Enum| { +public final enum class EnumMembers : R|kotlin/Enum| { public final static val FIRST: R|ft|! public get(): R|ft|! diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt index 8c5b617be28..0a80c49523a 100644 --- a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt +++ b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt @@ -1,4 +1,4 @@ -public open enum class EnumWithSpecializedEntry : R|java/lang/Enum| { +public open enum class EnumWithSpecializedEntry : R|kotlin/Enum| { public final static val E1: R|ft|! public get(): R|ft|! diff --git a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt index f25d65cf28a..68d1797c12c 100644 --- a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt +++ b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt @@ -1,4 +1,4 @@ -public final enum class JavaEnum : R|java/lang/Enum| { +public final enum class JavaEnum : R|kotlin/Enum| { public final static val ENTRY: R|ft|! public get(): R|ft|! diff --git a/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt index ca590977079..473ce317d65 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt @@ -1,4 +1,4 @@ -public open class DifferentGetterAndSetter : R|java/lang/Object| { +public open class DifferentGetterAndSetter : R|kotlin/Any| { public open operator fun setSomething(color: R|ft|!): R|kotlin/Unit| public open operator fun getSomething(): R|kotlin/Int| diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.fir.txt index 4b5f639ea48..ce13236ee1d 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.fir.txt @@ -1,4 +1,4 @@ -public abstract interface JavaBeanAbstractGetter : R|java/lang/Object| { +public abstract interface JavaBeanAbstractGetter : R|kotlin/Any| { public abstract operator fun getRed(): R|kotlin/Int| public abstract operator fun getBlue(): R|kotlin/Int| diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt index bdf97debbca..a818c2950fb 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt @@ -1,4 +1,4 @@ -public open class JavaBeanVal : R|java/lang/Object| { +public open class JavaBeanVal : R|kotlin/Any| { public open operator fun getColor(): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt index 4e31f68a3f1..289d408cf3d 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt @@ -1,4 +1,4 @@ -public open class JavaBeanVar : R|java/lang/Object| { +public open class JavaBeanVar : R|kotlin/Any| { public open operator fun getColor(): R|ft|! public open operator fun setColor(string: R|ft|!): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt index 2aaa5ae225f..ca10cf19a28 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt @@ -1,4 +1,4 @@ -public open class JavaBeanVarOfGenericType

: R|java/lang/Object| { +public open class JavaBeanVarOfGenericType

: R|kotlin/Any| { public open operator fun getCharacters(): R|ft>, java/util/ArrayList>?>|! public open operator fun setCharacters(characters: R|ft>, java/util/ArrayList>?>|!): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt index 61f3e85ae89..aaca704209e 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt @@ -1,4 +1,4 @@ -public open class TwoSetters : R|java/lang/Object| { +public open class TwoSetters : R|kotlin/Any| { public open operator fun setSize(size: R|ft|!): R|kotlin/Unit| public open operator fun setSize(size: R|kotlin/Int|): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt index 40b0f68444d..469cc3a57e1 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt @@ -1,4 +1,4 @@ -public open class AllBoundsInWhen : R|java/lang/Object| { +public open class AllBoundsInWhen : R|kotlin/Any| { public open operator fun foo(): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt index 6e5631e8427..7c7f7c16d53 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt @@ -1,4 +1,4 @@ -public open class ArrayType : R|java/lang/Object| { - public open operator fun foo(): R|kotlin/Array>| +public open class ArrayType : R|kotlin/Any| { + public open operator fun foo(): R|kotlin/Array>| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt index 40de11e3be7..a60bfdac6d7 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt @@ -1,4 +1,4 @@ -public open class ConstructorWithNewTypeParams : R|java/lang/Object| { +public open class ConstructorWithNewTypeParams : R|kotlin/Any| { public constructor(first: R|ft|!): R|test/ConstructorWithNewTypeParams| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt index 933b4cd915d..1abd7f38e7b 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt @@ -1,4 +1,4 @@ -public open class ConstructorWithParentTypeParams : R|java/lang/Object| { +public open class ConstructorWithParentTypeParams : R|kotlin/Any| { public constructor(first: R|ft|!): R|test/ConstructorWithParentTypeParams| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt index f15439c9874..5af845ae883 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt @@ -1,4 +1,4 @@ -public open class ConstructorWithSeveralParams : R|java/lang/Object| { +public open class ConstructorWithSeveralParams : R|kotlin/Any| { public constructor(integer: R|ft|!, intBasic: R|kotlin/Int|, collection: R|ft>, java/util/ArrayList>?>|!): R|test/ConstructorWithSeveralParams| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.fir.txt index bdb807b2c47..3e5c766637c 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.fir.txt @@ -1,4 +1,4 @@ -public open class ConstructorWithoutParams : R|java/lang/Object| { +public open class ConstructorWithoutParams : R|kotlin/Any| { public constructor(): R|test/ConstructorWithoutParams| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt index 8639ae3b52b..131803e322e 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt @@ -1,4 +1,4 @@ -public open class CustomProjectionKind : R|java/lang/Object| { +public open class CustomProjectionKind : R|kotlin/Any| { public open operator fun foo(): R|ft>, kotlin/collections/List>?>|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt index 759c3ad1a15..e3cd4063aee 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt @@ -1,4 +1,4 @@ -public open class MethodWithFunctionTypes : R|java/lang/Object| { +public open class MethodWithFunctionTypes : R|kotlin/Any| { public open operator fun foo(f: R|ft, ft>, kotlin/Function1, ft>?>|!): R|ft>, kotlin/Function0>?>|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt index 5cc2dd17910..772e63e43a0 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt @@ -1,4 +1,4 @@ -public open class MethodWithGenerics : R|java/lang/Object| { +public open class MethodWithGenerics : R|kotlin/Any| { public open operator fun foo(a: R|ft|!, b: R|ft, ft>, kotlin/collections/Map.Entry, ft>?>>, kotlin/collections/List, ft>, kotlin/collections/Map.Entry, ft>?>>?>|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt index 1299871a77b..908874b49c9 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt @@ -1,4 +1,4 @@ -public open class MethodWithMappedClasses : R|java/lang/Object| { +public open class MethodWithMappedClasses : R|kotlin/Any| { public open operator fun copy(dest: R|ft, kotlin/collections/List?>|!, src: R|ft>, kotlin/collections/List>?>|!): R|kotlin/Unit| public open operator fun copyMap(dest: R|ft, in T>, kotlin/collections/Map, in T>?>|!, src: R|ft, ft>, kotlin/collections/Map, ft>?>|!): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt index bd9dc50439e..febeb879eff 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt @@ -1,4 +1,4 @@ -public open class MethodWithTypeParameters : R|java/lang/Object| { - public open operator fun |> foo(a: R|ft|!, b: R|ft, kotlin/collections/List?>|!, list: R|ft, kotlin/collections/List?>|!): R|kotlin/Unit| +public open class MethodWithTypeParameters : R|kotlin/Any| { + public open operator fun |> foo(a: R|ft|!, b: R|ft, kotlin/collections/List?>|!, list: R|ft, kotlin/collections/List?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt index b967f460009..b1d1367a3f0 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt @@ -1,4 +1,4 @@ -public open class MethodWithVararg : R|java/lang/Object| { - public open operator fun foo(vararg s: R|kotlin/Array>|): R|kotlin/Unit| +public open class MethodWithVararg : R|kotlin/Any| { + public open operator fun foo(vararg s: R|kotlin/Array>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt index 284937136f3..e653b43bf66 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt @@ -1,11 +1,11 @@ -public open class PropertyArrayTypes : R|java/lang/Object| { - public open var arrayOfArrays: R|kotlin/Array>, kotlin/Array>?>>| - public get(): R|kotlin/Array>, kotlin/Array>?>>| - public set(value: R|kotlin/Array>, kotlin/Array>?>>|): kotlin/Unit +public open class PropertyArrayTypes : R|kotlin/Any| { + public open var arrayOfArrays: R|kotlin/Array>, kotlin/Array>?>>| + public get(): R|kotlin/Array>, kotlin/Array>?>>| + public set(value: R|kotlin/Array>, kotlin/Array>?>>|): kotlin/Unit - public open var array: R|kotlin/Array>| - public get(): R|kotlin/Array>| - public set(value: R|kotlin/Array>|): kotlin/Unit + public open var array: R|kotlin/Array>| + public get(): R|kotlin/Array>| + public set(value: R|kotlin/Array>|): kotlin/Unit public open var genericArray: R|kotlin/Array>| public get(): R|kotlin/Array>| diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt index b341a2cb896..1345a09f4a4 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt @@ -1,4 +1,4 @@ -public open class PropertyComplexTypes : R|java/lang/Object| { +public open class PropertyComplexTypes : R|kotlin/Any| { public open var genericType: R|ft|! public get(): R|ft|! public set(value: R|ft|!): kotlin/Unit diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt index 9f8004741dc..6119ba72702 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt @@ -1,4 +1,4 @@ -public open class PropertySimpleType : R|java/lang/Object| { +public open class PropertySimpleType : R|kotlin/Any| { public open var fieldOne: R|ft|! public get(): R|ft|! public set(value: R|ft|!): kotlin/Unit diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt index 24e1484edcc..808956593b4 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt @@ -1,4 +1,4 @@ -public final class StarProjection : R|java/lang/Object| { +public final class StarProjection : R|kotlin/Any| { public final operator fun foo(): R|ft, test/StarProjection.MyClass<*>?>|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt index 4cdb83a1cf3..b37998a0cc3 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt @@ -1,4 +1,4 @@ -public open class WrongProjectionKind : R|java/lang/Object| { - public open operator fun copy(from: R|kotlin/Array>|, to: R|kotlin/Array>|): R|ft>, kotlin/collections/List>?>|! +public open class WrongProjectionKind : R|kotlin/Any| { + public open operator fun copy(from: R|kotlin/Array>|, to: R|kotlin/Array>|): R|ft>, kotlin/collections/List>?>|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt index 6619a14b8fb..36a10f4a18b 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt @@ -1,4 +1,4 @@ -public open class WrongReturnTypeStructure : R|java/lang/Object| { +public open class WrongReturnTypeStructure : R|kotlin/Any| { public open operator fun foo(a: R|ft|!, b: R|ft, ft>, kotlin/collections/Map.Entry, ft>?>>, kotlin/collections/List, ft>, kotlin/collections/Map.Entry, ft>?>>?>|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt index 9716754d605..ac6464ce5bc 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt @@ -1,4 +1,4 @@ -public open class WrongTypeParameterBoundStructure1 : R|java/lang/Object| { - public open operator fun |> foo(a: R|ft|!, b: R|ft, kotlin/collections/List?>|!): R|kotlin/Unit| +public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| { + public open operator fun |> foo(a: R|ft|!, b: R|ft, kotlin/collections/List?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt index ffa80c61b59..f87e6c4e9b2 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt @@ -1,4 +1,4 @@ -public open class WrongValueParameterStructure1 : R|java/lang/Object| { +public open class WrongValueParameterStructure1 : R|kotlin/Any| { public open operator fun foo(a: R|ft|!, b: R|ft, ft>, kotlin/collections/Map.Entry, ft>?>>, kotlin/collections/List, ft>, kotlin/collections/Map.Entry, ft>?>>?>|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.fir.txt index a31b2d2be4b..227c1585564 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.fir.txt @@ -1,2 +1,2 @@ -public abstract interface PropagateTypeArgumentNullable : R|java/lang/Object| { +public abstract interface PropagateTypeArgumentNullable : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.fir.txt index 863fad079e7..3f7d79ec944 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.fir.txt @@ -1,2 +1,2 @@ -public abstract interface ChangeProjectionKind1 : R|java/lang/Object| { +public abstract interface ChangeProjectionKind1 : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt index 92b804ff6df..f7fca4cd27b 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt @@ -1,2 +1,2 @@ -public abstract interface DeeplySubstitutedClassParameter : R|java/lang/Object| { +public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt index 40d404c3360..38ce7269fc5 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt @@ -1,2 +1,2 @@ -public abstract interface DeeplySubstitutedClassParameter2 : R|java/lang/Object| { +public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.fir.txt index 183aebc0fa4..f7642da6e20 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritNotVararg : R|java/lang/Object| { +public abstract interface InheritNotVararg : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.fir.txt index c4b2b5ce5a7..9951bc1f004 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritNotVarargInteger : R|java/lang/Object| { +public abstract interface InheritNotVarargInteger : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.fir.txt index 0d19bde0c5a..de852f7f8f8 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritNotVarargNotNull : R|java/lang/Object| { +public abstract interface InheritNotVarargNotNull : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.fir.txt index c4b7bb841ac..3d947edad17 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritNotVarargPrimitive : R|java/lang/Object| { +public abstract interface InheritNotVarargPrimitive : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.fir.txt index bf967760004..3e550e5a48f 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritNullability : R|java/lang/Object| { +public abstract interface InheritNullability : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.fir.txt index e5bcface1df..4355b91cd67 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritVararg : R|java/lang/Object| { +public abstract interface InheritVararg : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.fir.txt index 72bb95a573f..269efee4594 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritVarargInteger : R|java/lang/Object| { +public abstract interface InheritVarargInteger : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.fir.txt index b87c130715b..72cbbdda5b8 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritVarargNotNull : R|java/lang/Object| { +public abstract interface InheritVarargNotNull : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.fir.txt index 5dae72ac855..0630d3cbac2 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritVarargPrimitive : R|java/lang/Object| { +public abstract interface InheritVarargPrimitive : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt index f4b116a6538..3d6eb27c1e6 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt @@ -1,2 +1,2 @@ -public abstract interface Kt3302 : R|java/lang/Object| { +public abstract interface Kt3302 : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.fir.txt index 7336cc9ff10..d4a6ae1f7f6 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.fir.txt @@ -1,2 +1,2 @@ -public abstract interface MutableToReadOnly : R|java/lang/Object| { +public abstract interface MutableToReadOnly : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.fir.txt index 9d6d4157693..e686c9283df 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.fir.txt @@ -1,2 +1,2 @@ -public abstract interface NotNullToNullable : R|java/lang/Object| { +public abstract interface NotNullToNullable : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.fir.txt index 01b3bcbf9d6..a5fe741c51f 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.fir.txt @@ -1,2 +1,2 @@ -public abstract interface NullableToNotNull : R|java/lang/Object| { +public abstract interface NullableToNotNull : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.fir.txt index 37de3971f59..88d1947a610 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.fir.txt @@ -1,2 +1,2 @@ -public abstract interface NullableToNotNullKotlinSignature : R|java/lang/Object| { +public abstract interface NullableToNotNullKotlinSignature : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt index 54471d8056f..2eb8310dff6 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt @@ -1,2 +1,2 @@ -public abstract interface OverrideWithErasedParameter : R|java/lang/Object| { +public abstract interface OverrideWithErasedParameter : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.fir.txt index 90d4c39e10d..34ace1dcf02 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.fir.txt @@ -1,2 +1,2 @@ -public abstract interface ReadOnlyToMutable : R|java/lang/Object| { +public abstract interface ReadOnlyToMutable : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt index 4887527014a..cd36b3ddcc1 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt @@ -1,2 +1,2 @@ -public abstract interface SubclassFromGenericAndNot : R|java/lang/Object| { +public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt index 5dd2878e7fb..c21c2e539c4 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt @@ -1,2 +1,2 @@ -public abstract interface SubstitutedClassParameter : R|java/lang/Object| { +public abstract interface SubstitutedClassParameter : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt index f65d186776e..f4b865d27dc 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt @@ -1,2 +1,2 @@ -public abstract interface SubstitutedClassParameters : R|java/lang/Object| { +public abstract interface SubstitutedClassParameters : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.fir.txt index 90d123a2d43..a35bfdb3ffb 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.fir.txt @@ -1,2 +1,2 @@ -public abstract interface AddNotNullJavaSubtype : R|java/lang/Object| { +public abstract interface AddNotNullJavaSubtype : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.fir.txt index 4bc28fe6072..9a3c6fb92cd 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.fir.txt @@ -1,2 +1,2 @@ -public abstract interface AddNotNullSameJavaType : R|java/lang/Object| { +public abstract interface AddNotNullSameJavaType : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.fir.txt index 4a9cf11be9e..51f24785871 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.fir.txt @@ -1,2 +1,2 @@ -public abstract interface AddNullabilityJavaSubtype : R|java/lang/Object| { +public abstract interface AddNullabilityJavaSubtype : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.fir.txt index 43b094d15c3..ea31e5d1f06 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.fir.txt @@ -1,2 +1,2 @@ -public abstract interface AddNullabilitySameGenericType1 : R|java/lang/Object| { +public abstract interface AddNullabilitySameGenericType1 : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.fir.txt index 1053e21023a..09bb119a1a8 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.fir.txt @@ -1,2 +1,2 @@ -public abstract interface AddNullabilitySameGenericType2 : R|java/lang/Object| { +public abstract interface AddNullabilitySameGenericType2 : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.fir.txt index 0755ec0f812..0e5870f0b9c 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.fir.txt @@ -1,2 +1,2 @@ -public abstract interface AddNullabilitySameJavaType : R|java/lang/Object| { +public abstract interface AddNullabilitySameJavaType : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.fir.txt index 88c891b34b9..215a2f05e37 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.fir.txt @@ -1,2 +1,2 @@ -public abstract interface CantMakeImmutableInSubclass : R|java/lang/Object| { +public abstract interface CantMakeImmutableInSubclass : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt index 92b804ff6df..f7fca4cd27b 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt @@ -1,2 +1,2 @@ -public abstract interface DeeplySubstitutedClassParameter : R|java/lang/Object| { +public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt index 40d404c3360..38ce7269fc5 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt @@ -1,2 +1,2 @@ -public abstract interface DeeplySubstitutedClassParameter2 : R|java/lang/Object| { +public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt index ec9f5510ff7..6461b4a7e52 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt @@ -1,2 +1,2 @@ -public abstract interface HalfSubstitutedTypeParameters : R|java/lang/Object| { +public abstract interface HalfSubstitutedTypeParameters : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.fir.txt index 3d5f388be52..7d3b3ce0779 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritNullabilityGenericSubclassSimple : R|java/lang/Object| { +public abstract interface InheritNullabilityGenericSubclassSimple : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.fir.txt index f4baa3bf441..6f6e51aac65 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritNullabilityJavaSubtype : R|java/lang/Object| { +public abstract interface InheritNullabilityJavaSubtype : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.fir.txt index b1a95360103..cc52e52a1c2 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritNullabilitySameGenericType : R|java/lang/Object| { +public abstract interface InheritNullabilitySameGenericType : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.fir.txt index 50e2e8aecdb..efba5445553 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritNullabilitySameJavaType : R|java/lang/Object| { +public abstract interface InheritNullabilitySameJavaType : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.fir.txt index 15464a6d1d0..e48cbd30720 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritProjectionKind : R|java/lang/Object| { +public abstract interface InheritProjectionKind : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.fir.txt index 3d96271ad89..865aed62bf9 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritReadOnlinessOfArgument : R|java/lang/Object| { +public abstract interface InheritReadOnlinessOfArgument : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.fir.txt index f0fa5d2a852..d716255439f 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritReadOnlinessSameClass : R|java/lang/Object| { +public abstract interface InheritReadOnlinessSameClass : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.fir.txt index 69dbecbd100..ab826d68ff4 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritReadOnlinessSubclass : R|java/lang/Object| { +public abstract interface InheritReadOnlinessSubclass : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.fir.txt index 026afd073c2..a733540fee6 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.fir.txt @@ -1,2 +1,2 @@ -public abstract interface SameProjectionKind : R|java/lang/Object| { +public abstract interface SameProjectionKind : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt index 4887527014a..cd36b3ddcc1 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt @@ -1,2 +1,2 @@ -public abstract interface SubclassFromGenericAndNot : R|java/lang/Object| { +public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt index 8436830cade..bcfcf4f8368 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt @@ -1,4 +1,4 @@ -public abstract interface SubclassOfCollection : R|java/util/Collection| { - public abstract operator fun iterator(): R|ft>, kotlin/collections/Iterator>?>|! +public abstract interface SubclassOfCollection : R|kotlin/collections/Collection| { + public abstract operator fun iterator(): R|kotlin/collections/Iterator>| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt index f1a5e80f46f..25ec1b86587 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt @@ -1,4 +1,4 @@ -public abstract interface SubclassOfMapEntry : R|java/util/Map.Entry| { +public abstract interface SubclassOfMapEntry : R|kotlin/collections/Map.Entry| { public abstract operator fun setValue(value: R|ft|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt index 5dd2878e7fb..c21c2e539c4 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt @@ -1,2 +1,2 @@ -public abstract interface SubstitutedClassParameter : R|java/lang/Object| { +public abstract interface SubstitutedClassParameter : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt index f65d186776e..f4b865d27dc 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt @@ -1,2 +1,2 @@ -public abstract interface SubstitutedClassParameters : R|java/lang/Object| { +public abstract interface SubstitutedClassParameters : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.fir.txt index 56f8983ac01..31ac4d2bd41 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.fir.txt @@ -1,2 +1,2 @@ -public abstract interface TwoSuperclassesConflictingProjectionKinds : R|java/lang/Object| { +public abstract interface TwoSuperclassesConflictingProjectionKinds : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.fir.txt index 5810bc01ae0..6614172e3f4 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.fir.txt @@ -1,2 +1,2 @@ -public abstract interface TwoSuperclassesInvariantAndCovariantInferMutability : R|java/lang/Object| { +public abstract interface TwoSuperclassesInvariantAndCovariantInferMutability : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.fir.txt index 57d2a9ba66b..1b99a879765 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.fir.txt @@ -1,2 +1,2 @@ -public abstract interface TwoSuperclassesInvariantAndCovariantInferNullability : R|java/lang/Object| { +public abstract interface TwoSuperclassesInvariantAndCovariantInferNullability : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.fir.txt index d3b9c465423..0deb7ed8c65 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.fir.txt @@ -1,2 +1,2 @@ -public abstract interface TwoSuperclassesMutableAndNot : R|java/lang/Object| { +public abstract interface TwoSuperclassesMutableAndNot : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.fir.txt index e9b9e060949..fb0a5205500 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.fir.txt @@ -1,2 +1,2 @@ -public abstract interface TwoSuperclassesReturnJavaSubtype : R|java/lang/Object| { +public abstract interface TwoSuperclassesReturnJavaSubtype : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.fir.txt index 263139a460a..a2d0b73d3f4 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.fir.txt @@ -1,2 +1,2 @@ -public abstract interface TwoSuperclassesReturnSameJavaType : R|java/lang/Object| { +public abstract interface TwoSuperclassesReturnSameJavaType : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.fir.txt index 1cd91a8f8e4..4d17d09d783 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.fir.txt @@ -1,2 +1,2 @@ -public abstract interface TwoSuperclassesSupplementNotNull : R|java/lang/Object| { +public abstract interface TwoSuperclassesSupplementNotNull : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt index 91f47572727..6f2bb0dc532 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt @@ -1,2 +1,2 @@ -public abstract interface TypeParamOfClass : R|java/lang/Object| { +public abstract interface TypeParamOfClass : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt index cba571f39ef..68e4b74d343 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt @@ -1,2 +1,2 @@ -public abstract interface TypeParamOfClassSubstituted : R|java/lang/Object| { +public abstract interface TypeParamOfClassSubstituted : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt index b4110687808..5345d8ebf0d 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt @@ -1,2 +1,2 @@ -public abstract interface TypeParamOfFun : R|java/lang/Object| { +public abstract interface TypeParamOfFun : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt index bf967760004..3e550e5a48f 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritNullability : R|java/lang/Object| { +public abstract interface InheritNullability : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt index 798960c2745..b3b89d3f6f3 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt @@ -1,2 +1,2 @@ -public abstract interface TwoBounds : R|java/lang/Object| { +public abstract interface TwoBounds : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt index 7bd6f85f4e6..2185f42dec7 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt @@ -1,2 +1,2 @@ -public abstract interface TwoSuperclasses : R|java/lang/Object| { +public abstract interface TwoSuperclasses : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt index 23726055514..5ca02f3bdfa 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt @@ -1,2 +1,2 @@ -public abstract interface TwoTypeParameters : R|java/lang/Object| { +public abstract interface TwoTypeParameters : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt index 0160222f605..b6481dd5d03 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt @@ -1,2 +1,2 @@ -public abstract interface UseParameterAsUpperBound : R|java/lang/Object| { +public abstract interface UseParameterAsUpperBound : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt index 4aa49cab185..5ca09609269 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt @@ -1,2 +1,2 @@ -public abstract interface UseParameterInUpperBound : R|java/lang/Object| { +public abstract interface UseParameterInUpperBound : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt index 0fbe5161a82..5139b6b9957 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt @@ -1,2 +1,2 @@ -public abstract interface UseParameterInUpperBoundWithKotlinSignature : R|java/lang/Object| { +public abstract interface UseParameterInUpperBoundWithKotlinSignature : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt index 463d548524b..8a75b7c1f8a 100644 --- a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt +++ b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt @@ -1,4 +1,4 @@ -public abstract interface LoadIterable : R|java/lang/Object| { +public abstract interface LoadIterable : R|kotlin/Any| { public abstract operator fun getIterable(): R|ft>, kotlin/collections/Iterable>?>|! public abstract operator fun setIterable(Iterable: R|ft>, kotlin/collections/Iterable>?>|!): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt index 3152bbe08cb..d1b3de64fe1 100644 --- a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt +++ b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt @@ -1,4 +1,4 @@ -public abstract interface LoadIterator : R|java/lang/Object| { +public abstract interface LoadIterator : R|kotlin/Any| { public abstract operator fun getIterator(): R|ft>, kotlin/collections/Iterator>?>|! public abstract operator fun setIterator(iterator: R|ft>, kotlin/collections/Iterator>?>|!): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt index bd36d5831ec..8c62c1f8127 100644 --- a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt +++ b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt @@ -1,4 +1,4 @@ -public open class Max : R|java/lang/Object| { - public open operator fun |> max(coll: R|ft, kotlin/collections/Collection?>|!): R|ft|! +public open class Max : R|kotlin/Any| { + public open operator fun |> max(coll: R|ft, kotlin/collections/Collection?>|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt index 056de4668b3..8318f85d2da 100644 --- a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt +++ b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt @@ -1,4 +1,4 @@ -public open class ModalityOfFakeOverrides : R|java/util/AbstractList| { +public open class ModalityOfFakeOverrides : R|java/util/AbstractList| { @R|java/lang/Override|() @R|org/jetbrains/annotations/NotNull|() public open operator fun get(index: R|kotlin/Int|): R|kotlin/String| @R|java/lang/Override|() public open operator fun size(): R|kotlin/Int| diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt index 643967d9c75..b7b399d597a 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt @@ -1,4 +1,4 @@ -public abstract interface LoadIterable : R|java/lang/Object| { +public abstract interface LoadIterable : R|kotlin/Any| { @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft>, kotlin/collections/MutableIterable>?>|! public abstract operator fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, kotlin/collections/MutableIterable>?>|!): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt index b41d691eb09..d1a76b1d714 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt @@ -1,4 +1,4 @@ -public abstract interface LoadIterableWithConflict : R|java/lang/Object| { +public abstract interface LoadIterableWithConflict : R|kotlin/Any| { @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft>, kotlin/collections/Iterable>?>|! public abstract operator fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, kotlin/collections/Iterable>?>|!): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt index 8c9da847053..3815f847e03 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt @@ -1,4 +1,4 @@ -public abstract interface LoadIterableWithNullability : R|java/lang/Object| { +public abstract interface LoadIterableWithNullability : R|kotlin/Any| { @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|kotlin/collections/MutableIterable>| public abstract operator fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|kotlin/collections/MutableIterable>|): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt index 37f597deb63..0c4c3c19312 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt @@ -1,2 +1,2 @@ -public abstract interface LoadIterableWithPropagation : R|java/lang/Object| { +public abstract interface LoadIterableWithPropagation : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt index 39a5bd4ff40..c7fa4b5ca85 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt @@ -1,6 +1,6 @@ -public abstract interface ReadOnlyExtendsWildcard : R|java/lang/Object| { +public abstract interface ReadOnlyExtendsWildcard : R|kotlin/Any| { public abstract operator fun bar(): R|kotlin/Unit| - public abstract operator fun foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft, kotlin/collections/List?>|!, @R|org/jetbrains/annotations/NotNull|() y: R|kotlin/Comparable|): R|kotlin/Unit| + public abstract operator fun foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft, kotlin/collections/List?>|!, @R|org/jetbrains/annotations/NotNull|() y: R|kotlin/Comparable|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt index da5dd26962b..3af32e72c0a 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt @@ -1,4 +1,4 @@ -public open class NotNullField : R|java/lang/Object| { +public open class NotNullField : R|kotlin/Any| { @R|org/jetbrains/annotations/NotNull|() public open var hi: R|kotlin/String| public get(): R|kotlin/String| public set(value: R|kotlin/String|): kotlin/Unit diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.fir.txt index 8fa79169f07..3eb9412d018 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.fir.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.fir.txt @@ -1,4 +1,4 @@ -public open class NotNullIntArray : R|java/lang/Object| { +public open class NotNullIntArray : R|kotlin/Any| { @R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|kotlin/IntArray| } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt index 7698a8e0705..c199c2895ce 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt @@ -1,4 +1,4 @@ -public open class NotNullMethod : R|java/lang/Object| { +public open class NotNullMethod : R|kotlin/Any| { @R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|kotlin/String| } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt index 34da1335b03..25672293962 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt @@ -1,4 +1,4 @@ -public open class NotNullObjectArray : R|java/lang/Object| { - @R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|kotlin/Array>| +public open class NotNullObjectArray : R|kotlin/Any| { + @R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|kotlin/Array>| } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt index e9ca56b3ce1..6e8ba6af528 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt @@ -1,4 +1,4 @@ -public open class NotNullParameter : R|java/lang/Object| { +public open class NotNullParameter : R|kotlin/Any| { public open operator fun hi(@R|org/jetbrains/annotations/NotNull|() param: R|kotlin/String|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.fir.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.fir.txt index dd7f4652003..63594f1a550 100644 --- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.fir.txt +++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.fir.txt @@ -1,2 +1,2 @@ -public open class ProtectedPackageConstructor : R|java/lang/Object| { +public open class ProtectedPackageConstructor : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.fir.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.fir.txt index 94753899f9a..0790a7bf33b 100644 --- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.fir.txt +++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.fir.txt @@ -1,4 +1,4 @@ -public open class ProtectedPackageFun : R|java/lang/Object| { +public open class ProtectedPackageFun : R|kotlin/Any| { protected/*protected and package*/ open operator fun foo(): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.fir.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.fir.txt index 588a5a7674d..99753f00219 100644 --- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.fir.txt +++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.fir.txt @@ -1,4 +1,4 @@ -public open class ProtectedPackageProperty : R|java/lang/Object| { +public open class ProtectedPackageProperty : R|kotlin/Any| { protected/*protected and package*/ open var foo: R|kotlin/Int| protected/*protected and package*/ get(): R|kotlin/Int| protected/*protected and package*/ set(value: R|kotlin/Int|): kotlin/Unit diff --git a/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.fir.txt b/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.fir.txt index b788affc4fa..1155455e80a 100644 --- a/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.fir.txt @@ -1,2 +1,2 @@ -public open class ConstructorInProtectedStaticNestedClass : R|java/lang/Object| { +public open class ConstructorInProtectedStaticNestedClass : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/rendering/Rendering.fir.txt b/compiler/testData/loadJava/compiledJava/rendering/Rendering.fir.txt index 4c74193a329..f88b112e7bd 100644 --- a/compiler/testData/loadJava/compiledJava/rendering/Rendering.fir.txt +++ b/compiler/testData/loadJava/compiledJava/rendering/Rendering.fir.txt @@ -1,2 +1,2 @@ -public open class Rendering : R|java/lang/Object| { +public open class Rendering : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt index ca88ca8e464..593a4eaef91 100644 --- a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt @@ -1,6 +1,6 @@ -public abstract interface Comparator : R|java/lang/Object| { +public abstract interface Comparator : R|kotlin/Any| { public abstract operator fun compare(o1: R|ft|!, o2: R|ft|!): R|kotlin/Int| - public abstract operator fun equals(obj: R|ft|!): R|kotlin/Boolean| + public abstract operator fun equals(obj: R|kotlin/Any|?): R|kotlin/Boolean| } diff --git a/compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt b/compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt index 86f6ed1737c..e176674edb8 100644 --- a/compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt @@ -1,2 +1,2 @@ -public final class DifferentParametersCount : R|java/lang/Object| { +public final class DifferentParametersCount : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt index a7ac2c2b225..49be6e73b84 100644 --- a/compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt @@ -1,2 +1,2 @@ -public final class FakeStaticOverrides : R|java/lang/Object| { +public final class FakeStaticOverrides : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt index 1d17616a22f..59c8fc2fde8 100644 --- a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt @@ -1,4 +1,4 @@ -public abstract interface FilenameFilter : R|java/lang/Object| { +public abstract interface FilenameFilter : R|kotlin/Any| { public abstract operator fun accept(dir: R|ft|!, name: R|ft|!): R|kotlin/Boolean| } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt index af21113fc4c..46e9aacaa49 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt @@ -1,4 +1,4 @@ -public abstract interface GenericInterfaceParameterWithSelfBound|> : R|java/lang/Object| { +public abstract interface GenericInterfaceParameterWithSelfBound|> : R|kotlin/Any| { public abstract operator fun method(t: R|ft|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt index dbdedd38984..30463ac53cd 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt @@ -1,4 +1,4 @@ -public abstract interface GenericInterfaceParametersWithBounds|, R|java/lang/Cloneable|, B : R|java/util/List|> : R|java/lang/Object| { +public abstract interface GenericInterfaceParametersWithBounds|, R|kotlin/Cloneable|, B : R|kotlin/collections/List|> : R|kotlin/Any| { public abstract operator fun method(a: R|kotlin/Array>|, b: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt index d39cd2966a7..a12537b7965 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt @@ -1,4 +1,4 @@ -public abstract interface GenericMethodParameters : R|java/lang/Object| { - public abstract operator fun |> method(a: R|kotlin/Array>|, b: R|ft|!): R|kotlin/Unit| +public abstract interface GenericMethodParameters : R|kotlin/Any| { + public abstract operator fun |> method(a: R|kotlin/Array>|, b: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.fir.txt b/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.fir.txt index 82d1743b887..599609185d2 100644 --- a/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.fir.txt @@ -1,4 +1,4 @@ -public abstract interface InterfaceWithObjectMethod : R|java/lang/Object| { - public abstract operator fun toString(): R|ft|! +public abstract interface InterfaceWithObjectMethod : R|kotlin/Any| { + public abstract operator fun toString(): R|kotlin/String| } diff --git a/compiler/testData/loadJava/compiledJava/sam/Nested.fir.txt b/compiler/testData/loadJava/compiledJava/sam/Nested.fir.txt index c249549d893..96f588a5562 100644 --- a/compiler/testData/loadJava/compiledJava/sam/Nested.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/Nested.fir.txt @@ -1,2 +1,2 @@ -public abstract interface Nested : R|java/lang/Object| { +public abstract interface Nested : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/Runnable.fir.txt b/compiler/testData/loadJava/compiledJava/sam/Runnable.fir.txt index d1b02238299..153e97e33b7 100644 --- a/compiler/testData/loadJava/compiledJava/sam/Runnable.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/Runnable.fir.txt @@ -1,4 +1,4 @@ -public abstract interface Runnable : R|java/lang/Object| { +public abstract interface Runnable : R|kotlin/Any| { public abstract operator fun run(): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt index 4767d2a3f42..5f5247ead7e 100644 --- a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt @@ -1,2 +1,2 @@ -public abstract interface SamSubinterfaceOfTwo : R|java/lang/Object| { +public abstract interface SamSubinterfaceOfTwo : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt index 1cae5964d19..7bab262cf28 100644 --- a/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt @@ -1,2 +1,2 @@ -public final class StaticOverrides : R|java/lang/Object| { +public final class StaticOverrides : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt index 930e091952f..9b820565bdd 100644 --- a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt @@ -1,2 +1,2 @@ -public abstract interface SubstitutedSamInterface : R|java/util/Comparator| { +public abstract interface SubstitutedSamInterface : R|java/util/Comparator| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt index fc3d6fe97b1..11c6dfe6587 100644 --- a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt @@ -1,2 +1,2 @@ -public abstract interface SubstitutedSamInterfaceSubclassOfBuiltin : R|java/lang/Comparable| { +public abstract interface SubstitutedSamInterfaceSubclassOfBuiltin : R|kotlin/Comparable| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt index c92ec06e5ae..7d4fcf6dbaa 100644 --- a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt @@ -1,4 +1,4 @@ -public abstract interface VarargParameter : R|java/lang/Object| { - public abstract operator fun f(vararg strings: R|kotlin/Array>|): R|kotlin/Unit| +public abstract interface VarargParameter : R|kotlin/Any| { + public abstract operator fun f(vararg strings: R|kotlin/Array>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt index 4d6cbdc0b6f..9d6dcdbf7fd 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt @@ -1,4 +1,4 @@ -public open class AmbiguousAdapters : R|java/lang/Object| { +public open class AmbiguousAdapters : R|kotlin/Any| { public open operator fun foo(r: R|ft|!): R|kotlin/Unit| public open operator fun foo(c: R|ft|!): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt index 2514b49b9cc..d59735078d6 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt @@ -1,4 +1,4 @@ -public open class Basic : R|java/lang/Object| { +public open class Basic : R|kotlin/Any| { public open operator fun foo(r: R|ft|!): R|kotlin/Unit| public open static operator fun bar(r: R|ft|!): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt index 12a7dd52c53..d2e059796e3 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt @@ -1,4 +1,4 @@ -public open class Constructor : R|java/lang/Object| { +public open class Constructor : R|kotlin/Any| { public constructor(r: R|ft|!): R|test/Constructor| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt index 91eac2c2466..adef2812287 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt @@ -1,4 +1,4 @@ -public open class ConstructorWithAnnotations : R|java/lang/Object| { +public open class ConstructorWithAnnotations : R|kotlin/Any| { public constructor(r: R|ft|!, @R|org/jetbrains/annotations/NotNull|() s: R|kotlin/String|): R|test/ConstructorWithAnnotations| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.fir.txt index 1244d3abee2..fd8dd7b1762 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.fir.txt @@ -1,2 +1,2 @@ -public abstract interface DeepSamLoop : R|java/lang/Object| { +public abstract interface DeepSamLoop : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt index 6c3d4adb4c1..eb9dd1b1ece 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt @@ -1,10 +1,10 @@ -public open class NonTrivialFunctionType : R|java/lang/Object| { +public open class NonTrivialFunctionType : R|kotlin/Any| { public open operator fun foo(filenameFilter: R|ft|!): R|kotlin/Unit| public open operator fun foo(comparator: R|ft>, java/util/Comparator>?>|!): R|kotlin/Unit| public open operator fun wildcardUnbound(comparator: R|ft, java/util/Comparator<*>?>|!): R|kotlin/Unit| - public open operator fun wildcardBound(comparator: R|ft, java/util/Comparator?>|!): R|kotlin/Unit| + public open operator fun wildcardBound(comparator: R|ft, java/util/Comparator?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt index e263495c2fa..c0e2ace45a4 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt @@ -1,4 +1,4 @@ -public open class PrivateSamAdapter : R|java/lang/Object| { +public open class PrivateSamAdapter : R|kotlin/Any| { private open operator fun samAdapter(r: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt index 69d6ca60512..f2b72bdbf65 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt @@ -1,4 +1,4 @@ -public abstract interface SelfAsParameter : R|java/lang/Object| { +public abstract interface SelfAsParameter : R|kotlin/Any| { public abstract operator fun foo(p: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt index 5bd4a5bd188..d85ed5876eb 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt @@ -1,4 +1,4 @@ -public open class SeveralSamParameters : R|java/lang/Object| { +public open class SeveralSamParameters : R|kotlin/Any| { public open static operator fun findMaxAndInvokeCallback(comparator: R|ft>, java/util/Comparator>?>|!, a: R|ft|!, b: R|ft|!, afterRunnable: R|ft|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt index cb33548a611..912790ea91a 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt @@ -1,4 +1,4 @@ -public open class TypeParameterOfClass : R|java/lang/Object| { +public open class TypeParameterOfClass : R|kotlin/Any| { public open operator fun foo(comparator: R|ft>, java/util/Comparator>?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt index 6974895fefe..37dfeb2a8e2 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt @@ -1,8 +1,8 @@ -public open class TypeParameterOfMethod : R|java/lang/Object| { +public open class TypeParameterOfMethod : R|kotlin/Any| { public open static operator fun max(comparator: R|ft>, java/util/Comparator>?>|!, value1: R|ft|!, value2: R|ft|!): R|ft|! - public open static operator fun max2(comparator: R|ft>, java/util/Comparator>?>|!, value1: R|ft|!, value2: R|ft|!): R|ft|! + public open static operator fun max2(comparator: R|ft>, java/util/Comparator>?>|!, value1: R|ft|!, value2: R|ft|!): R|ft|! - public open static operator fun |> method(a: R|ft>, java/util/Comparator>?>|!, b: R|ft|!): R|kotlin/Unit| + public open static operator fun |> method(a: R|ft>, java/util/Comparator>?>|!, b: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt index 2165ac947fb..9842a0bece6 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt @@ -1,2 +1,2 @@ -public open class TypeParameterOfOuterClass : R|java/lang/Object| { +public open class TypeParameterOfOuterClass : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.fir.txt index 78c4f5a26ce..662e1b78b08 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.fir.txt @@ -1,2 +1,2 @@ -public abstract interface AdapterDoesntOverrideDeclaration : R|java/lang/Object| { +public abstract interface AdapterDoesntOverrideDeclaration : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.fir.txt index 2600b6f049f..ef3581ca668 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritedAdapterAndDeclaration : R|java/lang/Object| { +public abstract interface InheritedAdapterAndDeclaration : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.fir.txt index 002a525cf8c..48b94dc1ec3 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritedAmbiguousAdapters : R|java/lang/Object| { +public abstract interface InheritedAmbiguousAdapters : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.fir.txt index a0bab5fb57f..fd317a6f3df 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritedAndOverriddenAmbiguousAdapters : R|java/lang/Object| { +public abstract interface InheritedAndOverriddenAmbiguousAdapters : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.fir.txt index ec883355e66..f116a103d68 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritedOverridden : R|java/lang/Object| { +public abstract interface InheritedOverridden : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.fir.txt index 0915987d8fc..8602202ca5b 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritedOverriddenAdapter : R|java/lang/Object| { +public abstract interface InheritedOverriddenAdapter : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.fir.txt index 863f47c53da..e4099e004a5 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritedSameAdapters : R|java/lang/Object| { +public abstract interface InheritedSameAdapters : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt index 4cc3fcb9b90..c2114e2f471 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritedSameAdaptersWithSubstitution : R|java/lang/Object| { +public abstract interface InheritedSameAdaptersWithSubstitution : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.fir.txt index 6e01f27bcf8..57533da4714 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.fir.txt @@ -1,2 +1,2 @@ -public abstract interface InheritedSimple : R|java/lang/Object| { +public abstract interface InheritedSimple : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.fir.txt index a54145c6bc1..ca228f319af 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.fir.txt @@ -1,2 +1,2 @@ -public abstract interface OverriddenAmbiguousAdapters : R|java/lang/Object| { +public abstract interface OverriddenAmbiguousAdapters : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt b/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt index 0670d73e2c7..501d48c8a90 100644 --- a/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt @@ -1,4 +1,4 @@ -public open class StableName : R|java/lang/Object| { +public open class StableName : R|kotlin/Any| { public open operator fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt index 340774f129f..d394b21adec 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt @@ -1,2 +1,2 @@ -public abstract interface ArraysInSubtypes : R|java/lang/Object| { +public abstract interface ArraysInSubtypes : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt index 6805be9b4f9..1631b4b0608 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt @@ -1,2 +1,2 @@ -public abstract interface MethodTypeParameterErased : R|java/lang/Object| { +public abstract interface MethodTypeParameterErased : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt index 2cb98d2bb6f..8e224549fe5 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt @@ -1,2 +1,2 @@ -public open class RawSuperType : R|java/lang/Object| { +public open class RawSuperType : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt index bc416c462a8..d179e41510b 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt @@ -1,2 +1,2 @@ -public open class RawSuperTypeWithBound : R|java/lang/Object| { +public open class RawSuperTypeWithBound : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt index d48c29369e2..4ff6f359c17 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt @@ -1,2 +1,2 @@ -public open class RawSuperTypeWithRecursiveBound : R|java/lang/Object| { +public open class RawSuperTypeWithRecursiveBound : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt index 75cd4f1a0f0..c9d9de7ce5a 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt @@ -1,2 +1,2 @@ -public open class RawSuperTypeWithRecursiveBoundMultipleParameters : R|java/lang/Object| { +public open class RawSuperTypeWithRecursiveBoundMultipleParameters : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt index 362ee7458b3..c59c62d8b28 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt @@ -1,2 +1,2 @@ -public abstract interface ReturnInnerSubclassOfSupersInner : R|java/lang/Object| { +public abstract interface ReturnInnerSubclassOfSupersInner : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.fir.txt index ef81bbc9333..b1cffcdc329 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.fir.txt @@ -1,2 +1,2 @@ -public abstract interface SubclassWithRawType : R|java/lang/Object| { +public abstract interface SubclassWithRawType : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt index 0c5eb06a22e..a72174768ef 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt @@ -1,4 +1,4 @@ -public abstract interface TwoSuperclassesInconsistentGenericTypes : R|java/lang/Object| { +public abstract interface TwoSuperclassesInconsistentGenericTypes : R|kotlin/Any| { public abstract operator fun foo(): R|ft>, kotlin/collections/List>?>|! public abstract operator fun dummy(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.fir.txt b/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.fir.txt index b61376fa13c..b30d87f31a1 100644 --- a/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.fir.txt @@ -1,2 +1,2 @@ -public open class DeeplyInnerClass : R|java/lang/Object| { +public open class DeeplyInnerClass : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.fir.txt b/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.fir.txt index 604f16af4db..64eeab16656 100644 --- a/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.fir.txt @@ -1,2 +1,2 @@ -public open class DeeplyNestedStatic : R|java/lang/Object| { +public open class DeeplyNestedStatic : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt b/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt index e6d8b565465..e64aaa8f5bc 100644 --- a/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt @@ -1,4 +1,4 @@ -public final enum class Enum : R|java/lang/Enum| { +public final enum class Enum : R|kotlin/Enum| { public final static val A: R|ft|! public get(): R|ft|! diff --git a/compiler/testData/loadJava/compiledJava/static/InnerClass.fir.txt b/compiler/testData/loadJava/compiledJava/static/InnerClass.fir.txt index 7d2dfb582a1..6c423d6f72f 100644 --- a/compiler/testData/loadJava/compiledJava/static/InnerClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/InnerClass.fir.txt @@ -1,2 +1,2 @@ -public open class InnerClass : R|java/lang/Object| { +public open class InnerClass : R|kotlin/Any| { } diff --git a/compiler/testData/loadJava/compiledJava/static/Simple.fir.txt b/compiler/testData/loadJava/compiledJava/static/Simple.fir.txt index e451f4160e5..a620e3500be 100644 --- a/compiler/testData/loadJava/compiledJava/static/Simple.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/Simple.fir.txt @@ -1,4 +1,4 @@ -public open class Simple : R|java/lang/Object| { +public open class Simple : R|kotlin/Any| { public open static operator fun bar(): R|kotlin/Unit| public open operator fun foo(): R|kotlin/Unit| diff --git a/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt b/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt index cc4d1596b0e..cca5ab91cac 100644 --- a/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt @@ -1,4 +1,4 @@ -public open class StaticFinal : R|java/lang/Object| { +public open class StaticFinal : R|kotlin/Any| { public final static val publicNonNull: R|ft|! public get(): R|ft|! diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt index 2f510f908a6..30ec78c69ed 100644 --- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt @@ -1,4 +1,4 @@ -public final enum class StaticMembersInEnum : R|java/lang/Enum| { +public final enum class StaticMembersInEnum : R|kotlin/Enum| { public final static val ENTRY: R|ft|! public get(): R|ft|! @@ -15,6 +15,4 @@ public final enum class StaticMembersInEnum : R|java/lang/Enum|> valueOf(: R|ft>, java/lang/Class>?>|!, : R|ft|!): R|ft|! - } diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt index b45f2f2978d..518df13de87 100644 --- a/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt +++ b/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt @@ -1,4 +1,4 @@ -public open class VarargInt : R|java/lang/Object| { +public open class VarargInt : R|kotlin/Any| { public open operator fun vararg(vararg p: R|kotlin/IntArray|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt index 27b9717567b..681e33013a2 100644 --- a/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt +++ b/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt @@ -1,4 +1,4 @@ -public open class VarargString : R|java/lang/Object| { - public open operator fun vararg(vararg strings: R|kotlin/Array>|): R|kotlin/Unit| +public open class VarargString : R|kotlin/Any| { + public open operator fun vararg(vararg strings: R|kotlin/Array>|): R|kotlin/Unit| } diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt index 71652710768..99076db4d13 100644 --- a/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt +++ b/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt @@ -1,4 +1,4 @@ -public open class Annotated : R|java/lang/Object| { +public open class Annotated : R|kotlin/Any| { @R|org/jetbrains/annotations/NotNull|() public open operator fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String|?): R|kotlin/String| } diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt index d9a68e536a2..0b618b1ca2c 100644 --- a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt +++ b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt @@ -1,4 +1,4 @@ -public open class Annotated : R|java/lang/Object| { +public open class Annotated : R|kotlin/Any| { @R|org/jetbrains/annotations/NotNull|() public open operator fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String|?): R|kotlin/String| } diff --git a/idea/testData/fir/multiModule/basicWithJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithJava/extraDump.java.txt index 40be4417ed3..a270c7928da 100644 --- a/idea/testData/fir/multiModule/basicWithJava/extraDump.java.txt +++ b/idea/testData/fir/multiModule/basicWithJava/extraDump.java.txt @@ -1,2 +1,2 @@ -public open class Some : R|java/lang/Object| { +public open class Some : R|kotlin/Any| { } diff --git a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt index 45eb7731d72..02343d01a30 100644 --- a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt +++ b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.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(t: R|ft|!): R|ft|! } diff --git a/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt index 1531328cfe2..a57ef10eddc 100644 --- a/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt +++ b/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt @@ -1,6 +1,6 @@ -public open class Some : R|java/lang/Object| { +public open class Some : R|kotlin/Any| { public open operator fun foo(param: R|kotlin/Int|): R|kotlin/Boolean| - public open operator fun bar(arr: R|kotlin/IntArray|): R|kotlin/Array>| + public open operator fun bar(arr: R|kotlin/IntArray|): R|kotlin/Array>| } diff --git a/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt b/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt index 05fa8b5f3a4..a7486bbee6e 100644 --- a/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt +++ b/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt @@ -7,7 +7,7 @@ FILE: jvm.kt public final fun test(): R|kotlin/Unit| { lval res1: R|kotlin/Boolean| = R|/Some.foo|(Int(1)) lval res2: R|kotlin/Boolean| = R|/Some.foo|(Int(1).R|kotlin/Int.unaryMinus|()) - lval res3: R|kotlin/Array>| = R|/Some.bar|(R|kotlin/intArrayOf|(Int(0), Int(2), Int(2).R|kotlin/Int.unaryMinus|())) + lval res3: R|kotlin/Array>| = R|/Some.bar|(R|kotlin/intArrayOf|(Int(0), Int(2), Int(2).R|kotlin/Int.unaryMinus|())) } } diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/extraDump.java.txt b/idea/testData/fir/multiModule/javaInheritsKotlinProperty/extraDump.java.txt index 159b27052d7..1299237d459 100644 --- a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/extraDump.java.txt +++ b/idea/testData/fir/multiModule/javaInheritsKotlinProperty/extraDump.java.txt @@ -1,4 +1,4 @@ -public open class Inheritor : R|java/lang/Object|, R|Base| { +public open class Inheritor : R|kotlin/Any|, R|Base| { public open operator fun getX(): R|kotlin/Int| } diff --git a/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt b/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt index 64f0851c40e..6201ad2cb71 100644 --- a/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt +++ b/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt @@ -1,4 +1,4 @@ -public open class Some : R|java/lang/Object|, R|Strange<*>| { +public open class Some : R|kotlin/Any|, R|Strange<*>| { public open operator fun foo(): R|kotlin/Any| } diff --git a/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt b/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt index 4f229b1ef63..0bf4eff6aa8 100644 --- a/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt +++ b/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.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|ft|! public open operator fun bar(): R|ft|!