diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt
index 7768005e3cf..7ba47fcaa15 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt
@@ -175,9 +175,23 @@ internal class CallAndReferenceGenerator(
             }
             when (symbol) {
                 is IrConstructorSymbol -> IrConstructorCallImpl.fromSymbolOwner(startOffset, endOffset, type, symbol)
-                is IrSimpleFunctionSymbol -> IrCallImpl(
-                    startOffset, endOffset, type, symbol, origin = qualifiedAccess.calleeReference.statementOrigin()
-                )
+                is IrSimpleFunctionSymbol -> {
+                    var superQualifierSymbol: IrClassSymbol? = null
+                    if (qualifiedAccess.dispatchReceiver is FirQualifiedAccess) {
+                        val dispatchReceiverReference = (qualifiedAccess.dispatchReceiver as FirQualifiedAccess).calleeReference
+                        if (dispatchReceiverReference is FirSuperReference) {
+                            val coneSuperType = dispatchReceiverReference.superTypeRef.coneTypeSafe<ConeClassLikeType>()
+                            (coneSuperType?.lookupTag?.toSymbol(session) as? FirClassSymbol<*>)?.let {
+                                superQualifierSymbol = classifierStorage.getIrClassSymbol(it)
+                            }
+                        }
+                    }
+                    IrCallImpl(
+                        startOffset, endOffset, type, symbol,
+                        origin = qualifiedAccess.calleeReference.statementOrigin(),
+                        superQualifierSymbol = superQualifierSymbol
+                    )
+                }
                 is IrPropertySymbol -> {
                     val getter = symbol.owner.getter
                     val backingField = symbol.owner.backingField
diff --git a/compiler/testData/codegen/box/bridges/complexTraitImpl.kt b/compiler/testData/codegen/box/bridges/complexTraitImpl.kt
index cf5605af569..b17347ff040 100644
--- a/compiler/testData/codegen/box/bridges/complexTraitImpl.kt
+++ b/compiler/testData/codegen/box/bridges/complexTraitImpl.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/casts/intersectionTypeSmartcast.kt b/compiler/testData/codegen/box/casts/intersectionTypeSmartcast.kt
index 509ef35fabd..0f67a5d1a66 100644
--- a/compiler/testData/codegen/box/casts/intersectionTypeSmartcast.kt
+++ b/compiler/testData/codegen/box/casts/intersectionTypeSmartcast.kt
@@ -1,3 +1,4 @@
+// IGNORE_BACKEND_FIR: JVM_IR
 interface A {
     fun foo(): Any?
 }
diff --git a/compiler/testData/codegen/box/classes/kt2566.kt b/compiler/testData/codegen/box/classes/kt2566.kt
index 6c7a3b9ce81..6a134feb84f 100644
--- a/compiler/testData/codegen/box/classes/kt2566.kt
+++ b/compiler/testData/codegen/box/classes/kt2566.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A {
     open fun foo() = "OK"
 }
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt
index 70bad269287..e16b000c5f3 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/openFunWithJava.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES
 // FILE: main.kt
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt
index d926e2958ed..34775f65723 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCall.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt
index e08051d0f01..25d9fd9baa2 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallAbstractClass.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt
index 8608725b255..cda43f8cee3 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallInterface.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST
diff --git a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt
index 2f79ace444f..14411f2977d 100644
--- a/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt
+++ b/compiler/testData/codegen/box/coroutines/suspendFunctionAsCoroutine/superCallOverload.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST
diff --git a/compiler/testData/codegen/box/enum/superCallInEnumLiteral.kt b/compiler/testData/codegen/box/enum/superCallInEnumLiteral.kt
index 2c799cd0ce7..11507d9d147 100644
--- a/compiler/testData/codegen/box/enum/superCallInEnumLiteral.kt
+++ b/compiler/testData/codegen/box/enum/superCallInEnumLiteral.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 package test
 
 fun box() = E.E1.f() + E.E2.f()
diff --git a/compiler/testData/codegen/box/functions/kt2481.kt b/compiler/testData/codegen/box/functions/kt2481.kt
index 9fa77e36868..ea353c41cb1 100644
--- a/compiler/testData/codegen/box/functions/kt2481.kt
+++ b/compiler/testData/codegen/box/functions/kt2481.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun box() =
     B().method()
 
diff --git a/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/interfaceSuperCall.kt b/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/interfaceSuperCall.kt
index d91af96b5a9..1b02418da86 100644
--- a/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/interfaceSuperCall.kt
+++ b/compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/interfaceSuperCall.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 interface A {
     fun f(x: String) = x
diff --git a/compiler/testData/codegen/box/innerNested/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt
index f345f71ecb7..b2bb6dbd67a 100644
--- a/compiler/testData/codegen/box/innerNested/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt
+++ b/compiler/testData/codegen/box/innerNested/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun box(): String {
     val three = 3
 
diff --git a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt
index f5bc9031eb0..a88e9cc776e 100644
--- a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt
+++ b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS, NATIVE
diff --git a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt
index b609d2c3fc8..9363baa10a6 100644
--- a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt
+++ b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS, NATIVE
diff --git a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneHierarchy.kt b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneHierarchy.kt
index d68c6862329..123e036c5cf 100644
--- a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneHierarchy.kt
+++ b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneHierarchy.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 open class A : Cloneable {
diff --git a/compiler/testData/codegen/box/jvm8/defaults/kt14243.kt b/compiler/testData/codegen/box/jvm8/defaults/kt14243.kt
index a6ee53eaa51..e55cba6b123 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/kt14243.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/kt14243.kt
@@ -1,5 +1,4 @@
 // !JVM_DEFAULT_MODE: enable
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt b/compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt
index 8b7a1c145d0..7f35ea1eaf8 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt
@@ -1,5 +1,4 @@
 // !JVM_DEFAULT_MODE: enable
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/jvm8/defaults/superCall.kt b/compiler/testData/codegen/box/jvm8/defaults/superCall.kt
index 8e476a84515..320ee85fb91 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/superCall.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/superCall.kt
@@ -1,5 +1,4 @@
 // !JVM_DEFAULT_MODE: enable
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/jvm8/kt14243.kt b/compiler/testData/codegen/box/jvm8/kt14243.kt
index e833607dde1..249699e62f9 100644
--- a/compiler/testData/codegen/box/jvm8/kt14243.kt
+++ b/compiler/testData/codegen/box/jvm8/kt14243.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 
diff --git a/compiler/testData/codegen/box/jvm8/kt14243_2.kt b/compiler/testData/codegen/box/jvm8/kt14243_2.kt
index 60d953a02b9..b80a5403575 100644
--- a/compiler/testData/codegen/box/jvm8/kt14243_2.kt
+++ b/compiler/testData/codegen/box/jvm8/kt14243_2.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 
diff --git a/compiler/testData/codegen/box/mangling/internalOverrideSuperCall.kt b/compiler/testData/codegen/box/mangling/internalOverrideSuperCall.kt
index e5530d5d9e3..64424c1dd80 100644
--- a/compiler/testData/codegen/box/mangling/internalOverrideSuperCall.kt
+++ b/compiler/testData/codegen/box/mangling/internalOverrideSuperCall.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A {
     internal open val field = "F"
 
diff --git a/compiler/testData/codegen/box/mangling/publicOverrideSuperCall.kt b/compiler/testData/codegen/box/mangling/publicOverrideSuperCall.kt
index 40bcb6b6077..422f510101e 100644
--- a/compiler/testData/codegen/box/mangling/publicOverrideSuperCall.kt
+++ b/compiler/testData/codegen/box/mangling/publicOverrideSuperCall.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A {
     internal open val field = "F"
 
diff --git a/compiler/testData/codegen/box/objects/nestedObjectWithSuperclass.kt b/compiler/testData/codegen/box/objects/nestedObjectWithSuperclass.kt
index 155391266d6..596801c7050 100644
--- a/compiler/testData/codegen/box/objects/nestedObjectWithSuperclass.kt
+++ b/compiler/testData/codegen/box/objects/nestedObjectWithSuperclass.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A (val s: Int) {
     open fun foo(): Int {
         return s
diff --git a/compiler/testData/codegen/box/objects/objectWithSuperclass.kt b/compiler/testData/codegen/box/objects/objectWithSuperclass.kt
index b184cf9a32f..31c004a45fb 100644
--- a/compiler/testData/codegen/box/objects/objectWithSuperclass.kt
+++ b/compiler/testData/codegen/box/objects/objectWithSuperclass.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A {
     open fun foo(): Int {
         return 2
diff --git a/compiler/testData/codegen/box/objects/objectWithSuperclassAndTrait.kt b/compiler/testData/codegen/box/objects/objectWithSuperclassAndTrait.kt
index 1704ec9137e..c239a3eff27 100644
--- a/compiler/testData/codegen/box/objects/objectWithSuperclassAndTrait.kt
+++ b/compiler/testData/codegen/box/objects/objectWithSuperclassAndTrait.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A {
     open fun foo(): Int {
         return 2
diff --git a/compiler/testData/codegen/box/secondaryConstructors/enums.kt b/compiler/testData/codegen/box/secondaryConstructors/enums.kt
index 062c8c32926..9fd17a5058e 100644
--- a/compiler/testData/codegen/box/secondaryConstructors/enums.kt
+++ b/compiler/testData/codegen/box/secondaryConstructors/enums.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 enum class A1(val prop1: String) {
     X("asd"),
diff --git a/compiler/testData/codegen/box/super/basicmethodSuperTrait.kt b/compiler/testData/codegen/box/super/basicmethodSuperTrait.kt
index 0ebb2e00928..886987cf6f3 100644
--- a/compiler/testData/codegen/box/super/basicmethodSuperTrait.kt
+++ b/compiler/testData/codegen/box/super/basicmethodSuperTrait.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 interface Tr {
    fun extra() : String = "_"
diff --git a/compiler/testData/codegen/box/super/interfaceHashCode.kt b/compiler/testData/codegen/box/super/interfaceHashCode.kt
index c88e69af2cf..7a6aeff7fa3 100644
--- a/compiler/testData/codegen/box/super/interfaceHashCode.kt
+++ b/compiler/testData/codegen/box/super/interfaceHashCode.kt
@@ -1,3 +1,4 @@
+// IGNORE_BACKEND_FIR: JVM_IR
 interface I
 class C : I { fun foo() = super<I>.hashCode() }
 
diff --git a/compiler/testData/codegen/box/super/kt14243.kt b/compiler/testData/codegen/box/super/kt14243.kt
index 0e9e4cba1cb..75d5fcb7ae7 100644
--- a/compiler/testData/codegen/box/super/kt14243.kt
+++ b/compiler/testData/codegen/box/super/kt14243.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface Z<T> {
     fun test(p: T): T {
         return p
diff --git a/compiler/testData/codegen/box/super/kt14243_2.kt b/compiler/testData/codegen/box/super/kt14243_2.kt
index d896d345688..b72bf3dac7c 100644
--- a/compiler/testData/codegen/box/super/kt14243_2.kt
+++ b/compiler/testData/codegen/box/super/kt14243_2.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface Z<T> {
     fun test(p: T): T {
         return p
diff --git a/compiler/testData/codegen/box/super/multipleSuperTraits.kt b/compiler/testData/codegen/box/super/multipleSuperTraits.kt
index 706f2359c1e..2ddb25d35b9 100644
--- a/compiler/testData/codegen/box/super/multipleSuperTraits.kt
+++ b/compiler/testData/codegen/box/super/multipleSuperTraits.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface T1 {
     fun foo() = "O"
 }
diff --git a/compiler/testData/codegen/box/super/superCallToNonGenericImplThroughGenericDefaultImpls.kt b/compiler/testData/codegen/box/super/superCallToNonGenericImplThroughGenericDefaultImpls.kt
index be04a2f36a7..f10870d2d33 100644
--- a/compiler/testData/codegen/box/super/superCallToNonGenericImplThroughGenericDefaultImpls.kt
+++ b/compiler/testData/codegen/box/super/superCallToNonGenericImplThroughGenericDefaultImpls.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 interface A {
     fun foo(o: String): String = o + "K"
diff --git a/compiler/testData/codegen/box/syntheticAccessors/superCallFromMultipleSubclasses.kt b/compiler/testData/codegen/box/syntheticAccessors/superCallFromMultipleSubclasses.kt
index 51debfd2805..2d2f6570c7a 100644
--- a/compiler/testData/codegen/box/syntheticAccessors/superCallFromMultipleSubclasses.kt
+++ b/compiler/testData/codegen/box/syntheticAccessors/superCallFromMultipleSubclasses.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A {
     open fun test(s: String) = s
 }
diff --git a/compiler/testData/codegen/box/traits/kt1936.kt b/compiler/testData/codegen/box/traits/kt1936.kt
index fbdc0456b35..0764dca3de4 100644
--- a/compiler/testData/codegen/box/traits/kt1936.kt
+++ b/compiler/testData/codegen/box/traits/kt1936.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 var result = "Fail"
 
 interface MyTrait
diff --git a/compiler/testData/codegen/box/traits/kt1936_1.kt b/compiler/testData/codegen/box/traits/kt1936_1.kt
index 4cd9e92de65..c3c6ef815f6 100644
--- a/compiler/testData/codegen/box/traits/kt1936_1.kt
+++ b/compiler/testData/codegen/box/traits/kt1936_1.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface MyTrait
 {
     var property : String
diff --git a/compiler/testData/codegen/box/traits/kt5393.kt b/compiler/testData/codegen/box/traits/kt5393.kt
index 38d22959ec3..2b221df2cb3 100644
--- a/compiler/testData/codegen/box/traits/kt5393.kt
+++ b/compiler/testData/codegen/box/traits/kt5393.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface A {
     fun foo(): String {
         return "OK"
diff --git a/compiler/testData/codegen/box/traits/traitImplDelegationWithCovariantOverride.kt b/compiler/testData/codegen/box/traits/traitImplDelegationWithCovariantOverride.kt
index caa12832d7b..2c8af75f5c0 100644
--- a/compiler/testData/codegen/box/traits/traitImplDelegationWithCovariantOverride.kt
+++ b/compiler/testData/codegen/box/traits/traitImplDelegationWithCovariantOverride.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface A {
     fun foo(): Number {
         return 42
diff --git a/compiler/testData/codegen/box/traits/traitImplGenericDelegation.kt b/compiler/testData/codegen/box/traits/traitImplGenericDelegation.kt
index fcdc224154b..65253011fd9 100644
--- a/compiler/testData/codegen/box/traits/traitImplGenericDelegation.kt
+++ b/compiler/testData/codegen/box/traits/traitImplGenericDelegation.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface A<T, U : Number, V : Any> {
     fun foo(t: T, u: U): V? {
         return null
diff --git a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.txt b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.txt
index f3eb7cad613..97d5d99b341 100644
--- a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.txt
+++ b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.txt
@@ -89,7 +89,7 @@ FILE fqName:<root> fileName:/enumWithMultipleCtors.kt
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='public final fun f (): kotlin.String declared in <root>.A.Y'
               CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS
-                $this: CALL 'public open fun f (): kotlin.String declared in <root>.A' type=kotlin.String origin=null
+                $this: CALL 'public open fun f (): kotlin.String declared in <root>.A' superQualifier='CLASS ENUM_CLASS name:A modality:OPEN visibility:public superTypes:[kotlin.Enum<<root>.A>]' type=kotlin.String origin=null
                   $this: GET_VAR '<this>: <root>.A.Y declared in <root>.A.Y.f' type=<root>.A.Y origin=null
                 other: CONST String type=kotlin.String value="#Y"
         PROPERTY FAKE_OVERRIDE name:prop1 visibility:public modality:FINAL [fake_override,val]
diff --git a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.txt b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.txt
index ae63b73f88d..dae623df731 100644
--- a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.txt
+++ b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.txt
@@ -51,7 +51,7 @@ FILE fqName:<root> fileName:/implicitNotNullOnDelegatedImplementation.kt
       $this: VALUE_PARAMETER name:<this> type:<root>.K2
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in <root>.K2'
-          CALL 'public open fun foo (): kotlin.String declared in <root>.JFoo' type=kotlin.String origin=null
+          CALL 'public open fun foo (): kotlin.String declared in <root>.JFoo' superQualifier='CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:JFoo modality:OPEN visibility:public superTypes:[kotlin.Any; <root>.IFoo]' type=kotlin.String origin=null
             $this: GET_VAR '<this>: <root>.K2 declared in <root>.K2.foo' type=<root>.K2 origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
diff --git a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt
index 3f98c889153..4a4914bb52b 100644
--- a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt
+++ b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt
@@ -61,9 +61,9 @@ FILE fqName:<root> fileName:/qualifiedSuperCalls.kt
         public open fun foo (): kotlin.Unit declared in <root>.IRight
       $this: VALUE_PARAMETER name:<this> type:<root>.CBoth
       BLOCK_BODY
-        CALL 'public open fun foo (): kotlin.Unit declared in <root>.ILeft' type=kotlin.Unit origin=null
+        CALL 'public open fun foo (): kotlin.Unit declared in <root>.ILeft' superQualifier='CLASS INTERFACE name:ILeft modality:ABSTRACT visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit origin=null
           $this: GET_VAR '<this>: <root>.CBoth declared in <root>.CBoth.foo' type=<root>.CBoth origin=null
-        CALL 'public open fun foo (): kotlin.Unit declared in <root>.IRight' type=kotlin.Unit origin=null
+        CALL 'public open fun foo (): kotlin.Unit declared in <root>.IRight' superQualifier='CLASS INTERFACE name:IRight modality:ABSTRACT visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit origin=null
           $this: GET_VAR '<this>: <root>.CBoth declared in <root>.CBoth.foo' type=<root>.CBoth origin=null
     PROPERTY name:bar visibility:public modality:FINAL [val]
       FUN name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.CBoth) returnType:kotlin.Int
diff --git a/compiler/testData/ir/irText/classes/superCalls.fir.txt b/compiler/testData/ir/irText/classes/superCalls.fir.txt
index 44f49cc2d0b..de21bc92fcb 100644
--- a/compiler/testData/ir/irText/classes/superCalls.fir.txt
+++ b/compiler/testData/ir/irText/classes/superCalls.fir.txt
@@ -23,7 +23,7 @@ FILE fqName:<root> fileName:/superCalls.kt
       $this: VALUE_PARAMETER name:<this> type:<root>.Base
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Base'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' superQualifier='CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public superTypes:[]' type=kotlin.Int origin=null
             $this: GET_VAR '<this>: <root>.Base declared in <root>.Base.hashCode' type=<root>.Base origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
@@ -45,7 +45,7 @@ FILE fqName:<root> fileName:/superCalls.kt
         public open fun foo (): kotlin.Unit declared in <root>.Base
       $this: VALUE_PARAMETER name:<this> type:<root>.Derived
       BLOCK_BODY
-        CALL 'public open fun foo (): kotlin.Unit declared in <root>.Base' type=kotlin.Unit origin=null
+        CALL 'public open fun foo (): kotlin.Unit declared in <root>.Base' superQualifier='CLASS CLASS name:Base modality:OPEN visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit origin=null
           $this: GET_VAR '<this>: <root>.Derived declared in <root>.Derived.foo' type=<root>.Derived origin=null
     PROPERTY name:bar visibility:public modality:FINAL [val]
       FUN name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.Derived) returnType:kotlin.String