[FIR2IR] Fix labeled this references

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

@@ -287,32 +287,30 @@ class Fir2IrVisitor(
     override fun visitThisReceiverExpression(thisReceiverExpression: FirThisReceiverExpression, data: Any?): IrElement {
         val calleeReference = thisReceiverExpression.calleeReference
         val boundSymbol = calleeReference.boundSymbol
-        if (calleeReference.labelName == null) {
+        if (boundSymbol is FirClassSymbol) {
-            if (boundSymbol is FirClassSymbol) {
+            // Object case
-                // Object case
+            val firClass = boundSymbol.fir as FirClass
-                val firClass = boundSymbol.fir as FirClass
+            val irClass = classifierStorage.getCachedIrClass(firClass)!!
-                val irClass = classifierStorage.getCachedIrClass(firClass)!!
+            if (firClass is FirAnonymousObject || firClass is FirRegularClass && firClass.classKind == ClassKind.OBJECT) {
-                if (firClass is FirAnonymousObject || firClass is FirRegularClass && firClass.classKind == ClassKind.OBJECT) {
+                if (irClass != conversionScope.lastClass()) {
-                    if (irClass != conversionScope.lastClass()) {
+                    return thisReceiverExpression.convertWithOffsets { startOffset, endOffset ->
-                        return thisReceiverExpression.convertWithOffsets { startOffset, endOffset ->
+                        IrGetObjectValueImpl(startOffset, endOffset, irClass.defaultType, irClass.symbol)
-                            IrGetObjectValueImpl(startOffset, endOffset, irClass.defaultType, irClass.symbol)
-                        }
                     }
                 }
+            }
 
-                val dispatchReceiver = conversionScope.dispatchReceiverParameter(irClass)
+            val dispatchReceiver = conversionScope.dispatchReceiverParameter(irClass)
-                if (dispatchReceiver != null) {
+            if (dispatchReceiver != null) {
-                    return thisReceiverExpression.convertWithOffsets { startOffset, endOffset ->
+                return thisReceiverExpression.convertWithOffsets { startOffset, endOffset ->
-                        IrGetValueImpl(startOffset, endOffset, dispatchReceiver.type, dispatchReceiver.symbol)
+                    IrGetValueImpl(startOffset, endOffset, dispatchReceiver.type, dispatchReceiver.symbol)
-                    }
                 }
-            } else if (boundSymbol is FirCallableSymbol) {
+            }
-                val receiverSymbol = calleeReference.toSymbol(session, classifierStorage, declarationStorage, conversionScope)
+        } else if (boundSymbol is FirCallableSymbol) {
-                val receiver = (receiverSymbol?.owner as? IrSimpleFunction)?.extensionReceiverParameter
+            val receiverSymbol = calleeReference.toSymbol(session, classifierStorage, declarationStorage, conversionScope)
-                if (receiver != null) {
+            val receiver = (receiverSymbol?.owner as? IrSimpleFunction)?.extensionReceiverParameter
-                    return thisReceiverExpression.convertWithOffsets { startOffset, endOffset ->
+            if (receiver != null) {
-                        IrGetValueImpl(startOffset, endOffset, receiver.type, receiver.symbol)
+                return thisReceiverExpression.convertWithOffsets { startOffset, endOffset ->
-                    }
+                    IrGetValueImpl(startOffset, endOffset, receiver.type, receiver.symbol)
                 }
             }
         }

compiler/testData/codegen/box/callableReference/property/kt6870_privatePropertyReference.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

compiler/testData/codegen/box/callableReference/property/privateSetOuterClass.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A {
     var value: String = "fail1"
         private set

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 fun test1(str: String): String {
     data class A(val x: Int) {
         fun foo() = str

compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt

@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS_IR
 
 // TODO: muted automatically, investigate should it be ran for JS or not

compiler/testData/codegen/box/functions/functionExpression/functionExpressionWithThisReference.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun Int.thisRef1() = fun () = this
 fun Int.thisRef2() = fun (): Int {return this}

compiler/testData/codegen/box/functions/functionExpression/functionExpressionWithThisReferenceNI.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +NewInference
-// IGNORE_BACKEND_FIR: JVM_IR
 // NewInference needed because of KT-26531
 
 fun Int.thisRef1() = fun () = this

compiler/testData/codegen/box/labels/propertyAccessor.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 val Int.getter: Int
     get() {
         return this@getter

compiler/testData/codegen/box/labels/propertyAccessorFunctionLiteral.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 val Int.getter: Int
     get() {
         return {

compiler/testData/codegen/box/labels/propertyAccessorInnerExtensionFun.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 val Int.getter: Int
     get() {
         val extFun: Int.() -> Int = {

compiler/testData/codegen/box/labels/propertyAccessorObject.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface Base {
     fun foo(): Int
 }

compiler/testData/codegen/box/labels/propertyInClassAccessor.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Test {
     val Int.innerGetter: Int
         get() {

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 package test
 
 val A.a: String

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 package test
 
 class C(val s : String) {

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 package test
 
 class C(val s : String) {

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Outer {
     val foo = "Foo"
 

compiler/testData/codegen/box/objects/thisInConstructor.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A(open val v: String) {
 }