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 = fieldSymbol.owner
+                    val referencedField = symbol.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