diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
index 95b7c090d9a..867dcf37eab 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
@@ -161,7 +161,18 @@ fun FirClassifierSymbol<*>.toIrSymbol(
 
 fun FirReference.toSymbol(declarationStorage: Fir2IrDeclarationStorage): IrSymbol? {
     return when (this) {
-        is FirResolvedNamedReference -> resolvedSymbol.toSymbol(declarationStorage)
+        is FirResolvedNamedReference -> {
+            when (val resolvedSymbol = resolvedSymbol) {
+                is FirCallableSymbol<*> -> {
+                    val originalCallableSymbol =
+                        resolvedSymbol.overriddenSymbol?.takeIf { it.callableId == resolvedSymbol.callableId } ?: resolvedSymbol
+                    originalCallableSymbol.toSymbol(declarationStorage)
+                }
+                else -> {
+                    resolvedSymbol.toSymbol(declarationStorage)
+                }
+            }
+        }
         is FirThisReference -> {
             when (val boundSymbol = boundSymbol?.toSymbol(declarationStorage)) {
                 is IrClassSymbol -> boundSymbol.owner.thisReceiver?.symbol
diff --git a/compiler/testData/codegen/box/arrays/kt3771.kt b/compiler/testData/codegen/box/arrays/kt3771.kt
index 7fbb7313cbb..60db734b833 100644
--- a/compiler/testData/codegen/box/arrays/kt3771.kt
+++ b/compiler/testData/codegen/box/arrays/kt3771.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun fill(dest : Array<in String>, v : String) {
     dest[0] = v
 }
diff --git a/compiler/testData/codegen/box/arrays/kt594.kt b/compiler/testData/codegen/box/arrays/kt594.kt
index 1020f278a89..c67bd1b66e7 100644
--- a/compiler/testData/codegen/box/arrays/kt594.kt
+++ b/compiler/testData/codegen/box/arrays/kt594.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 package array_test
 
 fun box() : String {
diff --git a/compiler/testData/codegen/box/arrays/kt7009.kt b/compiler/testData/codegen/box/arrays/kt7009.kt
index 1200b7df3bf..29e7675339f 100644
--- a/compiler/testData/codegen/box/arrays/kt7009.kt
+++ b/compiler/testData/codegen/box/arrays/kt7009.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/boxingOptimization/kt19767.kt b/compiler/testData/codegen/box/boxingOptimization/kt19767.kt
index 2ae1883ce81..bb00ac53fa6 100644
--- a/compiler/testData/codegen/box/boxingOptimization/kt19767.kt
+++ b/compiler/testData/codegen/box/boxingOptimization/kt19767.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun foo(p: Int?): Boolean {
     return M<Int>(p)?.nulled() == 1
 }
diff --git a/compiler/testData/codegen/box/boxingOptimization/kt19767_2.kt b/compiler/testData/codegen/box/boxingOptimization/kt19767_2.kt
index 1775c728469..ba880641fb5 100644
--- a/compiler/testData/codegen/box/boxingOptimization/kt19767_2.kt
+++ b/compiler/testData/codegen/box/boxingOptimization/kt19767_2.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 //WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/boxingOptimization/kt19767_chain.kt b/compiler/testData/codegen/box/boxingOptimization/kt19767_chain.kt
index eb1bc201e81..441714d90b2 100644
--- a/compiler/testData/codegen/box/boxingOptimization/kt19767_chain.kt
+++ b/compiler/testData/codegen/box/boxingOptimization/kt19767_chain.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun foo(p: Int?): Boolean {
     return M<Int>(p)?.chain()?.nulled() == 1
 }
diff --git a/compiler/testData/codegen/box/bridges/methodFromTrait.kt b/compiler/testData/codegen/box/bridges/methodFromTrait.kt
index 391fa386194..058109901d1 100644
--- a/compiler/testData/codegen/box/bridges/methodFromTrait.kt
+++ b/compiler/testData/codegen/box/bridges/methodFromTrait.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface A<T, U> {
     fun foo(t: T, u: U) = "A"
 }
diff --git a/compiler/testData/codegen/box/callableReference/function/genericMember.kt b/compiler/testData/codegen/box/callableReference/function/genericMember.kt
index ad8bede06f1..25dabc055f2 100644
--- a/compiler/testData/codegen/box/callableReference/function/genericMember.kt
+++ b/compiler/testData/codegen/box/callableReference/function/genericMember.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A<T>(val t: T) {
     fun foo(): T = t
 }
diff --git a/compiler/testData/codegen/box/callableReference/function/javaCollectionsStaticMethod.kt b/compiler/testData/codegen/box/callableReference/function/javaCollectionsStaticMethod.kt
index a01cb204c3c..c28d727bdd5 100644
--- a/compiler/testData/codegen/box/callableReference/function/javaCollectionsStaticMethod.kt
+++ b/compiler/testData/codegen/box/callableReference/function/javaCollectionsStaticMethod.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // KT-5123
diff --git a/compiler/testData/codegen/box/callableReference/function/local/genericMember.kt b/compiler/testData/codegen/box/callableReference/function/local/genericMember.kt
index 3d6762a137c..12e60f50480 100644
--- a/compiler/testData/codegen/box/callableReference/function/local/genericMember.kt
+++ b/compiler/testData/codegen/box/callableReference/function/local/genericMember.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun box(): String {
     class Id<T> {
         fun invoke(t: T) = t
diff --git a/compiler/testData/codegen/box/callableReference/function/overloadedFunVsVal.kt b/compiler/testData/codegen/box/callableReference/function/overloadedFunVsVal.kt
index af62e17c0eb..887b130ad65 100644
--- a/compiler/testData/codegen/box/callableReference/function/overloadedFunVsVal.kt
+++ b/compiler/testData/codegen/box/callableReference/function/overloadedFunVsVal.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
diff --git a/compiler/testData/codegen/box/callableReference/property/accessViaSubclass.kt b/compiler/testData/codegen/box/callableReference/property/accessViaSubclass.kt
index 78e816e04c6..eb2a0728db2 100644
--- a/compiler/testData/codegen/box/callableReference/property/accessViaSubclass.kt
+++ b/compiler/testData/codegen/box/callableReference/property/accessViaSubclass.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 abstract class Base {
     val result = "OK"
 }
diff --git a/compiler/testData/codegen/box/callableReference/property/javaBeanConvention.kt b/compiler/testData/codegen/box/callableReference/property/javaBeanConvention.kt
index 250927ea503..0030d8026c3 100644
--- a/compiler/testData/codegen/box/callableReference/property/javaBeanConvention.kt
+++ b/compiler/testData/codegen/box/callableReference/property/javaBeanConvention.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // Name of the getter should be 'getaBcde' according to JavaBean conventions
 var aBcde: Int = 239
 
diff --git a/compiler/testData/codegen/box/callableReference/property/kt12044.kt b/compiler/testData/codegen/box/callableReference/property/kt12044.kt
index b0b3cbd6cee..ea43b14b545 100644
--- a/compiler/testData/codegen/box/callableReference/property/kt12044.kt
+++ b/compiler/testData/codegen/box/callableReference/property/kt12044.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KT-12044 Assertion "Rewrite at slice LEXICAL_SCOPE" for 'if' with property references
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/callableReference/property/kt12982_protectedPropertyReference.kt b/compiler/testData/codegen/box/callableReference/property/kt12982_protectedPropertyReference.kt
index 8a4d5626635..7cabd9c6d65 100644
--- a/compiler/testData/codegen/box/callableReference/property/kt12982_protectedPropertyReference.kt
+++ b/compiler/testData/codegen/box/callableReference/property/kt12982_protectedPropertyReference.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Foo {
     protected var x = 0
 
diff --git a/compiler/testData/codegen/box/callableReference/property/kt14330.kt b/compiler/testData/codegen/box/callableReference/property/kt14330.kt
index a6a742aa7aa..43969a5fd1a 100644
--- a/compiler/testData/codegen/box/callableReference/property/kt14330.kt
+++ b/compiler/testData/codegen/box/callableReference/property/kt14330.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class Foo(var bar: Int?)
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/callableReference/property/localClassVar.kt b/compiler/testData/codegen/box/callableReference/property/localClassVar.kt
index eb1fbf7245d..fd45085df67 100644
--- a/compiler/testData/codegen/box/callableReference/property/localClassVar.kt
+++ b/compiler/testData/codegen/box/callableReference/property/localClassVar.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun box(): String {
     class Local {
         var result = "Fail"
diff --git a/compiler/testData/codegen/box/callableReference/property/simpleMember.kt b/compiler/testData/codegen/box/callableReference/property/simpleMember.kt
index 692964baa50..39bf36a0707 100644
--- a/compiler/testData/codegen/box/callableReference/property/simpleMember.kt
+++ b/compiler/testData/codegen/box/callableReference/property/simpleMember.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A(val x: Int)
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/binaryExpressionCast.kt b/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/binaryExpressionCast.kt
index 5394a186cc2..8f18303c58c 100644
--- a/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/binaryExpressionCast.kt
+++ b/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/binaryExpressionCast.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Box<T>(val value: T)
 
 fun box() : String {
diff --git a/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/labeledExpressionCast.kt b/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/labeledExpressionCast.kt
index b42a04343ec..229afac35f9 100644
--- a/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/labeledExpressionCast.kt
+++ b/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/labeledExpressionCast.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Box<T>(val value: T)
 
 fun box() : String {
diff --git a/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/parenthesizedExpressionCast.kt b/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/parenthesizedExpressionCast.kt
index 27601ff358f..a70372d5ca4 100644
--- a/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/parenthesizedExpressionCast.kt
+++ b/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/parenthesizedExpressionCast.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Box<T>(val value: T)
 
 fun box() : String {
diff --git a/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/unaryExpressionCast.kt b/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/unaryExpressionCast.kt
index d4a4ae5fcd7..6f253b61557 100644
--- a/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/unaryExpressionCast.kt
+++ b/compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/unaryExpressionCast.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Box<T>(val value: T)
 
 fun box() : String {
diff --git a/compiler/testData/codegen/box/classes/kt1538.kt b/compiler/testData/codegen/box/classes/kt1538.kt
index b612308a375..5ed32558d76 100644
--- a/compiler/testData/codegen/box/classes/kt1538.kt
+++ b/compiler/testData/codegen/box/classes/kt1538.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 data class Pair<First, Second>(val first: First, val second: Second)
 
diff --git a/compiler/testData/codegen/box/classes/kt1891.kt b/compiler/testData/codegen/box/classes/kt1891.kt
index 5944552f36b..e9183589db3 100644
--- a/compiler/testData/codegen/box/classes/kt1891.kt
+++ b/compiler/testData/codegen/box/classes/kt1891.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class MyList<T>() {
     var value: T? = null
 
diff --git a/compiler/testData/codegen/box/classes/kt2417.kt b/compiler/testData/codegen/box/classes/kt2417.kt
index b8643e2a339..c72d216109e 100644
--- a/compiler/testData/codegen/box/classes/kt2417.kt
+++ b/compiler/testData/codegen/box/classes/kt2417.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 fun box() : String{
     val set = HashSet<String>()
diff --git a/compiler/testData/codegen/box/classes/kt707.kt b/compiler/testData/codegen/box/classes/kt707.kt
index 733a55dcfb5..cb53a5d0125 100644
--- a/compiler/testData/codegen/box/classes/kt707.kt
+++ b/compiler/testData/codegen/box/classes/kt707.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: Enable for JS when it supports Java class library.
 // IGNORE_BACKEND: JS, NATIVE
diff --git a/compiler/testData/codegen/box/classes/kt8011.kt b/compiler/testData/codegen/box/classes/kt8011.kt
index 8014b0f7d75..d9fa7470852 100644
--- a/compiler/testData/codegen/box/classes/kt8011.kt
+++ b/compiler/testData/codegen/box/classes/kt8011.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/classes/kt903.kt b/compiler/testData/codegen/box/classes/kt903.kt
index 613a58f5f26..b4a75ee8128 100644
--- a/compiler/testData/codegen/box/classes/kt903.kt
+++ b/compiler/testData/codegen/box/classes/kt903.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 operator fun Int.plus(a: Int?) = this + a!!
diff --git a/compiler/testData/codegen/box/classes/simpleBox.kt b/compiler/testData/codegen/box/classes/simpleBox.kt
index d94252e3bb7..be95d012d51 100644
--- a/compiler/testData/codegen/box/classes/simpleBox.kt
+++ b/compiler/testData/codegen/box/classes/simpleBox.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Box<T>(t: T) {
     var value = t
 }
diff --git a/compiler/testData/codegen/box/controlStructures/forInArray/forIntArray.kt b/compiler/testData/codegen/box/controlStructures/forInArray/forIntArray.kt
index c278d24fa39..9fc295b3eda 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArray/forIntArray.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArray/forIntArray.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun box() : String {
     val a = arrayOfNulls<Int>(5)
     var i = 0
diff --git a/compiler/testData/codegen/box/controlStructures/forInArray/forNullableIntArray.kt b/compiler/testData/codegen/box/controlStructures/forInArray/forNullableIntArray.kt
index 98edf51cacf..10e29bcba89 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArray/forNullableIntArray.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArray/forNullableIntArray.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun box() : String {
     val b : Array<Int?> = arrayOfNulls<Int> (5)
     var i = 0
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexBreakAndContinue.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexBreakAndContinue.kt
index 7cfd32cf3da..1eadf7ee1c2 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexBreakAndContinue.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexBreakAndContinue.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexContinuesAsUnmodified.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexContinuesAsUnmodified.kt
index eae19c8cbe0..fba4bb5c509 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexContinuesAsUnmodified.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexContinuesAsUnmodified.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // See https://youtrack.jetbrains.com/issue/KT-22424
 // IGNORE_BACKEND: JS
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoElementVar.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoElementVar.kt
index d71aab3ee59..27ebd2d5101 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoElementVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoElementVar.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoIndexOrElementVar.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoIndexOrElementVar.kt
index 3a9ba63199f..3b4321724de 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoIndexOrElementVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoIndexOrElementVar.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoIndexVar.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoIndexVar.kt
index d089dac3b62..004a37109c3 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoIndexVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNoIndexVar.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNotDestructured.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNotDestructured.kt
index aa7400e504a..f319dae335a 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNotDestructured.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexNotDestructured.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexWithExplicitlyTypedIndexVariable.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexWithExplicitlyTypedIndexVariable.kt
index 1635c301950..7335bf456e0 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexWithExplicitlyTypedIndexVariable.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInArrayWithIndexWithExplicitlyTypedIndexVariable.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInByteArrayWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInByteArrayWithIndex.kt
index 50579ed5a3c..87d6b9dcb76 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInByteArrayWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInByteArrayWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInByteArrayWithIndexWithSmartCast.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInByteArrayWithIndexWithSmartCast.kt
index 48437515af4..9bd16e039fa 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInByteArrayWithIndexWithSmartCast.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInByteArrayWithIndexWithSmartCast.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayOfIntsWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayOfIntsWithIndex.kt
index 995b85c0587..a4d8e55b3bd 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayOfIntsWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayOfIntsWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayWithIndex.kt
index 51fe2f719e1..ffaf44d3ab2 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInGenericArrayWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInIntArrayWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInIntArrayWithIndex.kt
index 91ade2a0def..cf0effa84ee 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInIntArrayWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInIntArrayWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInIntArrayWithIndexWithSmartCast.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInIntArrayWithIndexWithSmartCast.kt
index 4d3aee13208..aebc5a2a99c 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInIntArrayWithIndexWithSmartCast.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInIntArrayWithIndexWithSmartCast.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInObjectArrayWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInObjectArrayWithIndex.kt
index 9690d131864..e72e16840a3 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInObjectArrayWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInObjectArrayWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInShortArrayWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInShortArrayWithIndex.kt
index 7b2fec139e1..19995aa89cf 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInShortArrayWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInShortArrayWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInShortArrayWithIndexWithSmartCast.kt b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInShortArrayWithIndexWithSmartCast.kt
index c52c07552a6..8e10ffcd0b6 100644
--- a/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInShortArrayWithIndexWithSmartCast.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInArrayWithIndex/forInShortArrayWithIndexWithSmartCast.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSeqWithIndexStops.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSeqWithIndexStops.kt
index f160d0bce88..21b6b62c663 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSeqWithIndexStops.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSeqWithIndexStops.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // IGNORE_BACKEND: JS, NATIVE
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceTypeParameterWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceTypeParameterWithIndex.kt
index d4d2e3ddcb6..bdd9bd933ae 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceTypeParameterWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceTypeParameterWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndex.kt
index 734f31c56ef..bd00dc12b86 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexBreakAndContinue.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexBreakAndContinue.kt
index 65afce83650..d47402ffc6d 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexBreakAndContinue.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInCharSequenceWithIndexBreakAndContinue.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndex.kt
index d6f94259457..833686f56b9 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoElementVar.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoElementVar.kt
index 3a4e7ea5481..bba925f536a 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoElementVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoElementVar.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoIndexOrElementVar.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoIndexOrElementVar.kt
index 6e5355e4bcc..ce450aaeaf5 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoIndexOrElementVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoIndexOrElementVar.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoIndexVar.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoIndexVar.kt
index 686b029fabe..2eaeb1faf32 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoIndexVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNoIndexVar.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNotDestructured.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNotDestructured.kt
index 99942f3619a..0d9bd7e3a61 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNotDestructured.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexNotDestructured.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexWithExplicitlyTypedIndexVariable.kt b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexWithExplicitlyTypedIndexVariable.kt
index 4ab6fbb8453..f2111a4e9b1 100644
--- a/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexWithExplicitlyTypedIndexVariable.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInCharSequenceWithIndex/forInStringWithIndexWithExplicitlyTypedIndexVariable.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndex.kt
index d35223fcba3..d5be1ee42fe 100644
--- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexBreakAndContinue.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexBreakAndContinue.kt
index b98f3e98478..45ee9e7320c 100644
--- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexBreakAndContinue.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexBreakAndContinue.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexNoElementVar.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexNoElementVar.kt
index 941d0c30638..3f54e053b7a 100644
--- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexNoElementVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexNoElementVar.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexNoIndexVar.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexNoIndexVar.kt
index 2199be8fc08..915e255554f 100644
--- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexNoIndexVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexNoIndexVar.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexThrowsCME.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexThrowsCME.kt
index 6e7e68d58a3..2d8afeb4808 100644
--- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexThrowsCME.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexThrowsCME.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // FULL_JDK
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexWithExplicitlyTypedIndexVariable.kt b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexWithExplicitlyTypedIndexVariable.kt
index 3cc32384e38..b3b7218f584 100644
--- a/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexWithExplicitlyTypedIndexVariable.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInIterableWithIndex/forInListWithIndexWithExplicitlyTypedIndexVariable.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndex.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndex.kt
index 0fffdffc0cc..9931d613cf7 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndex.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexBreakAndContinue.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexBreakAndContinue.kt
index ab0f05e4ed1..f988e99d085 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexBreakAndContinue.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexBreakAndContinue.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoElementVar.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoElementVar.kt
index 08b32d132cc..6d1885e2e62 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoElementVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoElementVar.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVar.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVar.kt
index 5b051a1fdac..b1a9925be6e 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVar.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexNoIndexVar.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexThrowsCME.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexThrowsCME.kt
index 6d05a79512b..afcfcd510b0 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexThrowsCME.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexThrowsCME.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // FULL_JDK
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexWithExplicitlyTypedIndexVariable.kt b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexWithExplicitlyTypedIndexVariable.kt
index 878917ddfcc..af41524043c 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexWithExplicitlyTypedIndexVariable.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSequenceWithIndex/forInSequenceWithIndexWithExplicitlyTypedIndexVariable.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/controlStructures/forInSmartCastToArray.kt b/compiler/testData/codegen/box/controlStructures/forInSmartCastToArray.kt
index ac8be162c57..83a919d7e9f 100644
--- a/compiler/testData/codegen/box/controlStructures/forInSmartCastToArray.kt
+++ b/compiler/testData/codegen/box/controlStructures/forInSmartCastToArray.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun f(x: Any?): Any? {
     if (x is Array<*>) {
         for (i in x) {
diff --git a/compiler/testData/codegen/box/controlStructures/kt237.kt b/compiler/testData/codegen/box/controlStructures/kt237.kt
index b77980ff162..13a312ad7db 100644
--- a/compiler/testData/codegen/box/controlStructures/kt237.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt237.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/controlStructures/kt2423.kt b/compiler/testData/codegen/box/controlStructures/kt2423.kt
index 028b5421818..c6390b86d3c 100644
--- a/compiler/testData/codegen/box/controlStructures/kt2423.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt2423.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/controlStructures/kt513.kt b/compiler/testData/codegen/box/controlStructures/kt513.kt
index 88f9c533c5d..67f5a1ea692 100644
--- a/compiler/testData/codegen/box/controlStructures/kt513.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt513.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
diff --git a/compiler/testData/codegen/box/controlStructures/kt910.kt b/compiler/testData/codegen/box/controlStructures/kt910.kt
index ee3969a2ed5..ae207a80129 100644
--- a/compiler/testData/codegen/box/controlStructures/kt910.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt910.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 fun foo() : Int =
     try {
diff --git a/compiler/testData/codegen/box/dataClasses/genericParam.kt b/compiler/testData/codegen/box/dataClasses/genericParam.kt
index 6a2902ba256..5bf58f528f7 100644
--- a/compiler/testData/codegen/box/dataClasses/genericParam.kt
+++ b/compiler/testData/codegen/box/dataClasses/genericParam.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class A<T>(val x: T)
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/destructuringDeclInLambdaParam/generic.kt b/compiler/testData/codegen/box/destructuringDeclInLambdaParam/generic.kt
index 6d2accd252c..4dadddb91cd 100644
--- a/compiler/testData/codegen/box/destructuringDeclInLambdaParam/generic.kt
+++ b/compiler/testData/codegen/box/destructuringDeclInLambdaParam/generic.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 data class A<T, F>(val x: T, val y: F)
 
 fun <X, Y> foo(a: A<X, Y>, block: (A<X, Y>) -> String) = block(a)
diff --git a/compiler/testData/codegen/box/destructuringDeclInLambdaParam/stdlibUsages.kt b/compiler/testData/codegen/box/destructuringDeclInLambdaParam/stdlibUsages.kt
index 423b81434b4..9d6367910f3 100644
--- a/compiler/testData/codegen/box/destructuringDeclInLambdaParam/stdlibUsages.kt
+++ b/compiler/testData/codegen/box/destructuringDeclInLambdaParam/stdlibUsages.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/extensionFunctions/kt1290.kt b/compiler/testData/codegen/box/extensionFunctions/kt1290.kt
index 9113b0f7a67..19f03dc8883 100644
--- a/compiler/testData/codegen/box/extensionFunctions/kt1290.kt
+++ b/compiler/testData/codegen/box/extensionFunctions/kt1290.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 //KT-1290 Method property in constructor causes NPE
 
 class Foo<T>(val filter: (T) -> Boolean) {
diff --git a/compiler/testData/codegen/box/functions/dataLocalVariable.kt b/compiler/testData/codegen/box/functions/dataLocalVariable.kt
index 1f7bf7ce0dc..eb0edb677cf 100644
--- a/compiler/testData/codegen/box/functions/dataLocalVariable.kt
+++ b/compiler/testData/codegen/box/functions/dataLocalVariable.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TODO: Enable when JS backend gets support of Java class library
 // TARGET_BACKEND: JVM
 fun ok(b: Boolean) = if (b) "OK" else "Fail"
diff --git a/compiler/testData/codegen/box/increment/arrayElement.kt b/compiler/testData/codegen/box/increment/arrayElement.kt
index 5bd58b8c31a..e74d4d23515 100644
--- a/compiler/testData/codegen/box/increment/arrayElement.kt
+++ b/compiler/testData/codegen/box/increment/arrayElement.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun box(): String {
     val aByte: Array<Byte> = arrayOf<Byte>(1)
     val bByte: ByteArray = byteArrayOf(1)
diff --git a/compiler/testData/codegen/box/increment/genericClassWithGetSet.kt b/compiler/testData/codegen/box/increment/genericClassWithGetSet.kt
index cddd6c931a9..04825a34f6c 100644
--- a/compiler/testData/codegen/box/increment/genericClassWithGetSet.kt
+++ b/compiler/testData/codegen/box/increment/genericClassWithGetSet.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A<T>(var value: T) {
     operator fun get(i: Int) = value
 
diff --git a/compiler/testData/codegen/box/innerNested/nestedGeneric.kt b/compiler/testData/codegen/box/innerNested/nestedGeneric.kt
index 736182130d6..9cdea6814f5 100644
--- a/compiler/testData/codegen/box/innerNested/nestedGeneric.kt
+++ b/compiler/testData/codegen/box/innerNested/nestedGeneric.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Outer {
     class Nested<T>(val t: T) {
         fun box() = t
diff --git a/compiler/testData/codegen/box/javaInterop/generics/invariantArgumentsNoWildcard.kt b/compiler/testData/codegen/box/javaInterop/generics/invariantArgumentsNoWildcard.kt
index 22a4079918a..d63d0fa2058 100644
--- a/compiler/testData/codegen/box/javaInterop/generics/invariantArgumentsNoWildcard.kt
+++ b/compiler/testData/codegen/box/javaInterop/generics/invariantArgumentsNoWildcard.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // FILE: JavaClass.java
diff --git a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneHashSet.kt b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneHashSet.kt
index baefec27ded..2ec3c2d0538 100644
--- a/compiler/testData/codegen/box/javaInterop/objectMethods/cloneHashSet.kt
+++ b/compiler/testData/codegen/box/javaInterop/objectMethods/cloneHashSet.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclFor.kt b/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclFor.kt
index 9c25b8e2687..e96af75d108 100644
--- a/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclFor.kt
+++ b/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclFor.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 class C(val i: Int) {
   operator fun component1() = i + 1
diff --git a/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentExtensions.kt b/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentExtensions.kt
index 600b283247a..0105f400e8f 100644
--- a/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentExtensions.kt
+++ b/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentExtensions.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 class C(val i: Int) {
 }
diff --git a/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForValCaptured.kt b/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForValCaptured.kt
index 0a12a4c4f40..b1776f685f3 100644
--- a/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForValCaptured.kt
+++ b/compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForValCaptured.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 class C(val i: Int) {
   operator fun component1() = i + 1
diff --git a/compiler/testData/codegen/box/multiDecl/kt9828_hashMap.kt b/compiler/testData/codegen/box/multiDecl/kt9828_hashMap.kt
index 56690a5e230..e2b24dbde61 100644
--- a/compiler/testData/codegen/box/multiDecl/kt9828_hashMap.kt
+++ b/compiler/testData/codegen/box/multiDecl/kt9828_hashMap.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/multifileClasses/optimized/callableRefToConstVal.kt b/compiler/testData/codegen/box/multifileClasses/optimized/callableRefToConstVal.kt
index 41263644bb1..55354181495 100644
--- a/compiler/testData/codegen/box/multifileClasses/optimized/callableRefToConstVal.kt
+++ b/compiler/testData/codegen/box/multifileClasses/optimized/callableRefToConstVal.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // IGNORE_LIGHT_ANALYSIS
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/multifileClasses/optimized/callableRefToInternalConstValInline.kt b/compiler/testData/codegen/box/multifileClasses/optimized/callableRefToInternalConstValInline.kt
index fd82bb0a201..566e2a83b8a 100644
--- a/compiler/testData/codegen/box/multifileClasses/optimized/callableRefToInternalConstValInline.kt
+++ b/compiler/testData/codegen/box/multifileClasses/optimized/callableRefToInternalConstValInline.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // IGNORE_LIGHT_ANALYSIS
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/multifileClasses/optimized/callableRefToPrivateConstVal.kt b/compiler/testData/codegen/box/multifileClasses/optimized/callableRefToPrivateConstVal.kt
index 8480977e0fe..6d149510381 100644
--- a/compiler/testData/codegen/box/multifileClasses/optimized/callableRefToPrivateConstVal.kt
+++ b/compiler/testData/codegen/box/multifileClasses/optimized/callableRefToPrivateConstVal.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // IGNORE_LIGHT_ANALYSIS
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/platformTypes/inferenceFlexibleTToNullable.kt b/compiler/testData/codegen/box/platformTypes/inferenceFlexibleTToNullable.kt
index 59a6d62dead..d19b3af3146 100644
--- a/compiler/testData/codegen/box/platformTypes/inferenceFlexibleTToNullable.kt
+++ b/compiler/testData/codegen/box/platformTypes/inferenceFlexibleTToNullable.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS, JS_IR
 // !LANGUAGE: +NewInference
 
diff --git a/compiler/testData/codegen/box/platformTypes/unsafeNullCheck.kt b/compiler/testData/codegen/box/platformTypes/unsafeNullCheck.kt
index a419b80b7ba..c6f7ce64d84 100644
--- a/compiler/testData/codegen/box/platformTypes/unsafeNullCheck.kt
+++ b/compiler/testData/codegen/box/platformTypes/unsafeNullCheck.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: Unsound.java
 
diff --git a/compiler/testData/codegen/box/platformTypes/unsafeNullCheckWithPrimitive.kt b/compiler/testData/codegen/box/platformTypes/unsafeNullCheckWithPrimitive.kt
index 1da594894f9..dd5d130b001 100644
--- a/compiler/testData/codegen/box/platformTypes/unsafeNullCheckWithPrimitive.kt
+++ b/compiler/testData/codegen/box/platformTypes/unsafeNullCheckWithPrimitive.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // FILE: Unsound.java
 
diff --git a/compiler/testData/codegen/box/primitiveTypes/kt13023.kt b/compiler/testData/codegen/box/primitiveTypes/kt13023.kt
index b3bf6c58647..2ad4310bc91 100644
--- a/compiler/testData/codegen/box/primitiveTypes/kt13023.kt
+++ b/compiler/testData/codegen/box/primitiveTypes/kt13023.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/primitiveTypes/nullableAsIndex.kt b/compiler/testData/codegen/box/primitiveTypes/nullableAsIndex.kt
index 6d282bc3b38..db7b29d0d58 100644
--- a/compiler/testData/codegen/box/primitiveTypes/nullableAsIndex.kt
+++ b/compiler/testData/codegen/box/primitiveTypes/nullableAsIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun test(ix: Int?): String {
     val arr = arrayOf("fail 1")
diff --git a/compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt b/compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt
index bb60687540e..4f01d638f9d 100644
--- a/compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt
+++ b/compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.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/properties/kt257.kt b/compiler/testData/codegen/box/properties/kt257.kt
index 9a57779e9b1..299042d2f31 100644
--- a/compiler/testData/codegen/box/properties/kt257.kt
+++ b/compiler/testData/codegen/box/properties/kt257.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A<T>(var t: T) {}
 class B<R>(val r: R) {}
 
diff --git a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForCollection.kt b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForCollection.kt
index fbb6d263184..ba4462fc97c 100644
--- a/compiler/testData/codegen/box/ranges/contains/evaluationOrderForCollection.kt
+++ b/compiler/testData/codegen/box/ranges/contains/evaluationOrderForCollection.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/contains/genericCharInRangeLiteral.kt b/compiler/testData/codegen/box/ranges/contains/genericCharInRangeLiteral.kt
index c30bf2246c9..810ed639224 100644
--- a/compiler/testData/codegen/box/ranges/contains/genericCharInRangeLiteral.kt
+++ b/compiler/testData/codegen/box/ranges/contains/genericCharInRangeLiteral.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Cell<T>(val value: T)
 
 fun box(): String =
diff --git a/compiler/testData/codegen/box/ranges/contains/inDoubleRangeLiteralVsComparableRangeLiteral.kt b/compiler/testData/codegen/box/ranges/contains/inDoubleRangeLiteralVsComparableRangeLiteral.kt
index 1c49a3de39b..d6f8fccf329 100644
--- a/compiler/testData/codegen/box/ranges/contains/inDoubleRangeLiteralVsComparableRangeLiteral.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inDoubleRangeLiteralVsComparableRangeLiteral.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 
 val DOUBLE_RANGE = 0.0 .. -0.0
diff --git a/compiler/testData/codegen/box/ranges/contains/inExtensionRange.kt b/compiler/testData/codegen/box/ranges/contains/inExtensionRange.kt
index 7ea5ffe071f..c0e7a7618fb 100644
--- a/compiler/testData/codegen/box/ranges/contains/inExtensionRange.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inExtensionRange.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
diff --git a/compiler/testData/codegen/box/ranges/contains/inRangeLiteralComposition.kt b/compiler/testData/codegen/box/ranges/contains/inRangeLiteralComposition.kt
index d450b197e41..31200589259 100644
--- a/compiler/testData/codegen/box/ranges/contains/inRangeLiteralComposition.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inRangeLiteralComposition.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/contains/inRangeWithImplicitReceiver.kt b/compiler/testData/codegen/box/ranges/contains/inRangeWithImplicitReceiver.kt
index ec9e1bd086d..1e3e3122ba0 100644
--- a/compiler/testData/codegen/box/ranges/contains/inRangeWithImplicitReceiver.kt
+++ b/compiler/testData/codegen/box/ranges/contains/inRangeWithImplicitReceiver.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
diff --git a/compiler/testData/codegen/box/ranges/contains/kt20106.kt b/compiler/testData/codegen/box/ranges/contains/kt20106.kt
index 00a2a76f508..52d5764705a 100644
--- a/compiler/testData/codegen/box/ranges/contains/kt20106.kt
+++ b/compiler/testData/codegen/box/ranges/contains/kt20106.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInDownToWithIndex.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInDownToWithIndex.kt
index 34502bbccf3..98c87b1dc81 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInDownToWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInDownToWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInIndicesWithIndex.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInIndicesWithIndex.kt
index 4dc3b140e83..7dd8a96ad9a 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInIndicesWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInIndicesWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInRangeToWithIndex.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInRangeToWithIndex.kt
index c5d38f4a980..3fe1c8fb9df 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInRangeToWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInRangeToWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInReversedWithIndex.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInReversedWithIndex.kt
index a2957d5c8b7..3f9c217af18 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInReversedWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInReversedWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInUntilWithIndex.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInUntilWithIndex.kt
index 15872a92fa2..081f66ac43a 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInUntilWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInUntilWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexNoIndexOrElementVar.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexNoIndexOrElementVar.kt
index 807059ba260..e78bc9473fc 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexNoIndexOrElementVar.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexNoIndexOrElementVar.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexNotDestructured.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexNotDestructured.kt
index 33f4568227d..7b4f47ecf94 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexNotDestructured.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexNotDestructured.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexReversed.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexReversed.kt
index 225825666b3..1bc3860a203 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexReversed.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexReversed.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexWithDestructuringInLoop.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexWithDestructuringInLoop.kt
index e4f3d6687a5..db09432b9fe 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexWithDestructuringInLoop.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexWithDestructuringInLoop.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexWithIndex.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexWithIndex.kt
index f9795a081a7..08c7ccb7ddc 100644
--- a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/forInWithIndexWithIndex.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/forInReversed/forInReversedCollectionIndices.kt b/compiler/testData/codegen/box/ranges/forInReversed/forInReversedCollectionIndices.kt
index 0a5508ceeed..b249c294630 100644
--- a/compiler/testData/codegen/box/ranges/forInReversed/forInReversedCollectionIndices.kt
+++ b/compiler/testData/codegen/box/ranges/forInReversed/forInReversedCollectionIndices.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/ranges/forIntRange.kt b/compiler/testData/codegen/box/ranges/forIntRange.kt
index 36e56ac7e79..451b1425479 100644
--- a/compiler/testData/codegen/box/ranges/forIntRange.kt
+++ b/compiler/testData/codegen/box/ranges/forIntRange.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfMaybeNullableWithNotNullLoopVariableFailFast.kt b/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfMaybeNullableWithNotNullLoopVariableFailFast.kt
index 160ea694c7c..4ef6f3c3afb 100644
--- a/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfMaybeNullableWithNotNullLoopVariableFailFast.kt
+++ b/compiler/testData/codegen/box/ranges/javaInterop/javaCollectionOfMaybeNullableWithNotNullLoopVariableFailFast.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 
 // FILE: box.kt
diff --git a/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaArrayOfMaybeNullableWithIndex.kt b/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaArrayOfMaybeNullableWithIndex.kt
index 2a044443ef7..e1e5fd27595 100644
--- a/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaArrayOfMaybeNullableWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaArrayOfMaybeNullableWithIndex.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 
 // FILE: box.kt
diff --git a/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaCollectionOfExplicitNullableWithIndex.kt b/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaCollectionOfExplicitNullableWithIndex.kt
index 185a5d92944..c43ec53f749 100644
--- a/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaCollectionOfExplicitNullableWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaCollectionOfExplicitNullableWithIndex.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // JVM_TARGET: 1.8
 
diff --git a/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaCollectionOfMaybeNullableWithIndex.kt b/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaCollectionOfMaybeNullableWithIndex.kt
index 5e674becc74..2362f7d5a0e 100644
--- a/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaCollectionOfMaybeNullableWithIndex.kt
+++ b/compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaCollectionOfMaybeNullableWithIndex.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: +StrictJavaNullabilityAssertions
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 
 // FILE: box.kt
diff --git a/compiler/testData/codegen/box/reflection/genericSignature/defaultImplsGenericSignature.kt b/compiler/testData/codegen/box/reflection/genericSignature/defaultImplsGenericSignature.kt
index 2e62a12956d..5dfa6b9e8c7 100644
--- a/compiler/testData/codegen/box/reflection/genericSignature/defaultImplsGenericSignature.kt
+++ b/compiler/testData/codegen/box/reflection/genericSignature/defaultImplsGenericSignature.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // FILE: J.java
diff --git a/compiler/testData/codegen/box/reflection/noReflectAtRuntime/propertyGetSetName.kt b/compiler/testData/codegen/box/reflection/noReflectAtRuntime/propertyGetSetName.kt
index ebfc2e17d53..f485e0554fe 100644
--- a/compiler/testData/codegen/box/reflection/noReflectAtRuntime/propertyGetSetName.kt
+++ b/compiler/testData/codegen/box/reflection/noReflectAtRuntime/propertyGetSetName.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 
 import kotlin.reflect.*
diff --git a/compiler/testData/codegen/box/regressions/kt1202.kt b/compiler/testData/codegen/box/regressions/kt1202.kt
index 5215b83f758..139bfc770bf 100644
--- a/compiler/testData/codegen/box/regressions/kt1202.kt
+++ b/compiler/testData/codegen/box/regressions/kt1202.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/regressions/kt1800.kt b/compiler/testData/codegen/box/regressions/kt1800.kt
index 2351f5e5ee8..80abfaa72ee 100644
--- a/compiler/testData/codegen/box/regressions/kt1800.kt
+++ b/compiler/testData/codegen/box/regressions/kt1800.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 //KT-1800 error/NonExistentClass generated on runtime
diff --git a/compiler/testData/codegen/box/regressions/kt274.kt b/compiler/testData/codegen/box/regressions/kt274.kt
index 5f46b38908c..2c8f56d34e5 100644
--- a/compiler/testData/codegen/box/regressions/kt274.kt
+++ b/compiler/testData/codegen/box/regressions/kt274.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/regressions/kt6434_2.kt b/compiler/testData/codegen/box/regressions/kt6434_2.kt
index d58fd8ee0a1..13343c8cd65 100644
--- a/compiler/testData/codegen/box/regressions/kt6434_2.kt
+++ b/compiler/testData/codegen/box/regressions/kt6434_2.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/reified/recursiveNonInlineableLambda.kt b/compiler/testData/codegen/box/reified/recursiveNonInlineableLambda.kt
index c9d1b276626..0962de0b01e 100644
--- a/compiler/testData/codegen/box/reified/recursiveNonInlineableLambda.kt
+++ b/compiler/testData/codegen/box/reified/recursiveNonInlineableLambda.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_RUNTIME
diff --git a/compiler/testData/codegen/box/smartCasts/genericSet.kt b/compiler/testData/codegen/box/smartCasts/genericSet.kt
index bcce1d6bdcc..48350f84309 100644
--- a/compiler/testData/codegen/box/smartCasts/genericSet.kt
+++ b/compiler/testData/codegen/box/smartCasts/genericSet.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Wrapper<T>(var x: T)
 
 inline fun <reified T> change(w: Wrapper<T>, x: Any?) {
diff --git a/compiler/testData/codegen/box/specialBuiltins/commonBridgesTarget.kt b/compiler/testData/codegen/box/specialBuiltins/commonBridgesTarget.kt
index 638ea3eca78..65ae4ba292a 100644
--- a/compiler/testData/codegen/box/specialBuiltins/commonBridgesTarget.kt
+++ b/compiler/testData/codegen/box/specialBuiltins/commonBridgesTarget.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND: NATIVE
 
diff --git a/compiler/testData/codegen/box/toArray/kt3177-toTypedArray.kt b/compiler/testData/codegen/box/toArray/kt3177-toTypedArray.kt
index 12e1326aaa3..effa002f45d 100644
--- a/compiler/testData/codegen/box/toArray/kt3177-toTypedArray.kt
+++ b/compiler/testData/codegen/box/toArray/kt3177-toTypedArray.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/toArray/toArrayShouldBePublic.kt b/compiler/testData/codegen/box/toArray/toArrayShouldBePublic.kt
index ebe10a9631a..78f1b92f895 100644
--- a/compiler/testData/codegen/box/toArray/toArrayShouldBePublic.kt
+++ b/compiler/testData/codegen/box/toArray/toArrayShouldBePublic.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/box/toArray/toArrayShouldBePublicWithJava.kt b/compiler/testData/codegen/box/toArray/toArrayShouldBePublicWithJava.kt
index 10ab19f3238..8e170ae174a 100644
--- a/compiler/testData/codegen/box/toArray/toArrayShouldBePublicWithJava.kt
+++ b/compiler/testData/codegen/box/toArray/toArrayShouldBePublicWithJava.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // IGNORE_LIGHT_ANALYSIS
diff --git a/compiler/testData/codegen/box/traits/kt2541.kt b/compiler/testData/codegen/box/traits/kt2541.kt
index 4246166cee0..5be4abf0272 100644
--- a/compiler/testData/codegen/box/traits/kt2541.kt
+++ b/compiler/testData/codegen/box/traits/kt2541.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface A<T, U> {
     fun foo(t: T, u: U) = "OK"
 }
diff --git a/compiler/testData/codegen/box/typeInfo/inheritance.kt b/compiler/testData/codegen/box/typeInfo/inheritance.kt
index 2e6e894d39a..f40166007db 100644
--- a/compiler/testData/codegen/box/typeInfo/inheritance.kt
+++ b/compiler/testData/codegen/box/typeInfo/inheritance.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A<T> () {
    fun plus(e: T) = B<T> (e)
 }
diff --git a/compiler/testData/codegen/box/typealias/genericTypeAliasConstructor.kt b/compiler/testData/codegen/box/typealias/genericTypeAliasConstructor.kt
index 602fd1c6b91..6dfe839c270 100644
--- a/compiler/testData/codegen/box/typealias/genericTypeAliasConstructor.kt
+++ b/compiler/testData/codegen/box/typealias/genericTypeAliasConstructor.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Cell<T>(val x: T)
 
 typealias StringCell = Cell<String>
diff --git a/compiler/testData/codegen/box/typealias/genericTypeAliasConstructor2.kt b/compiler/testData/codegen/box/typealias/genericTypeAliasConstructor2.kt
index c15ed78573d..845d35b4aed 100644
--- a/compiler/testData/codegen/box/typealias/genericTypeAliasConstructor2.kt
+++ b/compiler/testData/codegen/box/typealias/genericTypeAliasConstructor2.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Pair<T1, T2>(val x1: T1, val x2: T2)
 
 typealias ST<T> = Pair<String, T>
diff --git a/compiler/testData/codegen/box/vararg/spreadCopiesArray.kt b/compiler/testData/codegen/box/vararg/spreadCopiesArray.kt
index 87a70397789..d5b7fc1fe65 100644
--- a/compiler/testData/codegen/box/vararg/spreadCopiesArray.kt
+++ b/compiler/testData/codegen/box/vararg/spreadCopiesArray.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 
 import kotlin.test.*
diff --git a/compiler/testData/codegen/box/when/range.kt b/compiler/testData/codegen/box/when/range.kt
index f9bba4663fc..661765305ac 100644
--- a/compiler/testData/codegen/box/when/range.kt
+++ b/compiler/testData/codegen/box/when/range.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 fun isDigit(a: Int) : String {
     val aa = ArrayList<Int> ()
diff --git a/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt b/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt
index afd6f33ecc4..43d813a4417 100644
--- a/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt
+++ b/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt
@@ -49,7 +49,7 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
         body: BLOCK type=kotlin.Unit origin=WHILE_LOOP
           BLOCK type=kotlin.Unit origin=FOR_LOOP
             VAR FOR_LOOP_ITERATOR name:tmp_2 type:kotlin.collections.Iterator<kotlin.String> [val]
-              CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+              CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of kotlin.collections.List> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
                 $this: BLOCK type=kotlin.collections.List<kotlin.String> origin=ELVIS
                   VAR IR_TEMPORARY_VARIABLE name:tmp_3 type:kotlin.collections.List<kotlin.String>? [val]
                     GET_VAR 'ss: kotlin.collections.List<kotlin.String>? declared in <root>.test3' type=kotlin.collections.List<kotlin.String>? origin=null
@@ -78,7 +78,7 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
         body: BLOCK type=kotlin.Unit origin=WHILE_LOOP
           BLOCK type=kotlin.Unit origin=FOR_LOOP
             VAR FOR_LOOP_ITERATOR name:tmp_4 type:kotlin.collections.Iterator<kotlin.String> [val]
-              CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+              CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of kotlin.collections.List> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
                 $this: BLOCK type=kotlin.collections.List<kotlin.String> origin=ELVIS
                   VAR IR_TEMPORARY_VARIABLE name:tmp_5 type:kotlin.collections.List<kotlin.String>? [val]
                     GET_VAR 'ss: kotlin.collections.List<kotlin.String>? declared in <root>.test4' type=kotlin.collections.List<kotlin.String>? origin=null
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt
index 5a60ae532c1..f1ea73e00ba 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt
@@ -37,7 +37,7 @@ FILE fqName:<root> fileName:/withVarargViewedAsArray.kt
                     BLOCK_BODY
                       RETURN type=kotlin.Nothing from='local final fun <anonymous> (it: kotlin.Int): kotlin.Int declared in <root>.nsum'
                         CALL 'public abstract fun toInt (): kotlin.Int declared in kotlin.Number' type=kotlin.Int origin=null
-                          $this: CALL 'public final fun get (index: kotlin.Int): kotlin.Number [operator] declared in kotlin.Array' type=kotlin.Number origin=null
+                          $this: CALL 'public final fun get (index: kotlin.Int): T of kotlin.Array [operator] declared in kotlin.Array' type=kotlin.Number origin=null
                             $this: GET_VAR 'args: kotlin.Array<out kotlin.Number> [vararg] declared in <root>.nsum' type=kotlin.Array<out kotlin.Number> origin=null
                             index: GET_VAR 'it: kotlin.Int declared in <root>.nsum.<anonymous>' type=kotlin.Int origin=null
   FUN name:zap visibility:public modality:FINAL <> (b:kotlin.Array<out kotlin.String>, k:kotlin.Int) returnType:kotlin.Unit
diff --git a/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt b/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt
index c55ea704885..5e05bf9077e 100644
--- a/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt
+++ b/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt
@@ -15,7 +15,7 @@ FILE fqName:<root> fileName:/coercionToUnit.kt
   FUN name:test2 visibility:public modality:FINAL <> (mc:kotlin.collections.MutableCollection<kotlin.String>) returnType:kotlin.Unit
     VALUE_PARAMETER name:mc index:0 type:kotlin.collections.MutableCollection<kotlin.String>
     BLOCK_BODY
-      CALL 'public abstract fun add (element: kotlin.String): kotlin.Boolean declared in kotlin.collections.MutableCollection' type=kotlin.Boolean origin=null
+      CALL 'public abstract fun add (element: E of kotlin.collections.MutableCollection): kotlin.Boolean declared in kotlin.collections.MutableCollection' type=kotlin.Boolean origin=null
         $this: GET_VAR 'mc: kotlin.collections.MutableCollection<kotlin.String> declared in <root>.test2' type=kotlin.collections.MutableCollection<kotlin.String> origin=null
         element: CONST String type=kotlin.String value=""
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit
diff --git a/compiler/testData/ir/irText/expressions/for.fir.txt b/compiler/testData/ir/irText/expressions/for.fir.txt
index a6630c306ce..9f93a5b33af 100644
--- a/compiler/testData/ir/irText/expressions/for.fir.txt
+++ b/compiler/testData/ir/irText/expressions/for.fir.txt
@@ -4,7 +4,7 @@ FILE fqName:<root> fileName:/for.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp_0 type:kotlin.collections.Iterator<kotlin.String> [val]
-          CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+          CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of kotlin.collections.List> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
             $this: GET_VAR 'ss: kotlin.collections.List<kotlin.String> declared in <root>.testEmpty' type=kotlin.collections.List<kotlin.String> origin=null
         WHILE label=null origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
@@ -18,7 +18,7 @@ FILE fqName:<root> fileName:/for.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp_1 type:kotlin.collections.Iterator<kotlin.String> [val]
-          CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+          CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of kotlin.collections.List> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
             $this: GET_VAR 'ss: kotlin.collections.List<kotlin.String> declared in <root>.testIterable' type=kotlin.collections.List<kotlin.String> origin=null
         WHILE label=null origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
@@ -34,7 +34,7 @@ FILE fqName:<root> fileName:/for.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp_2 type:kotlin.collections.Iterator<kotlin.Pair<kotlin.Int, kotlin.String>> [val]
-          CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.Pair<kotlin.Int, kotlin.String>> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.Pair<kotlin.Int, kotlin.String>> origin=FOR_LOOP_ITERATOR
+          CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of kotlin.collections.List> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.Pair<kotlin.Int, kotlin.String>> origin=FOR_LOOP_ITERATOR
             $this: GET_VAR 'pp: kotlin.collections.List<kotlin.Pair<kotlin.Int, kotlin.String>> declared in <root>.testDestructuring' type=kotlin.collections.List<kotlin.Pair<kotlin.Int, kotlin.String>> origin=null
         WHILE label=null origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
@@ -44,10 +44,10 @@ FILE fqName:<root> fileName:/for.kt
               CALL 'public abstract fun next (): T of kotlin.collections.Iterator [operator] declared in kotlin.collections.Iterator' type=kotlin.Pair<kotlin.Int, kotlin.String> origin=FOR_LOOP_NEXT
                 $this: GET_VAR 'val tmp_2: kotlin.collections.Iterator<kotlin.Pair<kotlin.Int, kotlin.String>> [val] declared in <root>.testDestructuring' type=kotlin.collections.Iterator<kotlin.Pair<kotlin.Int, kotlin.String>> origin=null
             VAR name:i type:kotlin.Int [val]
-              CALL 'public final fun component1 (): kotlin.Int [operator] declared in kotlin.Pair' type=kotlin.Int origin=null
+              CALL 'public final fun component1 (): A of kotlin.Pair [operator] declared in kotlin.Pair' type=kotlin.Int origin=null
                 $this: GET_VAR 'val <destruct>: kotlin.Pair<kotlin.Int, kotlin.String> [val] declared in <root>.testDestructuring' type=kotlin.Pair<kotlin.Int, kotlin.String> origin=null
             VAR name:s type:kotlin.String [val]
-              CALL 'public final fun component2 (): kotlin.String [operator] declared in kotlin.Pair' type=kotlin.String origin=null
+              CALL 'public final fun component2 (): B of kotlin.Pair [operator] declared in kotlin.Pair' type=kotlin.String origin=null
                 $this: GET_VAR 'val <destruct>: kotlin.Pair<kotlin.Int, kotlin.String> [val] declared in <root>.testDestructuring' type=kotlin.Pair<kotlin.Int, kotlin.String> origin=null
             CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
               message: GET_VAR 'val i: kotlin.Int [val] declared in <root>.testDestructuring' type=kotlin.Int origin=null
diff --git a/compiler/testData/ir/irText/expressions/forWithBreakContinue.fir.txt b/compiler/testData/ir/irText/expressions/forWithBreakContinue.fir.txt
index 8d091ac4fed..96a0e57be53 100644
--- a/compiler/testData/ir/irText/expressions/forWithBreakContinue.fir.txt
+++ b/compiler/testData/ir/irText/expressions/forWithBreakContinue.fir.txt
@@ -4,7 +4,7 @@ FILE fqName:<root> fileName:/forWithBreakContinue.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp_0 type:kotlin.collections.Iterator<kotlin.String> [val]
-          CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+          CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of kotlin.collections.List> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
             $this: GET_VAR 'ss: kotlin.collections.List<kotlin.String> declared in <root>.testForBreak1' type=kotlin.collections.List<kotlin.String> origin=null
         WHILE label=null origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
@@ -19,7 +19,7 @@ FILE fqName:<root> fileName:/forWithBreakContinue.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp_1 type:kotlin.collections.Iterator<kotlin.String> [val]
-          CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+          CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of kotlin.collections.List> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
             $this: GET_VAR 'ss: kotlin.collections.List<kotlin.String> declared in <root>.testForBreak2' type=kotlin.collections.List<kotlin.String> origin=null
         WHILE label=OUTER origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
@@ -30,7 +30,7 @@ FILE fqName:<root> fileName:/forWithBreakContinue.kt
                 $this: GET_VAR 'val tmp_1: kotlin.collections.Iterator<kotlin.String> [val] declared in <root>.testForBreak2' type=kotlin.collections.Iterator<kotlin.String> origin=null
             BLOCK type=kotlin.Unit origin=FOR_LOOP
               VAR FOR_LOOP_ITERATOR name:tmp_2 type:kotlin.collections.Iterator<kotlin.String> [val]
-                CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+                CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of kotlin.collections.List> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
                   $this: GET_VAR 'ss: kotlin.collections.List<kotlin.String> declared in <root>.testForBreak2' type=kotlin.collections.List<kotlin.String> origin=null
               WHILE label=INNER origin=FOR_LOOP_INNER_WHILE
                 condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
@@ -48,7 +48,7 @@ FILE fqName:<root> fileName:/forWithBreakContinue.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp_3 type:kotlin.collections.Iterator<kotlin.String> [val]
-          CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+          CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of kotlin.collections.List> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
             $this: GET_VAR 'ss: kotlin.collections.List<kotlin.String> declared in <root>.testForContinue1' type=kotlin.collections.List<kotlin.String> origin=null
         WHILE label=null origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
@@ -63,7 +63,7 @@ FILE fqName:<root> fileName:/forWithBreakContinue.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp_4 type:kotlin.collections.Iterator<kotlin.String> [val]
-          CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+          CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of kotlin.collections.List> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
             $this: GET_VAR 'ss: kotlin.collections.List<kotlin.String> declared in <root>.testForContinue2' type=kotlin.collections.List<kotlin.String> origin=null
         WHILE label=OUTER origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
@@ -74,7 +74,7 @@ FILE fqName:<root> fileName:/forWithBreakContinue.kt
                 $this: GET_VAR 'val tmp_4: kotlin.collections.Iterator<kotlin.String> [val] declared in <root>.testForContinue2' type=kotlin.collections.Iterator<kotlin.String> origin=null
             BLOCK type=kotlin.Unit origin=FOR_LOOP
               VAR FOR_LOOP_ITERATOR name:tmp_5 type:kotlin.collections.Iterator<kotlin.String> [val]
-                CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+                CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of kotlin.collections.List> [operator] declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
                   $this: GET_VAR 'ss: kotlin.collections.List<kotlin.String> declared in <root>.testForContinue2' type=kotlin.collections.List<kotlin.String> origin=null
               WHILE label=INNER origin=FOR_LOOP_INNER_WHILE
                 condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
diff --git a/compiler/testData/ir/irText/expressions/funInterface/partialSam.fir.txt b/compiler/testData/ir/irText/expressions/funInterface/partialSam.fir.txt
index 62aa10040af..83fe2ee2d4b 100644
--- a/compiler/testData/ir/irText/expressions/funInterface/partialSam.fir.txt
+++ b/compiler/testData/ir/irText/expressions/funInterface/partialSam.fir.txt
@@ -33,11 +33,11 @@ FILE fqName:<root> fileName:/partialSam.kt
       VALUE_PARAMETER name:f2 index:1 type:<root>.Fn<kotlin.Int, kotlin.String>
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun runConversion (f1: <root>.Fn<kotlin.String, kotlin.Int>, f2: <root>.Fn<kotlin.Int, kotlin.String>): kotlin.Int declared in <root>.J'
-          CALL 'public abstract fun run (s: kotlin.String, i: kotlin.Int, t: kotlin.String): kotlin.Int declared in <root>.Fn' type=kotlin.Int origin=null
+          CALL 'public abstract fun run (s: kotlin.String, i: kotlin.Int, t: T of <root>.Fn): R of <root>.Fn declared in <root>.Fn' type=kotlin.Int origin=null
             $this: GET_VAR 'f1: <root>.Fn<kotlin.String, kotlin.Int> declared in <root>.J.runConversion' type=<root>.Fn<kotlin.String, kotlin.Int> origin=null
             s: CONST String type=kotlin.String value="Bar"
             i: CONST Int type=kotlin.Int value=1
-            t: CALL 'public abstract fun run (s: kotlin.String, i: kotlin.Int, t: kotlin.Int): kotlin.String declared in <root>.Fn' type=kotlin.String origin=null
+            t: CALL 'public abstract fun run (s: kotlin.String, i: kotlin.Int, t: T of <root>.Fn): R of <root>.Fn declared in <root>.Fn' type=kotlin.String origin=null
               $this: GET_VAR 'f2: <root>.Fn<kotlin.Int, kotlin.String> declared in <root>.J.runConversion' type=<root>.Fn<kotlin.Int, kotlin.String> origin=null
               s: CONST String type=kotlin.String value="Foo"
               i: CONST Int type=kotlin.Int value=42
diff --git a/compiler/testData/ir/irText/expressions/genericPropertyRef.fir.txt b/compiler/testData/ir/irText/expressions/genericPropertyRef.fir.txt
index 900caba5573..4690254cb05 100644
--- a/compiler/testData/ir/irText/expressions/genericPropertyRef.fir.txt
+++ b/compiler/testData/ir/irText/expressions/genericPropertyRef.fir.txt
@@ -83,7 +83,7 @@ FILE fqName:<root> fileName:/genericPropertyRef.kt
     FIELD PROPERTY_DELEGATE name:additionalValue$delegate type:<root>.DVal visibility:private [final,static]
       EXPRESSION_BODY
         CONSTRUCTOR_CALL 'public constructor <init> (kmember: kotlin.Any) [primary] declared in <root>.DVal' type=<root>.DVal origin=null
-          kmember: PROPERTY_REFERENCE 'public final value: T of <root>.<get-additionalValue> [var]' field=null getter='public final fun <get-value> (): T of <root>.<get-additionalValue> declared in <root>.Value' setter='public final fun <set-value> (<set-?>: T of <uninitialized parent>): kotlin.Unit declared in <root>.Value' type=kotlin.reflect.KMutableProperty1<<root>.Value<T of <root>.<get-additionalValue>>, T of <root>.<get-additionalValue>> origin=null
+          kmember: PROPERTY_REFERENCE 'public final value: T of <root>.Value [var]' field='FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Value visibility:private' getter='public final fun <get-value> (): T of <root>.Value declared in <root>.Value' setter='public final fun <set-value> (<set-?>: T of <root>.Value): kotlin.Unit declared in <root>.Value' type=kotlin.reflect.KMutableProperty1<<root>.Value<T of <root>.<get-additionalValue>>, T of <root>.<get-additionalValue>> origin=null
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-additionalValue> visibility:public modality:FINAL <T> ($receiver:<root>.Value<T of <root>.<get-additionalValue>>) returnType:kotlin.Int
       correspondingProperty: PROPERTY name:additionalValue visibility:public modality:FINAL [delegated,val]
       TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
diff --git a/compiler/testData/ir/irText/expressions/in.fir.txt b/compiler/testData/ir/irText/expressions/in.fir.txt
index 18e8a8bc2ee..f6ddc9f0852 100644
--- a/compiler/testData/ir/irText/expressions/in.fir.txt
+++ b/compiler/testData/ir/irText/expressions/in.fir.txt
@@ -4,7 +4,7 @@ FILE fqName:<root> fileName:/in.kt
     VALUE_PARAMETER name:x index:1 type:kotlin.collections.Collection<kotlin.Any>
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test1 (a: kotlin.Any, x: kotlin.collections.Collection<kotlin.Any>): kotlin.Boolean declared in <root>'
-        CALL 'public abstract fun contains (element: kotlin.Any): kotlin.Boolean [operator] declared in kotlin.collections.Collection' type=kotlin.Boolean origin=null
+        CALL 'public abstract fun contains (element: E of kotlin.collections.Collection): kotlin.Boolean [operator] declared in kotlin.collections.Collection' type=kotlin.Boolean origin=null
           $this: GET_VAR 'x: kotlin.collections.Collection<kotlin.Any> declared in <root>.test1' type=kotlin.collections.Collection<kotlin.Any> origin=null
           element: GET_VAR 'a: kotlin.Any declared in <root>.test1' type=kotlin.Any origin=null
   FUN name:test2 visibility:public modality:FINAL <> (a:kotlin.Any, x:kotlin.collections.Collection<kotlin.Any>) returnType:kotlin.Boolean
@@ -13,7 +13,7 @@ FILE fqName:<root> fileName:/in.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test2 (a: kotlin.Any, x: kotlin.collections.Collection<kotlin.Any>): kotlin.Boolean declared in <root>'
         CALL 'public final fun not (): kotlin.Boolean [operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=null
-          $this: CALL 'public abstract fun contains (element: kotlin.Any): kotlin.Boolean [operator] declared in kotlin.collections.Collection' type=kotlin.Boolean origin=null
+          $this: CALL 'public abstract fun contains (element: E of kotlin.collections.Collection): kotlin.Boolean [operator] declared in kotlin.collections.Collection' type=kotlin.Boolean origin=null
             $this: GET_VAR 'x: kotlin.collections.Collection<kotlin.Any> declared in <root>.test2' type=kotlin.collections.Collection<kotlin.Any> origin=null
             element: GET_VAR 'a: kotlin.Any declared in <root>.test2' type=kotlin.Any origin=null
   FUN name:test3 visibility:public modality:FINAL <T> (a:T of <root>.test3, x:kotlin.collections.Collection<T of <root>.test3>) returnType:kotlin.Boolean
@@ -22,7 +22,7 @@ FILE fqName:<root> fileName:/in.kt
     VALUE_PARAMETER name:x index:1 type:kotlin.collections.Collection<T of <root>.test3>
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test3 <T> (a: T of <root>.test3, x: kotlin.collections.Collection<T of <root>.test3>): kotlin.Boolean declared in <root>'
-        CALL 'public abstract fun contains (element: T of <root>.test3): kotlin.Boolean [operator] declared in kotlin.collections.Collection' type=kotlin.Boolean origin=null
+        CALL 'public abstract fun contains (element: E of kotlin.collections.Collection): kotlin.Boolean [operator] declared in kotlin.collections.Collection' type=kotlin.Boolean origin=null
           $this: GET_VAR 'x: kotlin.collections.Collection<T of <root>.test3> declared in <root>.test3' type=kotlin.collections.Collection<T of <root>.test3> origin=null
           element: GET_VAR 'a: T of <root>.test3 declared in <root>.test3' type=T of <root>.test3 origin=null
   FUN name:test4 visibility:public modality:FINAL <T> (a:T of <root>.test4, x:kotlin.collections.Collection<T of <root>.test4>) returnType:kotlin.Boolean
@@ -32,6 +32,6 @@ FILE fqName:<root> fileName:/in.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test4 <T> (a: T of <root>.test4, x: kotlin.collections.Collection<T of <root>.test4>): kotlin.Boolean declared in <root>'
         CALL 'public final fun not (): kotlin.Boolean [operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=null
-          $this: CALL 'public abstract fun contains (element: T of <root>.test4): kotlin.Boolean [operator] declared in kotlin.collections.Collection' type=kotlin.Boolean origin=null
+          $this: CALL 'public abstract fun contains (element: E of kotlin.collections.Collection): kotlin.Boolean [operator] declared in kotlin.collections.Collection' type=kotlin.Boolean origin=null
             $this: GET_VAR 'x: kotlin.collections.Collection<T of <root>.test4> declared in <root>.test4' type=kotlin.collections.Collection<T of <root>.test4> origin=null
             element: GET_VAR 'a: T of <root>.test4 declared in <root>.test4' type=T of <root>.test4 origin=null
diff --git a/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.fir.txt b/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.fir.txt
index 79c516fb06a..f515d163629 100644
--- a/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.fir.txt
+++ b/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.fir.txt
@@ -34,6 +34,6 @@ FILE fqName:<root> fileName:/specializedTypeAliasConstructorCall.kt
   FUN name:test visibility:public modality:FINAL <> () returnType:<root>.Cell<kotlin.Int>
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test (): <root>.Cell<kotlin.Int> declared in <root>'
-        CONSTRUCTOR_CALL 'public constructor <init> (value: kotlin.Int) declared in <root>.Cell' type=<root>.Cell<kotlin.Int> origin=null
+        CONSTRUCTOR_CALL 'public constructor <init> (value: T of <root>.Cell) [primary] declared in <root>.Cell' type=<root>.Cell<kotlin.Int> origin=null
           <class: T>: <none>
           value: CONST Int type=kotlin.Int value=42
diff --git a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.fir.txt b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.fir.txt
index 6dfe86e06fc..437cb507f64 100644
--- a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.fir.txt
+++ b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.fir.txt
@@ -78,7 +78,7 @@ FILE fqName:<root> fileName:/thisOfGenericOuterClass.kt
               FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:private [final]
                 EXPRESSION_BODY
                   CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
-                    $this: CALL 'public final fun <get-x> (): kotlin.Int declared in <root>.Outer' type=kotlin.Int origin=GET_PROPERTY
+                    $this: CALL 'public final fun <get-x> (): T of <root>.Outer declared in <root>.Outer' type=kotlin.Int origin=GET_PROPERTY
                       $this: GET_VAR '<this>: <root>.Outer<kotlin.Int> declared in <root>.test' type=<root>.Outer<kotlin.Int> origin=null
                     other: CALL 'public final fun <get-y> (): kotlin.Int declared in <root>.Outer.Inner' type=kotlin.Int origin=GET_PROPERTY
                       $this: GET_VAR '<this>: <uninitialized parent>.<anonymous> declared in <no parent>.<anonymous>' type=<uninitialized parent>.<anonymous> origin=null
diff --git a/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.fir.txt b/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.fir.txt
index 0bf10500db4..9d9c94e0e80 100644
--- a/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.fir.txt
+++ b/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.fir.txt
@@ -34,10 +34,10 @@ FILE fqName:<root> fileName:/typeAliasCtorForGenericClass.kt
   FUN name:bar visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
       VAR name:b type:<root>.A<kotlin.Int> [val]
-        CONSTRUCTOR_CALL 'public constructor <init> (q: X of <uninitialized parent>) declared in <root>.A' type=<root>.A<kotlin.Int> origin=null
+        CONSTRUCTOR_CALL 'public constructor <init> (q: Q of <root>.A) [primary] declared in <root>.A' type=<root>.A<kotlin.Int> origin=null
           <class: Q>: kotlin.Int
           q: CONST Int type=kotlin.Int value=2
       VAR name:b2 type:<root>.A<<root>.A<kotlin.Int>> [val]
-        CONSTRUCTOR_CALL 'public constructor <init> (q: <root>.A<T of <uninitialized parent>>) declared in <root>.A' type=<root>.A<<root>.A<kotlin.Int>> origin=null
+        CONSTRUCTOR_CALL 'public constructor <init> (q: Q of <root>.A) [primary] declared in <root>.A' type=<root>.A<<root>.A<kotlin.Int>> origin=null
           <class: Q>: kotlin.Int
           q: GET_VAR 'val b: <root>.A<kotlin.Int> [val] declared in <root>.bar' type=<root>.A<kotlin.Int> origin=null
diff --git a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.txt b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.txt
index b767c77b5bb..274f249f8e9 100644
--- a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.txt
+++ b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.txt
@@ -80,16 +80,16 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
               BLOCK_BODY
                 VAR name:channel type:<root>.ChannelCoroutine<kotlin.Any> [val]
                   TYPE_OP type=<root>.ChannelCoroutine<kotlin.Any> origin=CAST typeOperand=<root>.ChannelCoroutine<kotlin.Any>
-                    CALL 'public abstract fun <get-channel> (): <root>.SendChannel<kotlin.Any> declared in <root>.ProducerScope' type=<root>.SendChannel<kotlin.Any> origin=GET_PROPERTY
+                    CALL 'public abstract fun <get-channel> (): <root>.SendChannel<E of <root>.ProducerScope> declared in <root>.ProducerScope' type=<root>.SendChannel<kotlin.Any> origin=GET_PROPERTY
                       $this: GET_VAR '<this>: <root>.ProducerScope<kotlin.Any> declared in special.<anonymous>' type=<root>.ProducerScope<kotlin.Any> origin=null
-                CALL 'public abstract fun collect (collector: <root>.FlowCollector<kotlin.Any?>): kotlin.Unit [suspend] declared in <root>.Flow' type=kotlin.Unit origin=null
+                CALL 'public abstract fun collect (collector: <root>.FlowCollector<T of <root>.Flow>): kotlin.Unit [suspend] declared in <root>.Flow' type=kotlin.Unit origin=null
                   $this: GET_VAR 'flow: <root>.Flow<*> declared in <root>.asFairChannel' type=<root>.Flow<*> origin=null
                   collector: FUN_EXPR type=kotlin.Function1<kotlin.Any?, kotlin.Unit> origin=LAMBDA
                     FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (value:kotlin.Any?) returnType:kotlin.Unit
                       VALUE_PARAMETER name:value index:0 type:kotlin.Any?
                       BLOCK_BODY
                         RETURN type=kotlin.Nothing from='local final fun <anonymous> (value: kotlin.Any?): kotlin.Unit declared in <root>.asFairChannel.<anonymous>'
-                          CALL 'public final fun sendFair (element: kotlin.Any): kotlin.Unit [suspend] declared in <root>.ChannelCoroutine' type=kotlin.Unit origin=null
+                          CALL 'public final fun sendFair (element: E of <root>.ChannelCoroutine): kotlin.Unit [suspend] declared in <root>.ChannelCoroutine' type=kotlin.Unit origin=null
                             $this: GET_VAR 'val channel: <root>.ChannelCoroutine<kotlin.Any> [val] declared in <root>.asFairChannel.<anonymous>' type=<root>.ChannelCoroutine<kotlin.Any> origin=null
                             element: BLOCK type=kotlin.Any origin=ELVIS
                               VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Any? [val]
@@ -116,15 +116,15 @@ FILE fqName:<root> fileName:/castsInsideCoroutineInference.kt
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.ProducerScope<kotlin.Any>) returnType:kotlin.Unit
               $receiver: VALUE_PARAMETER name:<this> type:<root>.ProducerScope<kotlin.Any>
               BLOCK_BODY
-                CALL 'public abstract fun collect (collector: <root>.FlowCollector<kotlin.Any?>): kotlin.Unit [suspend] declared in <root>.Flow' type=kotlin.Unit origin=null
+                CALL 'public abstract fun collect (collector: <root>.FlowCollector<T of <root>.Flow>): kotlin.Unit [suspend] declared in <root>.Flow' type=kotlin.Unit origin=null
                   $this: GET_VAR 'flow: <root>.Flow<*> declared in <root>.asChannel' type=<root>.Flow<*> origin=null
                   collector: FUN_EXPR type=kotlin.Function1<kotlin.Any?, kotlin.Unit> origin=LAMBDA
                     FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (value:kotlin.Any?) returnType:kotlin.Unit
                       VALUE_PARAMETER name:value index:0 type:kotlin.Any?
                       BLOCK_BODY
                         RETURN type=kotlin.Nothing from='local final fun <anonymous> (value: kotlin.Any?): kotlin.Unit declared in <root>.asChannel.<anonymous>'
-                          CALL 'public abstract fun send (e: kotlin.Any): kotlin.Unit [suspend] declared in <root>.SendChannel' type=kotlin.Unit origin=null
-                            $this: CALL 'public abstract fun <get-channel> (): <root>.SendChannel<kotlin.Any> declared in <root>.ProducerScope' type=<root>.SendChannel<kotlin.Any> origin=GET_PROPERTY
+                          CALL 'public abstract fun send (e: E of <root>.SendChannel): kotlin.Unit [suspend] declared in <root>.SendChannel' type=kotlin.Unit origin=null
+                            $this: CALL 'public abstract fun <get-channel> (): <root>.SendChannel<E of <root>.ProducerScope> declared in <root>.ProducerScope' type=<root>.SendChannel<kotlin.Any> origin=GET_PROPERTY
                               $this: GET_VAR '<this>: <root>.ProducerScope<kotlin.Any> declared in special.<anonymous>' type=<root>.ProducerScope<kotlin.Any> origin=null
                             e: BLOCK type=kotlin.Any origin=ELVIS
                               VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.Any? [val]
diff --git a/compiler/testData/ir/irText/types/genericPropertyReferenceType.fir.txt b/compiler/testData/ir/irText/types/genericPropertyReferenceType.fir.txt
index bd1f16cfd26..28a473b5cd0 100644
--- a/compiler/testData/ir/irText/types/genericPropertyReferenceType.fir.txt
+++ b/compiler/testData/ir/irText/types/genericPropertyReferenceType.fir.txt
@@ -46,7 +46,7 @@ FILE fqName:<root> fileName:/genericPropertyReferenceType.kt
       $receiver: VALUE_PARAMETER name:<this> type:<root>.C<T of <root>.<get-y>>
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-y> <T> (): T of <root>.<get-y> declared in <root>'
-          CALL 'public final fun <get-x> (): T of <root>.<get-y> declared in <root>.C' type=T of <root>.<get-y> origin=GET_PROPERTY
+          CALL 'public final fun <get-x> (): T of <root>.C declared in <root>.C' type=T of <root>.<get-y> origin=GET_PROPERTY
             $this: ERROR_CALL 'Unresolved reference: this@R|/y|' type=<root>.C<T of <root>.<get-y>>
     FUN name:<set-y> visibility:public modality:FINAL <T> ($receiver:<root>.C<T of <root>.<get-y>>, v:T of <root>.<get-y>) returnType:kotlin.Unit
       correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [var]
@@ -54,7 +54,9 @@ FILE fqName:<root> fileName:/genericPropertyReferenceType.kt
       $receiver: VALUE_PARAMETER name:<this> type:<root>.C<T of <root>.<get-y>>
       VALUE_PARAMETER name:v index:0 type:T of <root>.<get-y>
       BLOCK_BODY
-        ERROR_CALL 'Unresolved reference: R|FakeOverride</C.x: R|T|>|' type=IrErrorType
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.C visibility:private' type=kotlin.Unit origin=null
+          receiver: ERROR_CALL 'Unresolved reference: this@R|/y|' type=<root>.C<T of <root>.<get-y>>
+          value: GET_VAR 'v: T of <root>.<get-y> declared in <root>.<set-y>' type=T of <root>.<get-y> origin=null
   FUN name:use visibility:public modality:FINAL <> (p:kotlin.reflect.KMutableProperty<kotlin.String>) returnType:kotlin.Unit
     VALUE_PARAMETER name:p index:0 type:kotlin.reflect.KMutableProperty<kotlin.String>
     BLOCK_BODY
diff --git a/compiler/testData/ir/irText/types/intersectionType1_NI.fir.txt b/compiler/testData/ir/irText/types/intersectionType1_NI.fir.txt
index b997c328d3a..1e85b86ae95 100644
--- a/compiler/testData/ir/irText/types/intersectionType1_NI.fir.txt
+++ b/compiler/testData/ir/irText/types/intersectionType1_NI.fir.txt
@@ -34,7 +34,7 @@ FILE fqName:<root> fileName:/intersectionType1_NI.kt
       RETURN type=kotlin.Nothing from='public final fun foo <T> (a: kotlin.Array<<root>.In<T of <root>.foo>>, b: kotlin.Array<<root>.In<kotlin.String>>): kotlin.Boolean declared in <root>'
         CALL 'public final fun ofType <K> (y: kotlin.Any?): kotlin.Boolean [inline] declared in <root>' type=kotlin.Boolean origin=null
           <K>: T of <root>.foo
-          $receiver: CALL 'public final fun get (index: kotlin.Int): <root>.In<T of <root>.foo> [operator] declared in kotlin.Array' type=<root>.In<T of <root>.foo> origin=null
+          $receiver: CALL 'public final fun get (index: kotlin.Int): T of kotlin.Array [operator] declared in kotlin.Array' type=<root>.In<T of <root>.foo> origin=null
             $this: CALL 'public final fun select <S> (x: S of <root>.select, y: S of <root>.select): S of <root>.select declared in <root>' type=kotlin.Array<out <root>.In<T of <root>.foo>> origin=null
               <S>: kotlin.Array<out <root>.In<T of <root>.foo>>
               x: GET_VAR 'a: kotlin.Array<<root>.In<T of <root>.foo>> declared in <root>.foo' type=kotlin.Array<<root>.In<T of <root>.foo>> origin=null
diff --git a/compiler/testData/ir/irText/types/intersectionType1_OI.fir.txt b/compiler/testData/ir/irText/types/intersectionType1_OI.fir.txt
index c47ac02a61f..6daf5791e5a 100644
--- a/compiler/testData/ir/irText/types/intersectionType1_OI.fir.txt
+++ b/compiler/testData/ir/irText/types/intersectionType1_OI.fir.txt
@@ -34,7 +34,7 @@ FILE fqName:<root> fileName:/intersectionType1_OI.kt
       RETURN type=kotlin.Nothing from='public final fun foo <T> (a: kotlin.Array<<root>.In<T of <root>.foo>>, b: kotlin.Array<<root>.In<kotlin.String>>): kotlin.Boolean declared in <root>'
         CALL 'public final fun ofType <K> (y: kotlin.Any?): kotlin.Boolean [inline] declared in <root>' type=kotlin.Boolean origin=null
           <K>: T of <root>.foo
-          $receiver: CALL 'public final fun get (index: kotlin.Int): <root>.In<T of <root>.foo> [operator] declared in kotlin.Array' type=<root>.In<T of <root>.foo> origin=null
+          $receiver: CALL 'public final fun get (index: kotlin.Int): T of kotlin.Array [operator] declared in kotlin.Array' type=<root>.In<T of <root>.foo> origin=null
             $this: CALL 'public final fun select <S> (x: S of <root>.select, y: S of <root>.select): S of <root>.select declared in <root>' type=kotlin.Array<out <root>.In<T of <root>.foo>> origin=null
               <S>: kotlin.Array<out <root>.In<T of <root>.foo>>
               x: GET_VAR 'a: kotlin.Array<<root>.In<T of <root>.foo>> declared in <root>.foo' type=kotlin.Array<<root>.In<T of <root>.foo>> origin=null
diff --git a/compiler/testData/ir/irText/types/localVariableOfIntersectionType_NI.fir.txt b/compiler/testData/ir/irText/types/localVariableOfIntersectionType_NI.fir.txt
index 9b301506207..c46e69a5cbb 100644
--- a/compiler/testData/ir/irText/types/localVariableOfIntersectionType_NI.fir.txt
+++ b/compiler/testData/ir/irText/types/localVariableOfIntersectionType_NI.fir.txt
@@ -95,21 +95,21 @@ FILE fqName:<root> fileName:/localVariableOfIntersectionType_NI.kt
     VALUE_PARAMETER name:z index:2 type:<root>.Z
     BLOCK_BODY
       CALL 'public abstract fun foo (): kotlin.Unit declared in <root>.IA' type=kotlin.Unit origin=null
-        $this: CALL 'public abstract fun <get-t> (): <root>.IA declared in <root>.Inv' type=<root>.IA origin=GET_PROPERTY
+        $this: CALL 'public abstract fun <get-t> (): T of <root>.Inv declared in <root>.Inv' type=<root>.IA origin=GET_PROPERTY
           $this: CALL 'public abstract fun create <T> (x: <root>.In<T of <root>.Z.create>, y: <root>.In<T of <root>.Z.create>): <root>.Inv<T of <root>.Z.create> declared in <root>.Z' type=<root>.Inv<<root>.IA> origin=null
             <T>: <root>.IA
             $this: GET_VAR 'z: <root>.Z declared in <root>.test' type=<root>.Z origin=null
             x: GET_VAR 'a: <root>.In<<root>.IA> declared in <root>.test' type=<root>.In<<root>.IA> origin=null
             y: GET_VAR 'b: <root>.In<<root>.IB> declared in <root>.test' type=<root>.In<<root>.IB> origin=null
       CALL 'public abstract fun bar (): kotlin.Unit declared in <root>.IB' type=kotlin.Unit origin=null
-        $this: CALL 'public abstract fun <get-t> (): <root>.IA declared in <root>.Inv' type=<root>.IA origin=GET_PROPERTY
+        $this: CALL 'public abstract fun <get-t> (): T of <root>.Inv declared in <root>.Inv' type=<root>.IA origin=GET_PROPERTY
           $this: CALL 'public abstract fun create <T> (x: <root>.In<T of <root>.Z.create>, y: <root>.In<T of <root>.Z.create>): <root>.Inv<T of <root>.Z.create> declared in <root>.Z' type=<root>.Inv<<root>.IA> origin=null
             <T>: <root>.IA
             $this: GET_VAR 'z: <root>.Z declared in <root>.test' type=<root>.Z origin=null
             x: GET_VAR 'a: <root>.In<<root>.IA> declared in <root>.test' type=<root>.In<<root>.IA> origin=null
             y: GET_VAR 'b: <root>.In<<root>.IB> declared in <root>.test' type=<root>.In<<root>.IB> origin=null
       VAR name:t type:<root>.IA [val]
-        CALL 'public abstract fun <get-t> (): <root>.IA declared in <root>.Inv' type=<root>.IA origin=GET_PROPERTY
+        CALL 'public abstract fun <get-t> (): T of <root>.Inv declared in <root>.Inv' type=<root>.IA origin=GET_PROPERTY
           $this: CALL 'public abstract fun create <T> (x: <root>.In<T of <root>.Z.create>, y: <root>.In<T of <root>.Z.create>): <root>.Inv<T of <root>.Z.create> declared in <root>.Z' type=<root>.Inv<<root>.IA> origin=null
             <T>: <root>.IA
             $this: GET_VAR 'z: <root>.Z declared in <root>.test' type=<root>.Z origin=null
diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.fir.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.fir.txt
index a905857de83..c7e1e45c9d7 100644
--- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.fir.txt
+++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.fir.txt
@@ -133,10 +133,10 @@ FILE fqName:<root> fileName:/enhancedNullabilityInDestructuringAssignment.kt
       VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:<root>.Q<kotlin.String, kotlin.String?>? [val]
         CALL 'public open fun notNullComponents (): <root>.Q<kotlin.String, kotlin.String?>? declared in <root>.J' type=<root>.Q<kotlin.String, kotlin.String?>? origin=null
       VAR name:x type:kotlin.String [val]
-        CALL 'public final fun component1 (): kotlin.String [operator] declared in <root>.Q' type=kotlin.String origin=null
+        CALL 'public final fun component1 (): T1 of <root>.Q [operator] declared in <root>.Q' type=kotlin.String origin=null
           $this: GET_VAR 'val tmp_1: <root>.Q<kotlin.String, kotlin.String?>? [val] declared in <root>.test2' type=<root>.Q<kotlin.String, kotlin.String?>? origin=null
       VAR name:y type:kotlin.String? [val]
-        CALL 'public final fun component2 (): kotlin.String? [operator] declared in <root>.Q' type=kotlin.String? origin=null
+        CALL 'public final fun component2 (): T2 of <root>.Q [operator] declared in <root>.Q' type=kotlin.String? origin=null
           $this: GET_VAR 'val tmp_1: <root>.Q<kotlin.String, kotlin.String?>? [val] declared in <root>.test2' type=<root>.Q<kotlin.String, kotlin.String?>? origin=null
       CALL 'public final fun use (x: kotlin.Any, y: kotlin.Any): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
         x: GET_VAR 'val x: kotlin.String [val] declared in <root>.test2' type=kotlin.String origin=null
@@ -146,10 +146,10 @@ FILE fqName:<root> fileName:/enhancedNullabilityInDestructuringAssignment.kt
       VAR name:tmp type:<root>.Q<kotlin.String, kotlin.String?>? [val]
         CALL 'public open fun notNullComponents (): <root>.Q<kotlin.String, kotlin.String?>? declared in <root>.J' type=<root>.Q<kotlin.String, kotlin.String?>? origin=null
       VAR name:x type:kotlin.String [val]
-        CALL 'public final fun component1 (): kotlin.String [operator] declared in <root>.Q' type=kotlin.String origin=null
+        CALL 'public final fun component1 (): T1 of <root>.Q [operator] declared in <root>.Q' type=kotlin.String origin=null
           $this: GET_VAR 'val tmp: <root>.Q<kotlin.String, kotlin.String?>? [val] declared in <root>.test2Desugared' type=<root>.Q<kotlin.String, kotlin.String?>? origin=null
       VAR name:y type:kotlin.String? [val]
-        CALL 'public final fun component2 (): kotlin.String? [operator] declared in <root>.Q' type=kotlin.String? origin=null
+        CALL 'public final fun component2 (): T2 of <root>.Q [operator] declared in <root>.Q' type=kotlin.String? origin=null
           $this: GET_VAR 'val tmp: <root>.Q<kotlin.String, kotlin.String?>? [val] declared in <root>.test2Desugared' type=<root>.Q<kotlin.String, kotlin.String?>? origin=null
       CALL 'public final fun use (x: kotlin.Any, y: kotlin.Any): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
         x: GET_VAR 'val x: kotlin.String [val] declared in <root>.test2Desugared' type=kotlin.String origin=null
@@ -159,10 +159,10 @@ FILE fqName:<root> fileName:/enhancedNullabilityInDestructuringAssignment.kt
       VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:<root>.Q<kotlin.String, kotlin.String?> [val]
         CALL 'public open fun notNullQAndComponents (): <root>.Q<kotlin.String, kotlin.String?> declared in <root>.J' type=<root>.Q<kotlin.String, kotlin.String?> origin=null
       VAR name:x type:kotlin.String [val]
-        CALL 'public final fun component1 (): kotlin.String [operator] declared in <root>.Q' type=kotlin.String origin=null
+        CALL 'public final fun component1 (): T1 of <root>.Q [operator] declared in <root>.Q' type=kotlin.String origin=null
           $this: GET_VAR 'val tmp_2: <root>.Q<kotlin.String, kotlin.String?> [val] declared in <root>.test3' type=<root>.Q<kotlin.String, kotlin.String?> origin=null
       VAR name:y type:kotlin.String? [val]
-        CALL 'public final fun component2 (): kotlin.String? [operator] declared in <root>.Q' type=kotlin.String? origin=null
+        CALL 'public final fun component2 (): T2 of <root>.Q [operator] declared in <root>.Q' type=kotlin.String? origin=null
           $this: GET_VAR 'val tmp_2: <root>.Q<kotlin.String, kotlin.String?> [val] declared in <root>.test3' type=<root>.Q<kotlin.String, kotlin.String?> origin=null
       CALL 'public final fun use (x: kotlin.Any, y: kotlin.Any): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
         x: GET_VAR 'val x: kotlin.String [val] declared in <root>.test3' type=kotlin.String origin=null
@@ -179,7 +179,7 @@ FILE fqName:<root> fileName:/enhancedNullabilityInDestructuringAssignment.kt
         CALL 'public final fun component1 (): kotlin.Int [operator] declared in kotlin.collections.IndexedValue' type=kotlin.Int origin=null
           $this: GET_VAR 'val tmp_3: kotlin.collections.IndexedValue<<root>.P?> [val] declared in <root>.test4' type=kotlin.collections.IndexedValue<<root>.P?> origin=null
       VAR name:y type:<root>.P? [val]
-        CALL 'public final fun component2 (): <root>.P? [operator] declared in kotlin.collections.IndexedValue' type=<root>.P? origin=null
+        CALL 'public final fun component2 (): T of kotlin.collections.IndexedValue [operator] declared in kotlin.collections.IndexedValue' type=<root>.P? origin=null
           $this: GET_VAR 'val tmp_3: kotlin.collections.IndexedValue<<root>.P?> [val] declared in <root>.test4' type=kotlin.collections.IndexedValue<<root>.P?> origin=null
       CALL 'public final fun use (x: kotlin.Any, y: kotlin.Any): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
         x: GET_VAR 'val x: kotlin.Int [val] declared in <root>.test4' type=kotlin.Int origin=null
diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.txt
index 695ae2cc724..8154165d741 100644
--- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.txt
+++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.txt
@@ -6,7 +6,7 @@ FILE fqName:<root> fileName:/enhancedNullabilityInForLoop.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp_0 type:kotlin.collections.MutableIterator<<root>.P?> [val]
-          CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator<<root>.P?> [operator] declared in kotlin.collections.MutableList' type=kotlin.collections.MutableIterator<<root>.P?> origin=FOR_LOOP_ITERATOR
+          CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator<E of kotlin.collections.MutableList> [operator] declared in kotlin.collections.MutableList' type=kotlin.collections.MutableIterator<<root>.P?> origin=FOR_LOOP_ITERATOR
             $this: CALL 'public open fun listOfNotNull (): kotlin.collections.List<<root>.P?>? declared in <root>.J' type=kotlin.collections.List<<root>.P?>? origin=null
         WHILE label=null origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
@@ -19,7 +19,7 @@ FILE fqName:<root> fileName:/enhancedNullabilityInForLoop.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp_1 type:kotlin.collections.MutableIterator<<root>.P?> [val]
-          CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator<<root>.P?> [operator] declared in kotlin.collections.MutableList' type=kotlin.collections.MutableIterator<<root>.P?> origin=FOR_LOOP_ITERATOR
+          CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator<E of kotlin.collections.MutableList> [operator] declared in kotlin.collections.MutableList' type=kotlin.collections.MutableIterator<<root>.P?> origin=FOR_LOOP_ITERATOR
             $this: CALL 'public open fun listOfNotNull (): kotlin.collections.List<<root>.P?>? declared in <root>.J' type=kotlin.collections.List<<root>.P?>? origin=null
         WHILE label=null origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
@@ -37,7 +37,7 @@ FILE fqName:<root> fileName:/enhancedNullabilityInForLoop.kt
   FUN name:testDesugaredForInList visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
       VAR name:iterator type:kotlin.collections.MutableIterator<<root>.P?> [val]
-        CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator<<root>.P?> [operator] declared in kotlin.collections.MutableList' type=kotlin.collections.MutableIterator<<root>.P?> origin=null
+        CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator<E of kotlin.collections.MutableList> [operator] declared in kotlin.collections.MutableList' type=kotlin.collections.MutableIterator<<root>.P?> origin=null
           $this: CALL 'public open fun listOfNotNull (): kotlin.collections.List<<root>.P?>? declared in <root>.J' type=kotlin.collections.List<<root>.P?>? origin=null
       WHILE label=null origin=WHILE_LOOP
         condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=null
@@ -51,7 +51,7 @@ FILE fqName:<root> fileName:/enhancedNullabilityInForLoop.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp_2 type:kotlin.collections.Iterator<<root>.P?> [val]
-          CALL 'public final fun iterator (): kotlin.collections.Iterator<<root>.P?> [operator] declared in kotlin.Array' type=kotlin.collections.Iterator<<root>.P?> origin=null
+          CALL 'public final fun iterator (): kotlin.collections.Iterator<T of kotlin.Array> [operator] declared in kotlin.Array' type=kotlin.collections.Iterator<<root>.P?> origin=null
             $this: CALL 'public open fun arrayOfNotNull (): kotlin.Array<out <root>.P?> declared in <root>.J' type=kotlin.Array<out <root>.P?> origin=null
               $this: GET_VAR 'j: <root>.J declared in <root>.testForInArrayUnused' type=<root>.J origin=null
         WHILE label=null origin=FOR_LOOP_INNER_WHILE
@@ -65,7 +65,7 @@ FILE fqName:<root> fileName:/enhancedNullabilityInForLoop.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp_3 type:kotlin.collections.MutableIterator<<root>.P?> [val]
-          CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator<<root>.P?> [operator] declared in kotlin.collections.MutableList' type=kotlin.collections.MutableIterator<<root>.P?> origin=FOR_LOOP_ITERATOR
+          CALL 'public abstract fun iterator (): kotlin.collections.MutableIterator<E of kotlin.collections.MutableList> [operator] declared in kotlin.collections.MutableList' type=kotlin.collections.MutableIterator<<root>.P?> origin=FOR_LOOP_ITERATOR
             $this: CALL 'public open fun listOfNotNull (): kotlin.collections.List<<root>.P?>? declared in <root>.J' type=kotlin.collections.List<<root>.P?>? origin=null
         WHILE label=null origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
@@ -83,7 +83,7 @@ FILE fqName:<root> fileName:/enhancedNullabilityInForLoop.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp_4 type:kotlin.collections.Iterator<<root>.P?> [val]
-          CALL 'public final fun iterator (): kotlin.collections.Iterator<<root>.P?> [operator] declared in kotlin.Array' type=kotlin.collections.Iterator<<root>.P?> origin=null
+          CALL 'public final fun iterator (): kotlin.collections.Iterator<T of kotlin.Array> [operator] declared in kotlin.Array' type=kotlin.collections.Iterator<<root>.P?> origin=null
             $this: CALL 'public open fun arrayOfNotNull (): kotlin.Array<out <root>.P?> declared in <root>.J' type=kotlin.Array<out <root>.P?> origin=null
               $this: GET_VAR 'j: <root>.J declared in <root>.testForInArrayUse' type=<root>.J origin=null
         WHILE label=null origin=FOR_LOOP_INNER_WHILE
diff --git a/compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.fir.txt b/compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.fir.txt
index c7c8b9453bd..3cf39d6666d 100644
--- a/compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.fir.txt
+++ b/compiler/testData/ir/irText/types/smartCastOnReceiverOfGenericType.fir.txt
@@ -7,7 +7,7 @@ FILE fqName:<root> fileName:/smartCastOnReceiverOfGenericType.kt
         GET_VAR 'a: kotlin.Any declared in <root>.testFunction' type=kotlin.Any origin=null
       TYPE_OP type=kotlin.String origin=CAST typeOperand=kotlin.String
         GET_VAR 'b: kotlin.Any declared in <root>.testFunction' type=kotlin.Any origin=null
-      CALL 'public abstract fun add (element: kotlin.String): kotlin.Boolean declared in kotlin.collections.MutableList' type=kotlin.Boolean origin=null
+      CALL 'public abstract fun add (element: E of kotlin.collections.MutableList): kotlin.Boolean declared in kotlin.collections.MutableList' type=kotlin.Boolean origin=null
         $this: TYPE_OP type=kotlin.collections.MutableList<kotlin.String> origin=IMPLICIT_CAST typeOperand=kotlin.collections.MutableList<kotlin.String>
           GET_VAR 'a: kotlin.Any declared in <root>.testFunction' type=kotlin.Any origin=null
         element: TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String
@@ -46,7 +46,7 @@ FILE fqName:<root> fileName:/smartCastOnReceiverOfGenericType.kt
         GET_VAR 'a: kotlin.Any declared in <root>.testNonSubstitutedTypeParameter' type=kotlin.Any origin=null
       TYPE_OP type=kotlin.collections.List<T of <root>.testNonSubstitutedTypeParameter> origin=CAST typeOperand=kotlin.collections.List<T of <root>.testNonSubstitutedTypeParameter>
         GET_VAR 'b: kotlin.Any declared in <root>.testNonSubstitutedTypeParameter' type=kotlin.Any origin=null
-      CALL 'public abstract fun add (element: kotlin.collections.List<T of <root>.testNonSubstitutedTypeParameter>): kotlin.Boolean declared in kotlin.collections.MutableList' type=kotlin.Boolean origin=null
+      CALL 'public abstract fun add (element: E of kotlin.collections.MutableList): kotlin.Boolean declared in kotlin.collections.MutableList' type=kotlin.Boolean origin=null
         $this: TYPE_OP type=kotlin.collections.MutableList<kotlin.collections.List<T of <root>.testNonSubstitutedTypeParameter>> origin=IMPLICIT_CAST typeOperand=kotlin.collections.MutableList<kotlin.collections.List<T of <root>.testNonSubstitutedTypeParameter>>
           GET_VAR 'a: kotlin.Any declared in <root>.testNonSubstitutedTypeParameter' type=kotlin.Any origin=null
         element: TYPE_OP type=kotlin.collections.List<T of <root>.testNonSubstitutedTypeParameter> origin=IMPLICIT_CAST typeOperand=kotlin.collections.List<T of <root>.testNonSubstitutedTypeParameter>