Raw FIR: add Any/Enum/Annotation to supertypes iff no supertypes exists

compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt

@@ -44,6 +44,8 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
 
     private val implicitEnumType = FirImplicitEnumTypeRef(session, null)
 
+    private val implicitAnnotationType = FirImplicitAnnotationTypeRef(session, null)
+
     fun buildFirFile(file: KtFile): FirFile {
         return file.accept(Visitor(), Unit) as FirFile
     }
@@ -339,13 +341,18 @@ class RawFirBuilder(val session: FirSession, val stubMode: Boolean) {
                     }
                 }
             }
-            if (this is KtClass && this.isInterface()) return delegatedSuperTypeRef
 
-            fun isEnum() = this is KtClass && this.isEnum()
-            val defaultDelegatedSuperTypeRef = if (isEnum()) implicitEnumType else implicitAnyType
-            if (delegatedSuperTypeRef == null && this.hasPrimaryConstructor()) {
+            val defaultDelegatedSuperTypeRef = when {
+                this is KtClass && this.isEnum() -> implicitEnumType
+                this is KtClass && this.isAnnotation() -> implicitAnnotationType
+                else -> implicitAnyType
+            }
+            // TODO: for enum / annotations, it *should* be empty
+            if (container.superTypeRefs.isEmpty()) {
                 container.superTypeRefs += defaultDelegatedSuperTypeRef
             }
+            if (this is KtClass && this.isInterface()) return delegatedSuperTypeRef
+
             // TODO: in case we have no primary constructor,
             // it may be not possible to determine delegated super type right here
             delegatedSuperTypeRef = delegatedSuperTypeRef ?: defaultDelegatedSuperTypeRef

compiler/fir/psi2fir/testData/rawBuilder/declarations/F.txt

@@ -3,7 +3,7 @@ FILE: F.kt
         public? constructor(): super<kotlin/Any>()
 
     }
-    public? final? class B : A, kotlin/Any {
+    public? final? class B : A {
         public? constructor(): super<kotlin/Any>()
 
     }

compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt

@@ -8,7 +8,7 @@ FILE: complexTypes.kt
         }
 
     }
-    public? final? interface Test {
+    public? final? interface Test : kotlin/Any {
         public? final? val x: a.b.C<out CharSequence, *>.D<in List<*>, *>
             public? get(): a.b.C<out CharSequence, *>.D<in List<*>, *>
 

compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt

@@ -1,11 +1,11 @@
 FILE: enums2.kt
-    public? final? interface Some {
+    public? final? interface Some : kotlin/Any {
     }
-    public? final? object O1 : Some, kotlin/Any {
+    public? final? object O1 : Some {
         public? constructor(): super<kotlin/Any>()
 
     }
-    public? final? object O2 : Some, kotlin/Any {
+    public? final? object O2 : Some {
         public? constructor(): super<kotlin/Any>()
 
     }

compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt

@@ -1,5 +1,5 @@
 FILE: genericFunctions.kt
-    public? final? interface Any {
+    public? final? interface Any : kotlin/Any {
     }
     <reified T : Any> public? final? inline fun Any.safeAs(): T? {
         ^safeAs (this# as? T)

compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt

@@ -1,5 +1,5 @@
 FILE: noPrimaryConstructor.kt
-    public? final? class NoPrimary {
+    public? final? class NoPrimary : kotlin/Any {
         public? final? val x: String
             public? get(): String
 

compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt

@@ -1,12 +1,12 @@
 FILE: simpleClass.kt
-    public? final? interface SomeInterface {
+    public? final? interface SomeInterface : kotlin/Any {
         public? final? fun foo(x: Int, y: String): String
 
         public? final? val bar: Boolean
             public? get(): Boolean
 
     }
-    public? final? class SomeClass : SomeInterface, kotlin/Any {
+    public? final? class SomeClass : SomeInterface {
         public? constructor(): super<kotlin/Any>()
 
         private final? val baz: <implicit> = Int(42)

compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.txt

@@ -1,8 +1,8 @@
 FILE: simpleTypeAlias.kt
-    public? final? interface B {
+    public? final? interface B : kotlin/Any {
     }
     public? final typealias C = B
-    public? final? class D : C, kotlin/Any {
+    public? final? class D : C {
         public? constructor(): super<kotlin/Any>()
 
     }

compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt

@@ -3,10 +3,10 @@ FILE: typeAliasWithGeneric.kt
         public? constructor(): super<kotlin/Any>()
 
     }
-    <S, T : A> public? final? interface B {
+    <S, T : A> public? final? interface B : kotlin/Any {
     }
     <T> public? final typealias C = B<T, A>
-    public? final? class D : C<A>, kotlin/Any {
+    public? final? class D : C<A> {
         public? constructor(): super<kotlin/Any>()
 
     }

compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt

@@ -1,5 +1,5 @@
 FILE: typeParameterVsNested.kt
-    public? final? interface Some {
+    public? final? interface Some : kotlin/Any {
     }
     <T : Some> public? abstract class My : kotlin/Any {
         public? constructor(): super<kotlin/Any>()

compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt

@@ -1,5 +1,5 @@
 FILE: typeParameters.kt
-    <out T : Any> public? final? interface List {
+    <out T : Any> public? final? interface List : kotlin/Any {
         public? final? operator fun get(index: Int): T
 
         public? final? infix fun concat(other: List<T>): List<T>
@@ -7,7 +7,7 @@ FILE: typeParameters.kt
     }
     public? final typealias StringList = List<out String>
     public? final typealias AnyList = List<*>
-    <out T : Any> public? abstract class AbstractList : List<T>, kotlin/Any {
+    <out T : Any> public? abstract class AbstractList : List<T> {
         public? constructor(): super<kotlin/Any>()
 
     }

compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt

@@ -1,7 +1,7 @@
 FILE: where.kt
-    public? final? interface A {
+    public? final? interface A : kotlin/Any {
     }
-    public? final? interface B {
+    public? final? interface B : kotlin/Any {
     }
     <T : A, B> public? final? class C : kotlin/Any {
         public? constructor(): super<kotlin/Any>()

compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt

@@ -1,6 +1,6 @@
 FILE: annotated.kt
-    @Target(AnnotationTarget#.EXPRESSION#) @Retention(AnnotationRetention#.SOURCE#) public? final? annotation class Ann : kotlin/Any {
-        public? constructor(): super<kotlin/Any>()
+    @Target(AnnotationTarget#.EXPRESSION#) @Retention(AnnotationRetention#.SOURCE#) public? final? annotation class Ann : kotlin/Annotation {
+        public? constructor(): super<kotlin/Annotation>()
 
     }
     public? final? fun foo(arg: Int): Int {

compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt

@@ -1,20 +1,20 @@
 FILE: collectionLiterals.kt
-    public? final? annotation class Ann1 : kotlin/Any {
-        public? constructor(arr: IntArray): super<kotlin/Any>()
+    public? final? annotation class Ann1 : kotlin/Annotation {
+        public? constructor(arr: IntArray): super<kotlin/Annotation>()
 
         public? final? val arr: IntArray = R|<local>/arr|
             public? get(): IntArray
 
     }
-    public? final? annotation class Ann2 : kotlin/Any {
-        public? constructor(arr: DoubleArray): super<kotlin/Any>()
+    public? final? annotation class Ann2 : kotlin/Annotation {
+        public? constructor(arr: DoubleArray): super<kotlin/Annotation>()
 
         public? final? val arr: DoubleArray = R|<local>/arr|
             public? get(): DoubleArray
 
     }
-    public? final? annotation class Ann3 : kotlin/Any {
-        public? constructor(arr: Array<String>): super<kotlin/Any>()
+    public? final? annotation class Ann3 : kotlin/Annotation {
+        public? constructor(arr: Array<String>): super<kotlin/Annotation>()
 
         public? final? val arr: Array<String> = R|<local>/arr|
             public? get(): Array<String>

compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt

@@ -1,10 +1,10 @@
 FILE: super.kt
-    public? final? interface A {
+    public? final? interface A : kotlin/Any {
         public? final? fun foo(): kotlin/Unit {
         }
 
     }
-    public? final? interface B {
+    public? final? interface B : kotlin/Any {
         public? final? fun foo(): kotlin/Unit {
         }
 
@@ -12,7 +12,7 @@ FILE: super.kt
         }
 
     }
-    public? final? class C : A, B, kotlin/Any {
+    public? final? class C : A, B {
         public? constructor(): super<kotlin/Any>()
 
         public? open? override fun bar(): kotlin/Unit {

compiler/fir/psi2fir/testData/rawBuilder/expressions/typeOperators.txt

@@ -1,5 +1,5 @@
 FILE: typeOperators.kt
-    public? final? interface IThing {
+    public? final? interface IThing : kotlin/Any {
     }
     public? final? fun test1(x: Any): <implicit> {
         ^test1 (x# is IThing)

compiler/fir/resolve/testData/resolve/builtins/lists.txt

@@ -1,9 +1,9 @@
 FILE: lists.kt
-    public abstract class MyStringList : R|kotlin/collections/List<kotlin/String>|, R|kotlin/Any| {
+    public abstract class MyStringList : R|kotlin/collections/List<kotlin/String>| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
-    public abstract class MyMutableStringList : R|kotlin/collections/MutableList<kotlin/String>|, R|kotlin/Any| {
+    public abstract class MyMutableStringList : R|kotlin/collections/MutableList<kotlin/String>| {
         public constructor(): super<R|kotlin/Any|>()
 
     }

compiler/fir/resolve/testData/resolve/enum.txt

@@ -1,11 +1,11 @@
 FILE: enum.kt
-    public abstract interface Some {
+    public abstract interface Some : R|kotlin/Any| {
     }
-    public final object O1 : R|Some|, R|kotlin/Any| {
+    public final object O1 : R|Some| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
-    public final object O2 : R|Some|, R|kotlin/Any| {
+    public final object O2 : R|Some| {
         public constructor(): super<R|kotlin/Any|>()
 
     }

compiler/fir/resolve/testData/resolve/expresssions/dispatchReceiver.txt

@@ -1,5 +1,5 @@
 FILE: dispatchReceiver.kt
-    public abstract interface Base {
+    public abstract interface Base : R|kotlin/Any| {
         public abstract fun check(): R|kotlin/Unit|
 
     }

compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt

@@ -8,7 +8,7 @@ FILE: complexTypes.kt
         }
 
     }
-    public abstract interface Test {
+    public abstract interface Test : R|kotlin/Any| {
         public abstract val x: R|a/b/C.D<out kotlin/CharSequence, *, in kotlin/collections/List<*>, *>|
             public get(): R|a/b/C.D<out kotlin/CharSequence, *, in kotlin/collections/List<*>, *>|
 

compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.txt

@@ -1,5 +1,5 @@
 FILE: noPrimaryConstructor.kt
-    public final class NoPrimary {
+    public final class NoPrimary : R|kotlin/Any| {
         public final val x: R|kotlin/String|
             public get(): R|kotlin/String|
 

compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt

@@ -1,12 +1,12 @@
 FILE: simpleClass.kt
-    public abstract interface SomeInterface {
+    public abstract interface SomeInterface : R|kotlin/Any| {
         public abstract fun foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String|
 
         public abstract val bar: R|kotlin/Boolean|
             public get(): R|kotlin/Boolean|
 
     }
-    public final class SomeClass : R|SomeInterface|, R|kotlin/Any| {
+    public final class SomeClass : R|SomeInterface| {
         public constructor(): super<R|kotlin/Any|>()
 
         private final val baz: R|kotlin/Int| = Int(42)

compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt

@@ -1,5 +1,5 @@
 FILE: typeParameters.kt
-    <out T : R|kotlin/Any|> public abstract interface List {
+    <out T : R|kotlin/Any|> public abstract interface List : R|kotlin/Any| {
         public abstract operator fun get(index: R|kotlin/Int|): R|T|
 
         public abstract infix fun concat(other: R|List<T>|): R|List<T>|
@@ -7,7 +7,7 @@ FILE: typeParameters.kt
     }
     public final typealias StringList = R|List<out kotlin/String>|
     public final typealias AnyList = R|List<*>|
-    <out T : R|kotlin/Any|> public abstract class AbstractList : R|List<T>|, R|kotlin/Any| {
+    <out T : R|kotlin/Any|> public abstract class AbstractList : R|List<T>| {
         public constructor(): super<R|kotlin/Any|>()
 
     }

compiler/fir/resolve/testData/resolve/functionTypes.txt

@@ -11,7 +11,7 @@ FILE: functionTypes.kt
     }
     <T, out R> public abstract interface KProperty1 : R|KProperty<R>|, R|kotlin/Function1| {
     }
-    <out R> public abstract interface KProperty {
+    <out R> public abstract interface KProperty : R|kotlin/Any| {
     }
-    <R> public abstract interface KMutableProperty {
+    <R> public abstract interface KMutableProperty : R|kotlin/Any| {
     }

compiler/fir/resolve/testData/resolve/genericFunctions.txt

@@ -1,5 +1,5 @@
 FILE: genericFunctions.kt
-    public abstract interface Any {
+    public abstract interface Any : R|kotlin/Any| {
     }
     <reified T : R|Any|> public final inline fun R|Any|.safeAs(): R|T|? {
         ^safeAs (this# as? R|T|)

compiler/fir/resolve/testData/resolve/multifile/ByteArray.txt

@@ -1,5 +1,5 @@
 FILE: ByteArray.kt
-    public abstract interface My {
+    public abstract interface My : R|kotlin/Any| {
         public abstract val array: R|kotlin/ByteArray|
             public get(): R|kotlin/ByteArray|
 

compiler/fir/resolve/testData/resolve/overrides/three.txt

@@ -6,7 +6,7 @@ FILE: three.kt
         }
 
     }
-    public abstract interface Y {
+    public abstract interface Y : R|kotlin/Any| {
         public open fun baz(): R|kotlin/Unit| {
         }
 

compiler/fir/resolve/testData/resolve/simpleClass.txt

@@ -1,12 +1,12 @@
 FILE: simpleClass.kt
-    public abstract interface SomeInterface {
+    public abstract interface SomeInterface : R|kotlin/Any| {
         public abstract fun foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String|
 
         public abstract val bar: R|kotlin/Boolean|
             public get(): R|kotlin/Boolean|
 
     }
-    public final class SomeClass : R|SomeInterface|, R|kotlin/Any| {
+    public final class SomeClass : R|SomeInterface| {
         public constructor(): super<R|kotlin/Any|>()
 
         private final val baz: R|kotlin/Int| = Int(42)

compiler/fir/resolve/testData/resolve/simpleTypeAlias.txt

@@ -1,8 +1,8 @@
 FILE: simpleTypeAlias.kt
-    public abstract interface B {
+    public abstract interface B : R|kotlin/Any| {
     }
     public final typealias C = R|B|
-    public final class D : R|C|, R|kotlin/Any| {
+    public final class D : R|C| {
         public constructor(): super<R|kotlin/Any|>()
 
     }

compiler/fir/resolve/testData/resolve/stdlib/functionX.txt

@@ -15,7 +15,7 @@ FILE: functionX.kt
     }
 
         public get(): R|kotlin/Function1<kotlin/String, kotlin/String>|
-    public final class MyFunction : R|kotlin/Function2<kotlin/Int, kotlin/String, kotlin/Unit>|, R|kotlin/Any| {
+    public final class MyFunction : R|kotlin/Function2<kotlin/Int, kotlin/String, kotlin/Unit>| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final override fun invoke(p1: R|kotlin/Int|, p2: R|kotlin/String|): R|kotlin/Unit| {

compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.txt

@@ -3,9 +3,9 @@ FILE: typeAliasWithGeneric.kt
         public constructor(): super<R|kotlin/Any|>()
 
     }
-    <S, T : R|A|> public abstract interface B {
+    <S, T : R|A|> public abstract interface B : R|kotlin/Any| {
     }
-    public final class D : R|C<A>|, R|kotlin/Any| {
+    public final class D : R|C<A>| {
         public constructor(): super<R|kotlin/Any|>()
 
     }

compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt

@@ -1,5 +1,5 @@
 FILE: typeParameterVsNested.kt
-    public abstract interface Some {
+    public abstract interface Some : R|kotlin/Any| {
     }
     <T : R|test/Some|> public abstract class My : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()

compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt

@@ -38,4 +38,9 @@ class FirImplicitAnyTypeRef(
 class FirImplicitEnumTypeRef(
     session: FirSession,
     psi: PsiElement?
-) : FirImplicitBuiltinTypeRef(session, psi, KotlinBuiltIns.FQ_NAMES._enum)
+) : FirImplicitBuiltinTypeRef(session, psi, KotlinBuiltIns.FQ_NAMES._enum)
+
+class FirImplicitAnnotationTypeRef(
+    session: FirSession,
+    psi: PsiElement?
+) : FirImplicitBuiltinTypeRef(session, psi, KotlinBuiltIns.FQ_NAMES.annotation.toUnsafe())

idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.txt

@@ -1,5 +1,5 @@
 FILE: Base.kt
-    public abstract interface First {
+    public abstract interface First : R|kotlin/Any| {
     }
     public open class Second : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()

idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Strange.txt

@@ -1,5 +1,5 @@
 FILE: Strange.kt
-    <out T> public abstract interface Strange {
+    <out T> public abstract interface Strange : R|kotlin/Any| {
         public abstract fun foo(): R|T|
 
     }

idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt

@@ -6,7 +6,7 @@ FILE: jvm.kt
         }
 
     }
-    public abstract interface Y {
+    public abstract interface Y : R|kotlin/Any| {
         public open fun baz(): R|kotlin/Unit| {
         }