diff --git a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
index a49a50fe824..b5cdf81bbe4 100644
--- a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
+++ b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
@@ -341,9 +341,13 @@ 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()) {
+                container.superTypeRefs += defaultDelegatedSuperTypeRef
+            }
             // TODO: in case we have no primary constructor,
             // it may be not possible to determine delegated super type right here
-            delegatedSuperTypeRef = delegatedSuperTypeRef ?: (if (isEnum()) implicitEnumType else implicitAnyType)
+            delegatedSuperTypeRef = delegatedSuperTypeRef ?: defaultDelegatedSuperTypeRef
             if (!this.hasPrimaryConstructor()) return delegatedSuperTypeRef
 
             val firPrimaryConstructor = primaryConstructor.toFirConstructor(
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/F.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/F.txt
index 3cc1e5c5f2b..fb18e971b80 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/F.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/F.txt
@@ -1,9 +1,9 @@
 FILE: F.kt
-    public? open class A {
+    public? open class A : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
-    public? final? class B : A {
+    public? final? class B : A, kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.txt
index b0d9c139022..e5cfc4a343e 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedOfAliasedType.txt
@@ -1,8 +1,8 @@
 FILE: NestedOfAliasedType.kt
-    public? abstract class A {
+    public? abstract class A : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
-        public? abstract class Nested {
+        public? abstract class Nested : kotlin/Any {
             public? constructor(): super<kotlin/Any>()
 
         }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.txt
index 0ca6a12b418..f9032ede384 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/NestedSuperType.txt
@@ -1,5 +1,5 @@
 FILE: NestedSuperType.kt
-    public? abstract class My {
+    public? abstract class My : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
         public? abstract class NestedOne : My {
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
index 342eec2a11d..b2fb4c421f2 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
@@ -1,8 +1,8 @@
 FILE: complexTypes.kt
-    <T, out S> public? final? class C {
+    <T, out S> public? final? class C : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
-        <R, in P> public? final? inner class D {
+        <R, in P> public? final? inner class D : kotlin/Any {
             public? constructor(): super<kotlin/Any>()
 
         }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt
index f5aeac35b1e..bd708b3d515 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt
@@ -1,5 +1,5 @@
 FILE: derivedClass.kt
-    <T> public? open class Base {
+    <T> public? open class Base : kotlin/Any {
         public? constructor(x: T): super<kotlin/Any>()
 
         public? final? val x: T
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt
index 5aba7c39e44..35426487ae7 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt
@@ -1,24 +1,24 @@
 FILE: enums.kt
-    public? final? enum class Order {
+    public? final? enum class Order : kotlin/Enum {
         public? constructor(): super<kotlin/Enum>()
 
-        public? final enum entry FIRST {
+        public? final enum entry FIRST : kotlin/Any {
             public? constructor(): super<kotlin/Any>()
 
         }
 
-        public? final enum entry SECOND {
+        public? final enum entry SECOND : kotlin/Any {
             public? constructor(): super<kotlin/Any>()
 
         }
 
-        public? final enum entry THIRD {
+        public? final enum entry THIRD : kotlin/Any {
             public? constructor(): super<kotlin/Any>()
 
         }
 
     }
-    public? final? enum class Planet {
+    public? final? enum class Planet : kotlin/Enum {
         public? constructor(m: Double, r: Double): super<kotlin/Enum>()
 
         public? final? val m: Double
@@ -59,7 +59,7 @@ FILE: enums.kt
 
         public? abstract fun sayHello(): kotlin/Unit
 
-        public? final? companion object Companion {
+        public? final? companion object Companion : kotlin/Any {
             public? constructor(): super<kotlin/Any>()
 
             public? final? const val G: <implicit> = Double(6.67E-11)
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt
index c7ac75f2f2c..c57037734bf 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt
@@ -1,15 +1,15 @@
 FILE: enums2.kt
     public? final? interface Some {
     }
-    public? final? object O1 : Some {
+    public? final? object O1 : Some, kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
-    public? final? object O2 : Some {
+    public? final? object O2 : Some, kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
-    public? final? enum class SomeEnum {
+    public? final? enum class SomeEnum : kotlin/Enum {
         public? constructor(x: Some): super<kotlin/Enum>()
 
         public? final? val x: Some
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt
index b18361d5802..76e5dd361fe 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt
@@ -1,12 +1,12 @@
 FILE: expectActual.kt
-    public? final? expect class MyClass {
+    public? final? expect class MyClass : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
     public? final? expect fun foo(): String
     public? final? expect val x: Int
         public? get(): Int
-    public? final? actual class MyClass {
+    public? final? actual class MyClass : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt
index 0e02378bb79..c9759d9c751 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt
@@ -4,7 +4,7 @@ FILE: genericFunctions.kt
     <reified T : Any> public? final? inline fun Any.safeAs(): T? {
         ^safeAs (this# as? T)
     }
-    public? abstract class Summator {
+    public? abstract class Summator : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
         <T> public? abstract fun plus(first: T, second: T): T
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt
index 6564b21606e..6443925fd02 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt
@@ -1,12 +1,12 @@
 FILE: nestedClass.kt
-    public? abstract class Base {
+    public? abstract class Base : kotlin/Any {
         public? constructor(s: String): super<kotlin/Any>()
 
         public? final? val s: String
             public? get(): String
 
     }
-    public? final? class Outer {
+    public? final? class Outer : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
         public? final? class Derived : Base {
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt
index 53dda3dd62b..68bd75e31d7 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt
@@ -6,7 +6,7 @@ FILE: simpleClass.kt
             public? get(): Boolean
 
     }
-    public? final? class SomeClass : SomeInterface {
+    public? final? class SomeClass : SomeInterface, kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
         private final? val baz: <implicit> = Int(42)
@@ -28,7 +28,7 @@ FILE: simpleClass.kt
             public? set(value: Double): kotlin/Unit
 
     }
-    public? final? inline class InlineClass {
+    public? final? inline class InlineClass : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.txt
index 5bf25fc85e7..8b6919c2d2c 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleTypeAlias.txt
@@ -2,7 +2,7 @@ FILE: simpleTypeAlias.kt
     public? final? interface B {
     }
     public? final typealias C = B
-    public? final? class D : C {
+    public? final? class D : C, kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt
index 2a1e291b010..03ee784a244 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt
@@ -1,12 +1,12 @@
 FILE: typeAliasWithGeneric.kt
-    public? open class A {
+    public? open class A : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
     <S, T : A> public? final? interface B {
     }
     <T> public? final typealias C = B<T, A>
-    public? final? class D : C<A> {
+    public? final? class D : C<A>, kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
index 64a8bb863b5..b9b76ae8e74 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
@@ -1,10 +1,10 @@
 FILE: typeParameterVsNested.kt
     public? final? interface Some {
     }
-    <T : Some> public? abstract class My {
+    <T : Some> public? abstract class My : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
-        public? final? inner class T {
+        public? final? inner class T : kotlin/Any {
             public? constructor(): super<kotlin/Any>()
 
         }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt
index c04c5c2d2db..e9fa7c750cd 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt
@@ -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> {
+    <out T : Any> public? abstract class AbstractList : List<T>, kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt
index 48ae8fc1266..83a7361e547 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt
@@ -3,7 +3,7 @@ FILE: where.kt
     }
     public? final? interface B {
     }
-    <T : A, B> public? final? class C {
+    <T : A, B> public? final? class C : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt
index fb4fcdc24d1..9b9f5f3b3e1 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt
@@ -1,5 +1,5 @@
 FILE: annotated.kt
-    @Target(AnnotationTarget#.EXPRESSION#) @Retention(AnnotationRetention#.SOURCE#) public? final? annotation class Ann {
+    @Target(AnnotationTarget#.EXPRESSION#) @Retention(AnnotationRetention#.SOURCE#) public? final? annotation class Ann : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
@@ -22,7 +22,7 @@ FILE: annotated.kt
 
         ^foo Int(42)
     }
-    public? final? data class Two {
+    public? final? data class Two : kotlin/Any {
         public? constructor(x: Int, y: Int): super<kotlin/Any>()
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt
index 89d7e0442d5..bc7dae246fe 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt
@@ -4,7 +4,7 @@ FILE: arrayAccess.kt
     public? final? fun foo(): <implicit> {
         ^foo Int(1)
     }
-    public? final? class Wrapper {
+    public? final? class Wrapper : kotlin/Any {
         public? constructor(v: IntArray): super<kotlin/Any>()
 
         public? final? val v: IntArray
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt
index de77da4de59..4d25d446fff 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt
@@ -1,5 +1,5 @@
 FILE: callableReferences.kt
-    public? final? class A {
+    public? final? class A : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
         public? final? fun foo(): kotlin/Unit {
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt
index 72c4e25f810..0da3741b560 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt
@@ -8,7 +8,7 @@ FILE: calls.kt
     public? final? fun testRegular(): Int {
         ^testRegular distance#(Int(3), Int(4))
     }
-    public? final? class My {
+    public? final? class My : kotlin/Any {
         public? constructor(x: Int): super<kotlin/Any>()
 
         public? final? var x: Int
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt
index c5d5184a522..5f1b841b099 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt
@@ -1,5 +1,5 @@
 FILE: classReference.kt
-    public? final? class A {
+    public? final? class A : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt
index 8328b1a0315..f3e3bc2eeb4 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt
@@ -1,38 +1,38 @@
 FILE: collectionLiterals.kt
-    public? final? annotation class Ann1 {
+    public? final? annotation class Ann1 : kotlin/Any {
         public? constructor(arr: IntArray): super<kotlin/Any>()
 
         public? final? val arr: IntArray
             public? get(): IntArray
 
     }
-    public? final? annotation class Ann2 {
+    public? final? annotation class Ann2 : kotlin/Any {
         public? constructor(arr: DoubleArray): super<kotlin/Any>()
 
         public? final? val arr: DoubleArray
             public? get(): DoubleArray
 
     }
-    public? final? annotation class Ann3 {
+    public? final? annotation class Ann3 : kotlin/Any {
         public? constructor(arr: Array<String>): super<kotlin/Any>()
 
         public? final? val arr: Array<String>
             public? get(): Array<String>
 
     }
-    @Ann1(<implicitArrayOf>()) @Ann2(<implicitArrayOf>()) @Ann3(<implicitArrayOf>()) public? final? class Zero {
+    @Ann1(<implicitArrayOf>()) @Ann2(<implicitArrayOf>()) @Ann3(<implicitArrayOf>()) public? final? class Zero : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
-    @Ann1(<implicitArrayOf>(Int(1), Int(2))) public? final? class First {
+    @Ann1(<implicitArrayOf>(Int(1), Int(2))) public? final? class First : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
-    @Ann2(<implicitArrayOf>(Double(3.14))) public? final? class Second {
+    @Ann2(<implicitArrayOf>(Double(3.14))) public? final? class Second : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
-    @Ann3(<implicitArrayOf>(String(Alpha), String(Omega))) public? final? class Third {
+    @Ann3(<implicitArrayOf>(String(Alpha), String(Omega))) public? final? class Third : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt
index 674f0903786..51924a394ae 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt
@@ -1,5 +1,5 @@
 FILE: destructuring.kt
-    public? final? data class Some {
+    public? final? data class Some : kotlin/Any {
         public? constructor(first: Int, second: Double, third: String): super<kotlin/Any>()
 
         public? final? val first: Int
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt
index 36277d65f15..6611c3b32c4 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt
@@ -24,7 +24,7 @@ FILE: for.kt
         }
 
     }
-    public? final? data class Some {
+    public? final? data class Some : kotlin/Any {
         public? constructor(x: Int, y: Int): super<kotlin/Any>()
 
         public? final? val x: Int
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt
index 440ed041a94..4a176a27ac0 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt
@@ -1,5 +1,5 @@
 FILE: init.kt
-    public? final? class WithInit {
+    public? final? class WithInit : kotlin/Any {
         public? constructor(x: Int): super<kotlin/Any>()
 
         public? final? val x: Int
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt
index dd3266fc43d..8d83ba8e260 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt
@@ -1,5 +1,5 @@
 FILE: lambda.kt
-    public? final? data class Tuple {
+    public? final? data class Tuple : kotlin/Any {
         public? constructor(x: Int, y: Int): super<kotlin/Any>()
 
         public? final? val x: Int
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt
index 9502fb11ae0..47329cfc592 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt
@@ -1,6 +1,6 @@
 FILE: locals.kt
     public? final? fun withLocals(p: Int): Int {
-        public? final? class Local {
+        public? final? class Local : kotlin/Any {
             public? constructor(pp: Int): super<kotlin/Any>()
 
             public? final? val pp: Int
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt
index 32de82f018c..cd9bc693545 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt
@@ -12,7 +12,7 @@ FILE: super.kt
         }
 
     }
-    public? final? class C : A, B {
+    public? final? class C : A, B, kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
         public? open? override fun bar(): kotlin/Unit {
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt
index 0f3c480405d..42f31f710e2 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt
@@ -1,5 +1,5 @@
 FILE: these.kt
-    public? final? class Some {
+    public? final? class Some : kotlin/Any {
         public? constructor(): super<kotlin/Any>()
 
         public? final? fun foo(): Int {
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt
index 9146f599e6e..8fd39386beb 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt
@@ -34,7 +34,7 @@ FILE: unary.kt
         }
 
     }
-    public? final? class X {
+    public? final? class X : kotlin/Any {
         public? constructor(i: Int): super<kotlin/Any>()
 
         public? final? val i: Int
@@ -71,7 +71,7 @@ FILE: unary.kt
         }
 
     }
-    public? final? class Y {
+    public? final? class Y : kotlin/Any {
         public? constructor(arr: Array<Int>): super<kotlin/Any>()
 
         public? final? val arr: Array<Int>
diff --git a/compiler/fir/resolve/testData/resolve/F.txt b/compiler/fir/resolve/testData/resolve/F.txt
index ae7294982d1..397cbec412a 100644
--- a/compiler/fir/resolve/testData/resolve/F.txt
+++ b/compiler/fir/resolve/testData/resolve/F.txt
@@ -1,5 +1,5 @@
 FILE: F.kt
-    public open class A {
+    public open class A : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/NestedOfAliasedType.txt b/compiler/fir/resolve/testData/resolve/NestedOfAliasedType.txt
index 9003e59001f..87013d2cf78 100644
--- a/compiler/fir/resolve/testData/resolve/NestedOfAliasedType.txt
+++ b/compiler/fir/resolve/testData/resolve/NestedOfAliasedType.txt
@@ -1,8 +1,8 @@
 FILE: NestedOfAliasedType.kt
-    public abstract class A {
+    public abstract class A : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
-        public abstract class Nested {
+        public abstract class Nested : R|kotlin/Any| {
             public constructor(): super<R|kotlin/Any|>()
 
         }
diff --git a/compiler/fir/resolve/testData/resolve/NestedSuperType.txt b/compiler/fir/resolve/testData/resolve/NestedSuperType.txt
index fc9100aa4d6..685cd51f707 100644
--- a/compiler/fir/resolve/testData/resolve/NestedSuperType.txt
+++ b/compiler/fir/resolve/testData/resolve/NestedSuperType.txt
@@ -1,5 +1,5 @@
 FILE: NestedSuperType.kt
-    public abstract class My {
+    public abstract class My : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public abstract class NestedOne : R|p/My| {
diff --git a/compiler/fir/resolve/testData/resolve/TwoDeclarationsInSameFile.txt b/compiler/fir/resolve/testData/resolve/TwoDeclarationsInSameFile.txt
index 40982ac7346..0bef439c549 100644
--- a/compiler/fir/resolve/testData/resolve/TwoDeclarationsInSameFile.txt
+++ b/compiler/fir/resolve/testData/resolve/TwoDeclarationsInSameFile.txt
@@ -1,5 +1,5 @@
 FILE: TwoDeclarationsInSameFile.kt
-    public open class A {
+    public open class A : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/builtins/lists.txt b/compiler/fir/resolve/testData/resolve/builtins/lists.txt
index 62ef3892704..2dcc4adec6c 100644
--- a/compiler/fir/resolve/testData/resolve/builtins/lists.txt
+++ b/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>| {
+    public abstract class MyStringList : R|kotlin/collections/List<kotlin/String>|, R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
-    public abstract class MyMutableStringList : R|kotlin/collections/MutableList<kotlin/String>| {
+    public abstract class MyMutableStringList : R|kotlin/collections/MutableList<kotlin/String>|, R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/companion.txt b/compiler/fir/resolve/testData/resolve/companion.txt
index 61f18c243f3..ad95d0f8e86 100644
--- a/compiler/fir/resolve/testData/resolve/companion.txt
+++ b/compiler/fir/resolve/testData/resolve/companion.txt
@@ -1,11 +1,11 @@
 FILE: companion.kt
-    public abstract class Some {
+    public abstract class Some : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final companion object Companion {
+        public final companion object Companion : R|kotlin/Any| {
             public constructor(): super<R|kotlin/Any|>()
 
-            public final class InCompanion {
+            public final class InCompanion : R|kotlin/Any| {
                 public constructor(): super<R|kotlin/Any|>()
 
             }
@@ -16,13 +16,13 @@ FILE: companion.kt
             public get(): R|test/Some.Companion.InCompanion|
 
     }
-    public abstract class Another {
+    public abstract class Another : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final companion object NamedCompanion {
+        public final companion object NamedCompanion : R|kotlin/Any| {
             public constructor(): super<R|kotlin/Any|>()
 
-            public final class InCompanion {
+            public final class InCompanion : R|kotlin/Any| {
                 public constructor(): super<R|kotlin/Any|>()
 
             }
diff --git a/compiler/fir/resolve/testData/resolve/derivedClass.txt b/compiler/fir/resolve/testData/resolve/derivedClass.txt
index 52bf8a4e48b..e0aab072474 100644
--- a/compiler/fir/resolve/testData/resolve/derivedClass.txt
+++ b/compiler/fir/resolve/testData/resolve/derivedClass.txt
@@ -1,5 +1,5 @@
 FILE: derivedClass.kt
-    <T> public open class Base {
+    <T> public open class Base : R|kotlin/Any| {
         public constructor(x: R|T|): super<R|kotlin/Any|>()
 
         public final val x: R|T|
diff --git a/compiler/fir/resolve/testData/resolve/enum.txt b/compiler/fir/resolve/testData/resolve/enum.txt
index 0d6889009f7..8637c6e11d0 100644
--- a/compiler/fir/resolve/testData/resolve/enum.txt
+++ b/compiler/fir/resolve/testData/resolve/enum.txt
@@ -1,15 +1,15 @@
 FILE: enum.kt
     public abstract interface Some {
     }
-    public final object O1 : R|Some| {
+    public final object O1 : R|Some|, R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
-    public final object O2 : R|Some| {
+    public final object O2 : R|Some|, R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
-    public final enum class SomeEnum {
+    public final enum class SomeEnum : R|kotlin/Enum| {
         private constructor(x: R|Some|): super<R|kotlin/Enum|>()
 
         public final val x: R|Some|
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/access.txt b/compiler/fir/resolve/testData/resolve/expresssions/access.txt
index 49b3c5b74c8..8bcde089254 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/access.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/access.txt
@@ -1,5 +1,5 @@
 FILE: access.kt
-    public final class Foo {
+    public final class Foo : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final val x: R|kotlin/Int| = Int(1)
@@ -14,7 +14,7 @@ FILE: access.kt
         }
 
     }
-    public final class Bar {
+    public final class Bar : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final val x: R|kotlin/String| = String()
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/constructor.txt b/compiler/fir/resolve/testData/resolve/expresssions/constructor.txt
index 3de09c2b349..0d097e210cb 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/constructor.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/constructor.txt
@@ -1,5 +1,5 @@
 FILE: constructor.kt
-    public final class C {
+    public final class C : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final fun create(): R|C| {
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/dispatchReceiver.txt b/compiler/fir/resolve/testData/resolve/expresssions/dispatchReceiver.txt
index 6277e7370b5..a624352a4d2 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/dispatchReceiver.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/dispatchReceiver.txt
@@ -3,7 +3,7 @@ FILE: dispatchReceiver.kt
         public abstract fun check(): R|kotlin/Unit|
 
     }
-    public final class My {
+    public final class My : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final lateinit var delegate: R|Base|
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt
index b5891520308..80b0020f588 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt
@@ -1,7 +1,7 @@
 FILE: explicitReceiver.kt
     public final fun x(): R|kotlin/Unit| {
     }
-    public final class Foo {
+    public final class Foo : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final val x: R|Foo| = R|/Foo.Foo|()
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt
index 8e7f39f1a16..82aecc03b82 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt
@@ -1,5 +1,5 @@
 FILE: explicitReceiver2.kt
-    public final class Bar {
+    public final class Bar : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final operator fun invoke(): R|Foo| {
@@ -9,7 +9,7 @@ FILE: explicitReceiver2.kt
     }
     public final fun x(): R|kotlin/Unit| {
     }
-    public final class Foo {
+    public final class Foo : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final operator fun R|Bar|.invoke(): R|Foo| {
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt
index ae12b0b0a25..5b7f5020b20 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt
@@ -1,7 +1,7 @@
 FILE: extension.kt
     public final fun x(): R|kotlin/Unit| {
     }
-    public final class Foo {
+    public final class Foo : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final operator fun R|kotlin/Int|.invoke(): R|Foo| {
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/farInvokeExtension.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/farInvokeExtension.txt
index 8af90b01b0c..bd8014265f0 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/farInvokeExtension.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/farInvokeExtension.txt
@@ -4,7 +4,7 @@ FILE: farInvokeExtension.kt
     public final operator fun R|kotlin/Int|.invoke(): R|Foo| {
         ^invoke this@Foo
     }
-    public final class Foo {
+    public final class Foo : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final val x: R|kotlin/Int| = Int(0)
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/implicitTypeOrder.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/implicitTypeOrder.txt
index 8ab7cf5a8ba..c1ed3c3ea1b 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/implicitTypeOrder.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/implicitTypeOrder.txt
@@ -1,5 +1,5 @@
 FILE: implicitTypeOrder.kt
-    public final class A {
+    public final class A : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final fun bar(): R|A| {
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/threeReceivers.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/threeReceivers.txt
index 62c2468e8dd..2b1b72a8baa 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/threeReceivers.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/threeReceivers.txt
@@ -1,5 +1,5 @@
 FILE: threeReceivers.kt
-    public final class Bar {
+    public final class Bar : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final fun R|FooBar|.invoke(): R|Bar| {
@@ -7,15 +7,15 @@ FILE: threeReceivers.kt
         }
 
     }
-    public final class Buz {
+    public final class Buz : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
-    public final class FooBar {
+    public final class FooBar : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
-    public final class Foo {
+    public final class Foo : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final val R|Buz|.foobar: R|Bar|
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/localImplicitBodies.txt b/compiler/fir/resolve/testData/resolve/expresssions/localImplicitBodies.txt
index 9106c511694..b36f39aae2b 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/localImplicitBodies.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/localImplicitBodies.txt
@@ -1,6 +1,6 @@
 FILE: localImplicitBodies.kt
     public final fun foo(): R|kotlin/Unit| {
-        lval x: <ERROR TYPE REF: No result type for initializer> = object :  {
+        lval x: <ERROR TYPE REF: No result type for initializer> = object : R|kotlin/Any| {
             public constructor(): super<R|kotlin/Any|>()
 
             public final fun sss(): <ERROR TYPE REF: Unresolved name: abc> {
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/this.txt b/compiler/fir/resolve/testData/resolve/expresssions/this.txt
index 79b6791e30e..a92aa2f6fdf 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/this.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/this.txt
@@ -1,9 +1,9 @@
 FILE: this.kt
-    public final class Bar {
+    public final class Bar : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
-    public final class Foo {
+    public final class Foo : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final fun bar(): R|Foo| {
diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt
index 869e41ad156..cc5982f2572 100644
--- a/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt
+++ b/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt
@@ -1,8 +1,8 @@
 FILE: complexTypes.kt
-    <T, out S> public final class C {
+    <T, out S> public final class C : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
-        <R, in P> public final inner class D {
+        <R, in P> public final inner class D : R|kotlin/Any| {
             public constructor(): super<R|kotlin/Any|>()
 
         }
diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt
index bda8591998c..f585283668d 100644
--- a/compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt
+++ b/compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt
@@ -1,24 +1,24 @@
 FILE: enums.kt
-    public final enum class Order {
+    public final enum class Order : R|kotlin/Enum| {
         private constructor(): super<R|kotlin/Enum|>()
 
-        public final enum entry FIRST {
+        public final enum entry FIRST : R|kotlin/Any| {
             public constructor(): super<R|kotlin/Any|>()
 
         }
 
-        public final enum entry SECOND {
+        public final enum entry SECOND : R|kotlin/Any| {
             public constructor(): super<R|kotlin/Any|>()
 
         }
 
-        public final enum entry THIRD {
+        public final enum entry THIRD : R|kotlin/Any| {
             public constructor(): super<R|kotlin/Any|>()
 
         }
 
     }
-    public final enum class Planet {
+    public final enum class Planet : R|kotlin/Enum| {
         private constructor(m: R|kotlin/Double|, r: R|kotlin/Double|): super<R|kotlin/Enum|>()
 
         public final val m: R|kotlin/Double|
@@ -59,7 +59,7 @@ FILE: enums.kt
 
         public abstract fun sayHello(): R|kotlin/Unit|
 
-        public final companion object Companion {
+        public final companion object Companion : R|kotlin/Any| {
             public constructor(): super<R|kotlin/Any|>()
 
             public final const val G: R|kotlin/Double| = Double(6.67E-11)
diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt
index 94682c1f4d4..37b3bab1c2a 100644
--- a/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt
+++ b/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt
@@ -6,7 +6,7 @@ FILE: simpleClass.kt
             public get(): R|kotlin/Boolean|
 
     }
-    public final class SomeClass : R|SomeInterface| {
+    public final class SomeClass : R|SomeInterface|, R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         private final val baz: R|kotlin/Int| = Int(42)
@@ -28,7 +28,7 @@ FILE: simpleClass.kt
             public set(value: R|kotlin/Double|): R|kotlin/Unit|
 
     }
-    public final inline class InlineClass {
+    public final inline class InlineClass : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt
index 8cb0c57d390..e3f821384b5 100644
--- a/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt
+++ b/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt
@@ -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>| {
+    <out T : R|kotlin/Any|> public abstract class AbstractList : R|List<T>|, R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/genericFunctions.txt b/compiler/fir/resolve/testData/resolve/genericFunctions.txt
index ad0543225f3..da21d8e56a0 100644
--- a/compiler/fir/resolve/testData/resolve/genericFunctions.txt
+++ b/compiler/fir/resolve/testData/resolve/genericFunctions.txt
@@ -4,7 +4,7 @@ FILE: genericFunctions.kt
     <reified T : R|Any|> public final inline fun R|Any|.safeAs(): R|T|? {
         ^safeAs (this# as? R|T|)
     }
-    public abstract class Summator {
+    public abstract class Summator : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         <T> public abstract fun plus(first: R|T|, second: R|T|): R|T|
diff --git a/compiler/fir/resolve/testData/resolve/multifile/Annotations.txt b/compiler/fir/resolve/testData/resolve/multifile/Annotations.txt
index 76b3c5b67e8..c736e475683 100644
--- a/compiler/fir/resolve/testData/resolve/multifile/Annotations.txt
+++ b/compiler/fir/resolve/testData/resolve/multifile/Annotations.txt
@@ -1,6 +1,6 @@
 FILE: Annotations.kt
     @FILE:R|annotations/Simple|()
-    @R|annotations/WithInt|(Int(42)) public abstract class First {
+    @R|annotations/WithInt|(Int(42)) public abstract class First : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         @R|annotations/Simple|() public abstract fun foo(@R|annotations/WithString|(String(abc)) arg: @R|annotations/Simple|() R|kotlin/Double|): R|kotlin/Unit|
diff --git a/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt b/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt
index 6c7da9207b0..3bf5b1111ca 100644
--- a/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt
+++ b/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt
@@ -1,5 +1,5 @@
 FILE: sealedStarImport.kt
-    public abstract class Factory {
+    public abstract class Factory : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public abstract fun createTest(): R|error: Symbol not found, for `Test`|
diff --git a/compiler/fir/resolve/testData/resolve/nestedClass.txt b/compiler/fir/resolve/testData/resolve/nestedClass.txt
index 3eb6abace2f..1b9e7db5d34 100644
--- a/compiler/fir/resolve/testData/resolve/nestedClass.txt
+++ b/compiler/fir/resolve/testData/resolve/nestedClass.txt
@@ -1,12 +1,12 @@
 FILE: nestedClass.kt
-    public abstract class Base {
+    public abstract class Base : R|kotlin/Any| {
         public constructor(s: R|kotlin/String|): super<R|kotlin/Any|>()
 
         public final val s: R|kotlin/String|
             public get(): R|kotlin/String|
 
     }
-    public final class Outer {
+    public final class Outer : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final class Derived : R|Base| {
diff --git a/compiler/fir/resolve/testData/resolve/overrides/simple.txt b/compiler/fir/resolve/testData/resolve/overrides/simple.txt
index f5c66e3af67..55b74a64f73 100644
--- a/compiler/fir/resolve/testData/resolve/overrides/simple.txt
+++ b/compiler/fir/resolve/testData/resolve/overrides/simple.txt
@@ -1,5 +1,5 @@
 FILE: simple.kt
-    public open class A {
+    public open class A : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public open fun foo(): R|A| {
diff --git a/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt b/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt
index 623bba7b82e..ec8e6f7bbc1 100644
--- a/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt
+++ b/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt
@@ -1,5 +1,5 @@
 FILE: simpleFakeOverride.kt
-    <T> public open class A {
+    <T> public open class A : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final fun foo(t: R|T|): R|T| {
@@ -7,7 +7,7 @@ FILE: simpleFakeOverride.kt
         }
 
     }
-    public final class Some {
+    public final class Some : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/overrides/three.txt b/compiler/fir/resolve/testData/resolve/overrides/three.txt
index 25ddd42c862..25f3d667254 100644
--- a/compiler/fir/resolve/testData/resolve/overrides/three.txt
+++ b/compiler/fir/resolve/testData/resolve/overrides/three.txt
@@ -1,5 +1,5 @@
 FILE: three.kt
-    public abstract class A {
+    public abstract class A : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final fun foo(): R|kotlin/Unit| {
diff --git a/compiler/fir/resolve/testData/resolve/references/superMember.txt b/compiler/fir/resolve/testData/resolve/references/superMember.txt
index 26114fff8ae..d128639cd2a 100644
--- a/compiler/fir/resolve/testData/resolve/references/superMember.txt
+++ b/compiler/fir/resolve/testData/resolve/references/superMember.txt
@@ -1,5 +1,5 @@
 FILE: superMember.kt
-    public open class A {
+    public open class A : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public open fun foo(): R|kotlin/Unit| {
diff --git a/compiler/fir/resolve/testData/resolve/simpleClass.txt b/compiler/fir/resolve/testData/resolve/simpleClass.txt
index c0c297653b2..48a838160da 100644
--- a/compiler/fir/resolve/testData/resolve/simpleClass.txt
+++ b/compiler/fir/resolve/testData/resolve/simpleClass.txt
@@ -6,7 +6,7 @@ FILE: simpleClass.kt
             public get(): R|kotlin/Boolean|
 
     }
-    public final class SomeClass : R|SomeInterface| {
+    public final class SomeClass : R|SomeInterface|, R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         private final val baz: R|kotlin/Int| = Int(42)
diff --git a/compiler/fir/resolve/testData/resolve/simpleTypeAlias.txt b/compiler/fir/resolve/testData/resolve/simpleTypeAlias.txt
index 2c5b03aef1a..29746690c6a 100644
--- a/compiler/fir/resolve/testData/resolve/simpleTypeAlias.txt
+++ b/compiler/fir/resolve/testData/resolve/simpleTypeAlias.txt
@@ -2,7 +2,7 @@ FILE: simpleTypeAlias.kt
     public abstract interface B {
     }
     public final typealias C = R|B|
-    public final class D : R|C| {
+    public final class D : R|C|, R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/functionX.txt b/compiler/fir/resolve/testData/resolve/stdlib/functionX.txt
index 43ddafa7a0c..759ef27b153 100644
--- a/compiler/fir/resolve/testData/resolve/stdlib/functionX.txt
+++ b/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>| {
+    public final class MyFunction : R|kotlin/Function2<kotlin/Int, kotlin/String, kotlin/Unit>|, R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final override fun invoke(p1: R|kotlin/Int|, p2: R|kotlin/String|): R|kotlin/Unit| {
diff --git a/compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.txt b/compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.txt
index f6bbf53d801..5a9d93c4795 100644
--- a/compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.txt
+++ b/compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.txt
@@ -1,11 +1,11 @@
 FILE: typeAliasWithGeneric.kt
-    public open class A {
+    public open class A : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
     <S, T : R|A|> public abstract interface B {
     }
-    public final class D : R|C<A>| {
+    public final class D : R|C<A>|, R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt b/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt
index 19c727bc209..028f4dd3647 100644
--- a/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt
+++ b/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt
@@ -1,10 +1,10 @@
 FILE: typeParameterVsNested.kt
     public abstract interface Some {
     }
-    <T : R|test/Some|> public abstract class My {
+    <T : R|test/Some|> public abstract class My : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final inner class T {
+        public final inner class T : R|kotlin/Any| {
             public constructor(): super<R|kotlin/Any|>()
 
         }
diff --git a/idea/testData/fir/multiModule/basic/m1_java/base.txt b/idea/testData/fir/multiModule/basic/m1_java/base.txt
index 897907b1da6..76f1514653b 100644
--- a/idea/testData/fir/multiModule/basic/m1_java/base.txt
+++ b/idea/testData/fir/multiModule/basic/m1_java/base.txt
@@ -1,12 +1,12 @@
 FILE: base.kt
-    public final class Hello {
+    public final class Hello : R|kotlin/Any| {
         public constructor(msg: R|kotlin/String|): super<R|kotlin/Any|>()
 
         public final val msg: R|kotlin/String|
             public get(): R|kotlin/String|
 
     }
-    public final class Test {
+    public final class Test : R|kotlin/Any| {
         public constructor(set: R|java/util/Set<*>|): super<R|kotlin/Any|>()
 
         public final val set: R|java/util/Set<*>|
diff --git a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt
index 65ecba5ccc7..499642fa000 100644
--- a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt
+++ b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt
@@ -1,5 +1,5 @@
 FILE: simpleFakeOverride.kt
-    public final class Some {
+    public final class Some : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
     }
diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.txt b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.txt
index 36c3b9e3f95..9eb2b8bf79e 100644
--- a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.txt
+++ b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.txt
@@ -1,7 +1,7 @@
 FILE: Base.kt
     public abstract interface First {
     }
-    public open class Second {
+    public open class Second : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public open fun R|First|.foo(s: R|kotlin/String|, i: R|kotlin/Int|): R|kotlin/Unit| {
diff --git a/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt b/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt
index cc8346375ef..80722690bd4 100644
--- a/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt
+++ b/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt
@@ -1,5 +1,5 @@
 FILE: common.kt
-    <T> public open expect class A {
+    <T> public open expect class A : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public open fun foo(arg: R|T|): R|kotlin/Unit|
diff --git a/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt b/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt
index 03c3f54eec3..1ad604081c3 100644
--- a/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt
@@ -1,5 +1,5 @@
 FILE: jvm.kt
-    <T> public open actual class A {
+    <T> public open actual class A : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public open actual fun foo(arg: R|T|): R|kotlin/Unit| {
diff --git a/idea/testData/fir/multiModule/mppMemberType/common/common.txt b/idea/testData/fir/multiModule/mppMemberType/common/common.txt
index 2432c17d6d9..91b9cbb2228 100644
--- a/idea/testData/fir/multiModule/mppMemberType/common/common.txt
+++ b/idea/testData/fir/multiModule/mppMemberType/common/common.txt
@@ -1,11 +1,11 @@
 FILE: common.kt
-    public final expect class MyList {
+    public final expect class MyList : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final fun get(i: R|kotlin/Int|): R|kotlin/Int|
 
     }
-    public open class Wrapper {
+    public open class Wrapper : R|kotlin/Any| {
         public constructor(list: R|MyList|): super<R|kotlin/Any|>()
 
         public final val list: R|MyList|
diff --git a/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt b/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt
index 5a861ccdb2f..441fba6b5af 100644
--- a/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt
@@ -1,5 +1,5 @@
 FILE: jvm.kt
-    public final actual class MyList {
+    public final actual class MyList : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final actual fun get(i: R|kotlin/Int|): R|kotlin/Int| {
diff --git a/idea/testData/fir/multiModule/mppMembers/common/common.txt b/idea/testData/fir/multiModule/mppMembers/common/common.txt
index 9cd8ccad72f..c79d128bb88 100644
--- a/idea/testData/fir/multiModule/mppMembers/common/common.txt
+++ b/idea/testData/fir/multiModule/mppMembers/common/common.txt
@@ -1,5 +1,5 @@
 FILE: common.kt
-    public open expect class A {
+    public open expect class A : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final fun foo(): R|kotlin/Unit|
diff --git a/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt b/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt
index 6c7d9c853ce..bf381975c1a 100644
--- a/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt
@@ -1,5 +1,5 @@
 FILE: jvm.kt
-    public open actual class A {
+    public open actual class A : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final actual fun foo(): R|kotlin/Unit| {
diff --git a/idea/testData/fir/multiModule/mppSuperTypes/common/common.txt b/idea/testData/fir/multiModule/mppSuperTypes/common/common.txt
index 9cd8ccad72f..c79d128bb88 100644
--- a/idea/testData/fir/multiModule/mppSuperTypes/common/common.txt
+++ b/idea/testData/fir/multiModule/mppSuperTypes/common/common.txt
@@ -1,5 +1,5 @@
 FILE: common.kt
-    public open expect class A {
+    public open expect class A : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final fun foo(): R|kotlin/Unit|
diff --git a/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt b/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt
index 9555c01a372..2cda378993b 100644
--- a/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt
@@ -1,5 +1,5 @@
 FILE: jvm.kt
-    public abstract class X {
+    public abstract class X : R|kotlin/Any| {
         public constructor(): super<R|kotlin/Any|>()
 
         public final fun bar(): R|kotlin/Unit| {