FIR2IR: populate overriddenSymbols for overriding functions

#KT-38416 Fixed

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt

@@ -7,6 +7,8 @@ package org.jetbrains.kotlin.fir.backend
 
 import com.intellij.psi.PsiCompiledElement
 import org.jetbrains.kotlin.KtNodeTypes
+import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.*
@@ -26,19 +28,23 @@ import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
+import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
 import org.jetbrains.kotlin.ir.descriptors.WrappedReceiverParameterDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrConst
 import org.jetbrains.kotlin.ir.expressions.IrConstKind
 import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
 import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
 import org.jetbrains.kotlin.ir.symbols.*
-import org.jetbrains.kotlin.ir.types.IrErrorType
+import org.jetbrains.kotlin.ir.symbols.impl.IrClassSymbolImpl
-import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.types.impl.IrErrorTypeImpl
 import org.jetbrains.kotlin.ir.util.SymbolTable
+import org.jetbrains.kotlin.ir.util.isFakeOverride
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffsetSkippingComments
+import org.jetbrains.kotlin.types.AbstractTypeChecker
+import org.jetbrains.kotlin.types.AbstractTypeCheckerContext
 import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.util.OperatorNameConventions
 
@@ -279,6 +285,73 @@ internal tailrec fun FirCallableSymbol<*>.deepestMatchingOverriddenSymbol(root:
     return overriddenSymbol.deepestMatchingOverriddenSymbol(this)
 }
 
+internal fun IrClass.findMatchingOverriddenSymbolsFromSupertypes(
+    irBuiltIns: IrBuiltIns,
+    target: IrDeclaration,
+    result: MutableList<IrSymbol> = mutableListOf()
+): List<IrSymbol> {
+    for (superType in superTypes) {
+        val superTypeClass = superType.classOrNull
+        if (superTypeClass is IrClassSymbolImpl) {
+            superTypeClass.owner.findMatchingOverriddenSymbolsFromThisAndSupertypes(irBuiltIns, target, result)
+        }
+    }
+    return result
+}
+
+private fun IrClass.findMatchingOverriddenSymbolsFromThisAndSupertypes(
+    irBuiltIns: IrBuiltIns,
+    target: IrDeclaration,
+    result: MutableList<IrSymbol>
+): List<IrSymbol> {
+    for (declaration in declarations) {
+        when {
+            declaration is IrFunction && target is IrFunction ->
+                if (declaration !is IrConstructor &&
+                    !declaration.isFakeOverride &&
+                    declaration.descriptor.modality != Modality.FINAL &&
+                    !Visibilities.isPrivate(declaration.visibility) &&
+                    isOverriding(irBuiltIns, target, declaration)
+                ) {
+                    result.add(declaration.symbol)
+                }
+            // TODO: property lookup to set overriddenSymbols for IrProperty (and accessors)?
+        }
+    }
+    // Stop traversing upwards if we find matching overridden symbols at this level.
+    if (result.isNotEmpty()) {
+        return result
+    }
+    return findMatchingOverriddenSymbolsFromSupertypes(irBuiltIns, target, result)
+}
+
+fun isOverriding(
+    irBuiltIns: IrBuiltIns,
+    target: IrFunction,
+    superCandidate: IrFunction
+): Boolean {
+    val typeCheckerContext = IrTypeCheckerContext(irBuiltIns) as AbstractTypeCheckerContext
+    fun equalTypes(first: IrType, second: IrType): Boolean {
+        return AbstractTypeChecker.equalTypes(
+            typeCheckerContext, first, second
+        ) ||
+                // TODO: should pass type parameter cache, and make sure target type is indeed a matched type argument.
+                second.classifierOrNull is IrTypeParameterSymbol
+
+    }
+
+    return target.name == superCandidate.name &&
+            // Not checking the return type (they should match each other if everything other match, otherwise it's a compilation error)
+            target.extensionReceiverParameter?.type?.let {
+                val superCandidateReceiverType = superCandidate.extensionReceiverParameter?.type
+                superCandidateReceiverType != null && equalTypes(it, superCandidateReceiverType)
+            } != false &&
+            target.valueParameters.size == superCandidate.valueParameters.size &&
+            target.valueParameters.zip(superCandidate.valueParameters).all { (targetParameter, superCandidateParameter) ->
+                equalTypes(targetParameter.type, superCandidateParameter.type)
+            }
+}
+
 private val nameToOperationConventionOrigin = mutableMapOf(
     OperatorNameConventions.PLUS to IrStatementOrigin.PLUS,
     OperatorNameConventions.MINUS to IrStatementOrigin.MINUS,

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt

@@ -453,6 +453,13 @@ class Fir2IrDeclarationStorage(
                 created.overriddenSymbols += getIrFunctionSymbol(it) as IrSimpleFunctionSymbol
             }
         }
+        if (!created.isFakeOverride && simpleFunction?.isOverride == true && thisReceiverOwner != null) {
+            thisReceiverOwner.findMatchingOverriddenSymbolsFromSupertypes(components.irBuiltIns, created).forEach {
+                if (it is IrSimpleFunctionSymbol) {
+                    created.overriddenSymbols += it
+                }
+            }
+        }
         functionCache[function] = created
         return created
     }

compiler/testData/codegen/box/bridges/abstractOverrideBridge.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 open class Base<T> {
     open fun f(x: T): String {

compiler/testData/codegen/box/bridges/bridgeInInterface.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FULL_JDK

compiler/testData/codegen/box/bridges/overrideReturnType.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class C {
     open fun f(): Any = "C f"
 }

compiler/testData/codegen/box/bridges/simpleEnum.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface A<T> {
     open fun foo(t: T) = "A"
 }

compiler/testData/codegen/box/bridges/simpleObject.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A<T> {
     open fun foo(t: T) = "A"
 }

compiler/testData/codegen/box/bridges/strListRemove.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // FILE: J.java

compiler/testData/codegen/box/bridges/substitutionInSuperClass/object.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A<T> {
     open fun foo(t: T) = "A"
 }

compiler/testData/codegen/box/bridges/typeParameterInExtensionReceiver.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface A<T1> {
     fun <T2> T2.foo(x: T1): String
 }

compiler/testData/codegen/box/casts/intersectionTypeSmartcast.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface A {
     fun foo(): Any?
 }

compiler/testData/codegen/box/classes/kt1535.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 // TODO: Enable when JS backend supports Java class library, since FunctionX are required for interoperation
 // IGNORE_BACKEND: JS

compiler/testData/codegen/box/coroutines/bridges/interfaceSpecialization.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST

compiler/testData/codegen/box/coroutines/controlFlow/whenWithSuspensions.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST

compiler/testData/codegen/box/coroutines/generate.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME
 // WITH_COROUTINES

compiler/testData/codegen/box/coroutines/intrinsicSemantics/coroutineContextReceiverNotIntrinsic.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST

compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST

compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST

compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturn.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST

compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutineUninterceptedOrReturnInterception.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST

compiler/testData/codegen/box/coroutines/intrinsicSemantics/suspendCoroutineUninterceptedOrReturn.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST

compiler/testData/codegen/box/coroutines/javaInterop/returnLambda.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // COMMON_COROUTINES_TEST
 // WITH_RUNTIME

compiler/testData/codegen/box/coroutines/javaInterop/suspendInlineWithCrossinline.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // COMMON_COROUTINES_TEST
 // WITH_RUNTIME

compiler/testData/codegen/box/coroutines/localFunctions/named/stateMachine.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST

compiler/testData/codegen/box/coroutines/overrideDefaultArgument.kt

@@ -1,8 +1,6 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST
-
-// TODO (SPECIAL IGNORE_BACKEND_FIR): this test isn't run in FIR mode at all due to infinite loop
 import helpers.*
 import COROUTINES_PACKAGE.*
 import COROUTINES_PACKAGE.intrinsics.*

compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // FULL_JDK
 // WITH_RUNTIME

compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override2.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // FULL_JDK
 // WITH_RUNTIME

compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/override3.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // FULL_JDK
 // WITH_RUNTIME

compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/overrideCrossinline.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // FULL_JDK
 // WITH_RUNTIME

compiler/testData/codegen/box/coroutines/tailCallOptimizations/unit/overrideOverriden.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // FULL_JDK
 // WITH_RUNTIME

compiler/testData/codegen/box/coroutines/tailOperations/tailInlining.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST

compiler/testData/codegen/box/coroutines/unitTypeReturn/coroutineReturn.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // WITH_COROUTINES
 // COMMON_COROUTINES_TEST

compiler/testData/codegen/box/defaultArguments/function/abstractClass.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 abstract class Base {
     abstract fun foo(a: String = "abc"): String
 }

compiler/testData/codegen/box/defaultArguments/function/complexInheritance.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // See KT-21968
 
 interface A {

compiler/testData/codegen/box/defaultArguments/function/covariantOverride.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class Foo {
     open fun foo(x: CharSequence = "O"): CharSequence = x
 }

compiler/testData/codegen/box/defaultArguments/function/covariantOverrideGeneric.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class Foo {
     open fun foo(x: CharSequence = "O"): CharSequence = x
 }

compiler/testData/codegen/box/defaultArguments/function/funInTrait.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface Foo {
     fun foo(a: Double = 1.0): Double
 }

compiler/testData/codegen/box/defaultArguments/function/kt36188.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS
 
 // Test for KT-36188 bug compatibility between non-IR and IR backends

compiler/testData/codegen/box/defaultArguments/function/kt36188_2.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS
 
 // Test for KT-36188 bug compatibility between non-IR and IR backends

compiler/testData/codegen/box/defaultArguments/function/kt5232.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface A {
     fun visit(a:String, b:String="") : String = b + a
 }

compiler/testData/codegen/box/defaultArguments/function/trait.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface Base {
     fun bar(a: String = "abc"): String = a + " from interface"
 }

compiler/testData/codegen/box/defaultArguments/signature/kt2789.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface FooTrait<T> {
     fun make(size: Int = 16) : T
 

compiler/testData/codegen/box/defaultArguments/signature/kt9428.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class Player(val name: String)
 open class SlashPlayer(name: String) : Player(name)
 

compiler/testData/codegen/box/defaultArguments/signature/kt9924.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 abstract class A<T> {
     abstract fun test(a: T, b:Boolean = false) : String
 }

compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.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
 // DONT_RUN_GENERATED_CODE: JS

compiler/testData/codegen/box/functions/defaultargs4.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface A {
     fun bar2(arg: Int = 239) : Int
 

compiler/testData/codegen/box/functions/defaultargs5.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open abstract class B {
     abstract fun foo2(arg: Int = 239) : Int
 }

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideChainErasedToAny.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 inline class X(val x: Any)
 

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideChainErasedToNullableAny.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 inline class X(val x: Any?)
 

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToAny.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 inline class X(val x: Any)
 

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToInterface.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 interface IFoo {
     fun foo(): String

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideErasedToPrimitive.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 inline class X(val x: Char)
 

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideListVsMutableList.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
 

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/covariantOverrideUnrelatedInterfaces.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 interface IQ1
 interface IQ2

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/genericOverride.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-
 inline class X(val x: Any)
 
 interface IFoo<T> {

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/genericOverrideSpecialized.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-
 interface GFoo<out T> {
     fun foo(): T
 }

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/inlineClassInOverriddenReturnTypes.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 inline class X(val x: String)
 

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt28483.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-
 inline class ResultOrClosed(val x: Any?)
 
 interface A<T> {

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullNullableAny.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-
 inline class X(val x: Any?)
 
 interface IFoo<out T : X?> {

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideGenericWithNullableInlineClassUpperBoundWithNonNullNullableAnyNull.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 
 inline class X(val x: Any?)

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideNullableInlineClassWithNonNullNullableAny.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 inline class X(val x: Any?)
 

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/overrideNullableInlineClassWithNonNullNullableAnyNull.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 inline class X(val x: Any?)
 

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes1a.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 interface IQ {
     fun ok(): String

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes1b.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 interface IQ {
     fun ok(): String

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes2a.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-
 interface IBase
 
 interface IQ : IBase {

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/relatedReturnTypes2b.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-
 interface IBase
 
 interface IQ : IBase {

compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/unrelatedGenerics.kt

@@ -1,5 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
-
 interface IFoo1<out T> {
     fun foo(): T
 }

compiler/testData/codegen/box/inlineClasses/bridgesWhenInlineClassImplementsGenericInterface.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 inline class InlinedComparable(val x: Int) : Comparable<InlinedComparable> {
     override fun compareTo(other: InlinedComparable): Int {

compiler/testData/codegen/box/inlineClasses/correctBoxingForBranchExpressions.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 interface Base {
     fun result(): Int

compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultInterfaceFunParameterValuesOfInlineClassType.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 inline class Z(val z: Int)
 

compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultParameterValuesOfInlineClassTypeBoxing.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 interface IFoo {
     fun foo(): String

compiler/testData/codegen/box/inlineClasses/functionNameMangling/overridingMethodInGenericClass2.kt

@@ -1,4 +1,5 @@
 // !LANGUAGE: +InlineClasses
+// IGNORE_BACKEND_FIR: JVM_IR
 
 abstract class GenericBase<T> {
     abstract fun foo(x: T): T

compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/complexGenericMethodWithInlineClassOverride2.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 inline class A(val s: String)
 

compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/defaultInterfaceExtensionFunCall.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 interface IFoo {
     fun Long.foo() = bar()

compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/defaultInterfaceMethodCall.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 interface IFoo {
     fun foo() = bar()

compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/genericDefaultInterfaceExtensionFunCall.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 interface IFoo<T : IFoo<T>> {
     fun T.foo(): String = bar()

compiler/testData/codegen/box/inlineClasses/interfaceMethodCalls/genericDefaultInterfaceMethodCall.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 interface IFoo<T : IFoo<T>> {
     fun foo(t: T): String = t.bar()

compiler/testData/codegen/box/inlineClasses/overridingFunCallingPrivateFun.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 interface IFoo {
     fun foo(): String

compiler/testData/codegen/box/inlineClasses/smartCastOnThisOfInlineClassType.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 interface IBase {
     fun testDefault1() = if (this is B) this.foo() else "fail"

compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt

@@ -1,3 +1,4 @@
+// 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

compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt

@@ -1,3 +1,4 @@
+// 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

compiler/testData/codegen/box/javaInterop/objectMethods/cloneHierarchy.kt

@@ -1,3 +1,4 @@
+// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 open class A : Cloneable {

compiler/testData/codegen/box/jdk/kt1397.kt

@@ -1,3 +1,4 @@
+// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // IGNORE_BACKEND: NATIVE
 

compiler/testData/codegen/box/jvm8/bridgeInClass.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 

compiler/testData/codegen/box/jvm8/bridgeInInterface.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 

compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInClass.kt

@@ -1,5 +1,4 @@
 // !JVM_DEFAULT_MODE: all-compatibility
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterface.kt

@@ -1,5 +1,4 @@
 // !JVM_DEFAULT_MODE: all-compatibility
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeInInterface2.kt

@@ -1,5 +1,4 @@
 // !JVM_DEFAULT_MODE: all-compatibility
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // IGNORE_BACKEND: ANDROID
 // JVM_TARGET: 1.8

compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt

@@ -1,5 +1,4 @@
 // !JVM_DEFAULT_MODE: enable
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt

@@ -1,5 +1,4 @@
 // !JVM_DEFAULT_MODE: enable
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInClass.kt

@@ -1,5 +1,4 @@
 // !JVM_DEFAULT_MODE: all
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterface.kt

@@ -1,5 +1,4 @@
 // !JVM_DEFAULT_MODE: all
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeInInterface2.kt

@@ -1,5 +1,4 @@
 // !JVM_DEFAULT_MODE: all
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // IGNORE_BACKEND: ANDROID
 // JVM_TARGET: 1.8

compiler/testData/codegen/box/jvm8/kt11969.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_RUNTIME

compiler/testData/codegen/box/localClasses/kt3210.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 package org.example
 
 interface SomeTrait {}

compiler/testData/codegen/box/mangling/internalOverrideSuperCall.kt

@@ -1,3 +1,4 @@
+// IGNORE_BACKEND_FIR: JVM_IR
 open class A {
     internal open val field = "F"
 

compiler/testData/codegen/box/mangling/publicOverrideSuperCall.kt

@@ -1,3 +1,4 @@
+// IGNORE_BACKEND_FIR: JVM_IR
 open class A {
     internal open val field = "F"
 

compiler/testData/codegen/box/operatorConventions/compareTo/comparable.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface A : Comparable<A>
 
 class B(val x: Int) : A {

compiler/testData/codegen/box/primitiveTypes/number.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // FILE: FortyTwoExtractor.java

compiler/testData/codegen/box/ranges/contains/evaluationOrderForComparableRange.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KJS_WITH_FULL_RUNTIME
 // WITH_RUNTIME