FIR: use dispatch receiver of the enclosing function if any.

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

@@ -77,15 +77,17 @@ class Fir2IrConversionScope {
     fun parent(): IrDeclarationParent? = parentStack.lastOrNull()
 
     fun lastDispatchReceiverParameter(): IrValueParameter? {
-        val dispatchReceiver = functionStack.lastOrNull()?.dispatchReceiverParameter
+        var dispatchReceiver = functionStack.lastOrNull()?.dispatchReceiverParameter
-        return if (dispatchReceiver != null) {
+        // Use the dispatch receiver of the containing function
-            // Use the dispatch receiver of the containing function
+        dispatchReceiver?.let { return it }
-            dispatchReceiver
+
-        } else {
+        // Use the dispatch receiver of the enclosing function if any
-            val lastClassSymbol = classStack.lastOrNull()?.symbol
+        dispatchReceiver = functionStack.elementAtOrNull(functionStack.size - 2)?.dispatchReceiverParameter
-            // Use the dispatch receiver of the containing class
+        dispatchReceiver?.let { return it }
-            lastClassSymbol?.owner?.thisReceiver
+
-        }
+        // Use the dispatch receiver of the containing class
+        val lastClassSymbol = classStack.lastOrNull()?.symbol
+        return lastClassSymbol?.owner?.thisReceiver
     }
 
     fun lastClass(): IrClass? = classStack.lastOrNull()

compiler/testData/codegen/box/casts/functions/isFunKBig.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

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/kt4174.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class C(val f: () -> String)
 
 class B(val x: String) {

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerAndLocalCapturedInLocalClass.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 abstract class Base(val fn: () -> String)
 
 open class Outer {

compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerCapturedInLocalClass.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 abstract class Base(val fn: () -> String)
 
 class Outer {

compiler/testData/codegen/box/closures/enclosingThis.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Point(val x:Int, val y:Int) {
     fun mul() :  (scalar:Int)->Point  {
         return { scalar:Int -> Point(x * scalar, y * scalar) }

compiler/testData/codegen/box/defaultArguments/protected.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: Foo.kt
 
 package foo

compiler/testData/codegen/box/defaultArguments/useThisInLambda.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class X {
     fun g(x: () -> Boolean = { super.equals(this) }) = x()
 }

compiler/testData/codegen/box/extensionFunctions/kt3285.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 var sayResult = ""
 
 class NoiseMaker {

compiler/testData/codegen/box/extensionFunctions/kt3298.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 var result = ""
 fun result(r: String) { result = r }
 

compiler/testData/codegen/box/functions/invoke/kt3190.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 //KT-3190 Compiler crash if function called 'invoke' calls a closure
 // IGNORE_BACKEND: JS

compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassConstructorFromLambda.kt

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

compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassMethodFromLambda.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 inline class R(private val r: Int) {
     fun test() = { ok() }()

compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/accessPrivateInlineClassMethodFromLambda2.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 inline class R(private val r: Long) {
     fun test() = { ok() }()

compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/captureInlineClassInstanceInLambda.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 inline class R(private val r: Int) {
     fun test() = { ok() }()

compiler/testData/codegen/box/inlineClasses/contextsAndAccessors/captureInlineClassInstanceInLambda2.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 inline class R(private val r: Long) {
     fun test() = { ok() }()

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

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

compiler/testData/codegen/box/jvm8/defaults/accessor.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/accessorsFromDefaultImpls.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/jvmField/captureClassFields.kt

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

compiler/testData/codegen/box/jvmStatic/closure.kt

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

compiler/testData/codegen/box/jvmStatic/kt21246.kt

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

compiler/testData/codegen/box/jvmStatic/kt21246a.kt

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

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun box(): String {
     var log = ""
 

compiler/testData/codegen/box/nonLocalReturns/kt6895.kt

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

compiler/testData/codegen/box/objects/companionObjectAccess/kt27117.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +ProperVisibilityForCompanionObjectInstanceField
-// IGNORE_BACKEND_FIR: JVM_IR
 
 inline fun on(body: () -> Any) = body().toString()
 

compiler/testData/codegen/box/objects/companionObjectAccess/kt27117_lv12.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: -ProperVisibilityForCompanionObjectInstanceField
-// IGNORE_BACKEND_FIR: JVM_IR
 
 inline fun on(body: () -> Any) = body().toString()
 

compiler/testData/codegen/box/objects/companionObjectAccess/kt27117_lv13.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 inline fun on(body: () -> Any) = body().toString()
 
 class A {

compiler/testData/codegen/box/operatorConventions/operatorSetLambda.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // See KT-14999
 
 object Obj {

compiler/testData/codegen/box/properties/classFieldInsideLambda.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class My {
     val my: String = "O"
         get() = { field }() + "K"

compiler/testData/codegen/box/properties/kt2331.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class P {
     var x : Int = 0
         private set

compiler/testData/codegen/box/properties/kt2892.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A
 class B : A() {
     fun foo() = 1

compiler/testData/codegen/box/properties/kt9603.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A {
     public var prop = "OK"
         private set

compiler/testData/codegen/box/properties/privatePropertyInConstructor.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A(
         private val x: String,
         private var y: Double

compiler/testData/codegen/box/properties/privatePropertyWithoutBackingField.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Test {
     private var i : Int
         get() = 1

compiler/testData/codegen/box/properties/protectedJavaProperty.kt

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

compiler/testData/codegen/box/properties/protectedJavaPropertyInCompanion.kt

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

compiler/testData/codegen/box/regressions/kt10934.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 //KT-10934 compiler throws UninferredParameterTypeConstructor in when block that covers all types
 
 class Parser<TInput, TValue>(val f: (TInput) -> Result<TInput, TValue>) {

compiler/testData/codegen/box/regressions/kt1406.kt

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

compiler/testData/codegen/box/super/kt4173.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class C(val f: () -> Unit) {
     fun test() {
         f()

compiler/testData/codegen/box/super/kt4173_2.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class X(var s: ()-> Unit)
 
 open class C(val f: X) {

compiler/testData/codegen/box/syntheticAccessors/accessorForProtected.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: 1.kt
 
 import b.B

compiler/testData/codegen/box/syntheticAccessors/inline.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A {
     fun foo() = o_plus_f_plus_k {""}
 

compiler/testData/codegen/box/syntheticAccessors/inlineInOtherClass.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A {
     private inline fun f() = g()
     private fun g() = "OK"

compiler/testData/codegen/box/syntheticAccessors/kt21258_indirect.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Foo {
     private val fld: String = "O"
         get() = { field }() + "K"

compiler/testData/codegen/box/syntheticAccessors/kt21258_simple.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Foo {
     private val fld: String = "O"
         get() = { field }() + "K"

compiler/testData/codegen/box/traits/kt36973.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: kt36973.kt
 import other.*