FIR2IR: drop hacky computeFieldSymbolForCallableReference

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt

@@ -33,7 +33,6 @@ import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.*
-import org.jetbrains.kotlin.ir.symbols.impl.IrFieldSymbolImpl
 import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.util.dump
 import org.jetbrains.kotlin.ir.util.isFunctionTypeOrSubtype
@@ -125,8 +124,7 @@ class CallAndReferenceGenerator(
                 }
 
                 is IrFieldSymbol -> {
-                    val fieldSymbol = computeFieldSymbolForCallableReference(callableReferenceAccess, symbol)
+                    val referencedField = symbol.owner
-                    val referencedField = fieldSymbol.owner
                     val propertySymbol = referencedField.correspondingPropertySymbol
                         ?: run {
                             // In case of [IrField] without the corresponding property, we've created it directly from [FirField].
@@ -139,7 +137,7 @@ class CallAndReferenceGenerator(
                         startOffset, endOffset, type,
                         propertySymbol,
                         typeArgumentsCount = (type as? IrSimpleType)?.arguments?.size ?: 0,
-                        field = fieldSymbol,
+                        field = symbol,
                         getter = if (referencedField.isStatic) null else propertySymbol.owner.getter?.symbol,
                         setter = if (referencedField.isStatic) null else propertySymbol.owner.setter?.symbol,
                         origin
@@ -215,33 +213,6 @@ class CallAndReferenceGenerator(
         return newType.toTypeProjection(typeProjection.kind)
     }
 
-    private fun computeFieldSymbolForCallableReference(
-        callableReferenceAccess: FirCallableReferenceAccess,
-        symbol: IrFieldSymbol
-    ): IrFieldSymbol {
-        val receiverClass = when (val receiverExpression = callableReferenceAccess.explicitReceiver) {
-            is FirResolvedQualifier -> receiverExpression.symbol
-            null -> null
-            else -> receiverExpression.typeRef.coneType.toSymbol(session)
-        } as? FirClassSymbol<*>
-        val newParent = receiverClass?.let { classifierStorage.getIrClassSymbol(it) }?.owner ?: return symbol
-        return IrFieldSymbolImpl().also { newSymbol ->
-            val field = symbol.owner
-            irFactory.createField(
-                startOffset = -1,
-                endOffset = -1,
-                field.origin,
-                newSymbol,
-                field.name,
-                field.type,
-                field.visibility,
-                field.isFinal,
-                field.isExternal,
-                field.isStatic,
-            ).also { it.parent = newParent }
-        }
-    }
-
     private fun FirQualifiedAccess.tryConvertToSamConstructorCall(type: IrType): IrTypeOperatorCall? {
         val calleeReference = calleeReference as? FirResolvedNamedReference ?: return null
         val fir = calleeReference.resolvedSymbol.fir

compiler/testData/codegen/box/fir/callableReferenceToJavaField.fir.ir.txt

@@ -45,7 +45,7 @@ FILE fqName:foo fileName:/main.kt
           $this: CALL 'public final fun CHECK_NOT_NULL <T0> (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=java.lang.reflect.Field origin=EXCLEXCL
             <T0>: java.lang.reflect.Field
             arg0: CALL 'public final fun <get-javaField> (): java.lang.reflect.Field? declared in kotlin.reflect.jvm.ReflectJvmMapping' type=java.lang.reflect.Field? origin=GET_PROPERTY
-              $receiver: PROPERTY_REFERENCE 'protected/*protected and package*/ open a: @[FlexibleNullability] foo.A? [var]' field='FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] foo.A? visibility:protected/*protected and package*/' getter='protected/*protected and package*/ open fun <get-a> (): @[FlexibleNullability] foo.A? declared in foo.Derived' setter='protected/*protected and package*/ open fun <set-a> (<set-?>: @[FlexibleNullability] foo.A?): kotlin.Unit declared in foo.Derived' type=kotlin.reflect.KMutableProperty1<foo.Derived, @[FlexibleNullability] foo.A?> origin=null
+              $receiver: PROPERTY_REFERENCE 'protected/*protected and package*/ open a: @[FlexibleNullability] foo.A? [var]' field='FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] foo.A? visibility:protected/*protected and package*/' getter='protected/*protected and package*/ open fun <get-a> (): @[FlexibleNullability] foo.A? declared in bar.Base' setter='protected/*protected and package*/ open fun <set-a> (<set-?>: @[FlexibleNullability] foo.A?): kotlin.Unit declared in bar.Base' type=kotlin.reflect.KMutableProperty1<foo.Derived, @[FlexibleNullability] foo.A?> origin=null
                 <1>: <none>
                 <2>: <none>
           p0: GET_VAR '<this>: foo.Derived declared in foo.Derived.foo' type=foo.Derived origin=null

compiler/testData/codegen/box/fir/callableReferenceToJavaField.kt

@@ -24,7 +24,9 @@ class A(val s: String)
 
 class Derived : Base() {
     override fun foo() {
-        // ir: resolved to fake-override field Derived.a
+        // ir: resolved to fake-override field Derived.a in K1,
+        // but to base field Base.a in K2
+        // However, box() works correctly in both cases
         (Derived::a).javaField!![this] = A("OK")
     }