FIR2IR: convert qualifiers to companion objects, if any

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

@@ -1262,11 +1262,18 @@ class Fir2IrVisitor(
     override fun visitResolvedQualifier(resolvedQualifier: FirResolvedQualifier, data: Any?): IrElement {
         val classSymbol = resolvedQualifier.symbol
         if (classSymbol != null) {
+            val resultingSymbol = when (val klass = classSymbol.fir) {
+                is FirRegularClass -> {
+                    if (klass.classKind in listOf(ClassKind.OBJECT, ClassKind.ENUM_ENTRY)) classSymbol
+                    else klass.companionObject?.symbol ?: classSymbol
+                }
+                else -> classSymbol
+            }
             return resolvedQualifier.convertWithOffsets { startOffset, endOffset ->
                 IrGetObjectValueImpl(
                     startOffset, endOffset,
                     resolvedQualifier.typeRef.toIrType(),
-                    classSymbol.toIrSymbol(session, declarationStorage) as IrClassSymbol
+                    resultingSymbol.toIrSymbol(session, declarationStorage) as IrClassSymbol
                 )
             }
         }

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 import kotlin.reflect.KProperty1
 
 class A {

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

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

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class C() {
   companion object {
     fun create() = C()

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

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

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A() {
     companion object {
         val value = 10

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // EA-38323 - Illegal field modifiers in class: classObject field in C must be static and final
 
 interface C {

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A {
     companion object {
         fun values() = "O"

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TODO: Enable for JS when it supports Java class library.
 // TARGET_BACKEND: JVM
 

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class C() {
     companion object {
         private fun <T> create() = C()

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class C() {
     companion object Foo
 }

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A {
     companion object {
         val b = 0

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class Factory(p: Int)
 
 class A {

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 package mult_constructors_3_bug
 
 public open class Identifier() {

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class C() {
     companion object Foo {
         fun create() = 3

compiler/testData/codegen/box/defaultArguments/constructor/kt3060.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Foo private constructor(val param: String = "OK") {
     companion object {
         val s = Foo()

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A {
   companion object {
     fun Int.foo(a: Int = 1): Int {

compiler/testData/codegen/box/defaultArguments/private/memberFunction.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // KT-5786 NoSuchMethodError: no accessor for private fun with default arguments
 
 class A {

compiler/testData/codegen/box/defaultArguments/private/primaryConstructor.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 var state: String = "Fail"
 
 class A private constructor(x: String = "OK") {

compiler/testData/codegen/box/defaultArguments/private/secondaryConstructor.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 var state: String = "Fail"
 
 class A {

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class A {
     companion object
 }

compiler/testData/codegen/box/fieldRename/constructorAndClassObject.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Test(val prop: String) {
 
   companion object {

compiler/testData/codegen/box/fieldRename/jvmFieldNoClash1.kt

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

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 package someTest
 
 public class Some private constructor(val v: String) {

compiler/testData/codegen/box/ieee754/differentTypesComparison.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: NATIVE
 fun box(): String {
     if (0.toByte().compareTo(-0.0) != 1) return "fail 1.1"

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

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

compiler/testData/codegen/box/innerNested/nestedClassObject.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Outer {
     class Nested {
         companion object {

compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.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/annotationCompanion.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +JvmFieldInInterface +NestedClassesInAnnotations
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_RUNTIME

compiler/testData/codegen/box/jvmField/initializersOrder.kt

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

compiler/testData/codegen/box/jvmField/interfaceCompanion.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +JvmFieldInInterface
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 
 // WITH_RUNTIME

compiler/testData/codegen/box/jvmField/publicField.kt

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

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 // FILE: tt.kt

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

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

compiler/testData/codegen/box/objects/companionObjectAccess/multipleCompanionsWithAccessors/withCompanionObjectBase.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +ProperVisibilityForCompanionObjectInstanceField
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: withCompanionObjectBase.kt
 import b.*
 

compiler/testData/codegen/box/objects/companionObjectAccess/multipleCompanionsWithAccessors/withMultipleNestedCompanionObjectBases.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +ProperVisibilityForCompanionObjectInstanceField
-// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: withCompanionObjectBase.kt
 import b.*
 

compiler/testData/codegen/box/objects/companionObjectAccess/primitiveCompanion/doubleCompanionObject.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun <T> assertEquals(a: T, b: T) { if (a != b) throw AssertionError("$a != $b") }
 

compiler/testData/codegen/box/objects/companionObjectAccess/primitiveCompanion/floatCompanionObject.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun <T> assertEquals(a: T, b: T) { if (a != b) throw AssertionError("$a != $b") }
 

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 var result = "OK"
 
 class A {

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // Inside of the companion we have to access the instance through the local Companion field,
 // not by indirection through the Companion field of the enclosing class.
 // Class initialization might not have finished yet.

compiler/testData/codegen/box/objects/kt535.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/objects/selfReferenceToCompanionObjectInInlineLambdaInConstructorBody.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Test {
     companion object {
         fun ok() = "OK"

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

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

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 interface Test {
     companion object {
         fun ok() = "OK"

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

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

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 import kotlin.test.assertEquals
 

compiler/testData/codegen/box/privateConstructors/captured.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 public open class Outer private constructor(val s: String) {
 
     companion object {

compiler/testData/codegen/box/privateConstructors/companion.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // See also KT-6299
 public open class Outer private constructor() {
     companion object {

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // See also KT-6299
 public open class Outer private constructor() {
     companion object {

compiler/testData/codegen/box/privateConstructors/kt4860.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class A private constructor() {
     companion object : A() {
     }

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class My {
     companion object {
         val my: String = "O"

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

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

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class My {
     companion object {
         private val my: String = "O"

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class My {
     companion object {
         private val my: String = "O"

compiler/testData/codegen/box/properties/const/nonConstValsAreProperlyInitialized.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: +NoConstantValueAttributeForNonConstVals +JvmFieldInInterface
-// IGNORE_BACKEND_FIR: JVM_IR
 // TARGET_BACKEND: JVM
 // WITH_RUNTIME
 

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class IntentionsBundle {
     companion object {
         fun message(key: String): String {

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

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

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class TestObject()
 {
     companion object {

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Foo() {
     companion object {
         val bar = "OK";

compiler/testData/codegen/box/properties/lateinit/accessorExceptionPublic.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 public class A {
     fun getFromClass(): Boolean {
         try {

compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/companionObjectField.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 
 class Class {

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

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_RUNTIME
 import kotlin.test.*
 

compiler/testData/codegen/box/ranges/contains/inOptimizableDoubleRange.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/ranges/contains/inOptimizableFloatRange.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/reflection/enclosing/lambdaInClassObject.kt

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

compiler/testData/codegen/box/reflection/kClassInAnnotation/checkcast.kt

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

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

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

compiler/testData/codegen/box/statics/anonymousInitializerInClassObject.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class Foo {
     companion object {
         val bar: String

compiler/testData/codegen/box/statics/inheritedPropertyInClassObject.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 open class Bar<T>(val prop: String)
 class Foo {
     companion object : Bar<Foo>("OK") {

compiler/testData/codegen/box/statics/kt8089.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND_FIR: JVM_IR
 class C {
     companion object {
         private val s: String

compiler/testData/ir/irText/expressions/values.fir.txt

@@ -129,4 +129,4 @@ FILE fqName:<root> fileName:/values.kt
   FUN name:test4 visibility:public modality:FINAL <> () returnType:<root>.Z.Companion
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test4 (): <root>.Z.Companion declared in <root>'
-        GET_OBJECT 'CLASS CLASS name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z.Companion
+        GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=<root>.Z.Companion

compiler/testData/ir/irText/stubs/constFromBuiltins.fir.txt

@@ -3,7 +3,7 @@ FILE fqName:<root> fileName:/constFromBuiltins.kt
     FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:private [final,static]
       EXPRESSION_BODY
         CALL 'public final fun <get-MIN_VALUE> (): kotlin.Int declared in kotlin.Int.Companion' type=kotlin.Int origin=GET_PROPERTY
-          $this: GET_OBJECT 'CLASS CLASS name:Int modality:FINAL visibility:public superTypes:[kotlin.Number; kotlin.Comparable<kotlin.Int>]' type=kotlin.Int.Companion
+          $this: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=kotlin.Int.Companion
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:kotlin.Int
       correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val]
       BLOCK_BODY