[FIR2IR] Create fake one-time use properties for callable reference to synthetic properies

Previously fir2ir created real IR properties some getter and setter for
  such references, which lead to the situation that there might be a
  unbound fake override for synthetic property which wasn't stored in
  declaration storage (and code in FakeOverrideGenerator was a hack
  to cover this case)
In the same time K1 creates fake property for such cases, which is stored
  in IrPropertyReference along with original get... and set... functions
  as getter and setter of reference. And in this commit K2 does the same thing

^KT-61637

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

@@ -19,9 +19,7 @@ import org.jetbrains.kotlin.fir.builder.buildPackageDirective
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.builder.buildFile
 import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
-import org.jetbrains.kotlin.fir.declarations.utils.isInline
+import org.jetbrains.kotlin.fir.declarations.utils.*
-import org.jetbrains.kotlin.fir.declarations.utils.isJava
-import org.jetbrains.kotlin.fir.declarations.utils.isStatic
 import org.jetbrains.kotlin.fir.expressions.*
 import org.jetbrains.kotlin.fir.extensions.FirExtensionApiInternals
 import org.jetbrains.kotlin.fir.extensions.declarationGenerators
@@ -162,7 +160,7 @@ fun FirClassifierSymbol<*>.toSymbol(
 }
 
 context(Fir2IrComponents)
-private fun FirBasedSymbol<*>.toSymbolForCall(
+fun FirBasedSymbol<*>.toSymbolForCall(
     dispatchReceiver: FirExpression?,
     preferGetter: Boolean,
     explicitReceiver: FirExpression? = null,
@@ -181,6 +179,19 @@ private fun FirBasedSymbol<*>.toSymbolForCall(
     else -> error("Unknown symbol: $this")
 }
 
+fun FirReference.extractSymbolForCall(): FirBasedSymbol<*>? {
+    if (this !is FirResolvedNamedReference) {
+        return null
+    }
+    var symbol = resolvedSymbol
+
+    if (symbol is FirCallableSymbol<*> && symbol.origin == FirDeclarationOrigin.SubstitutionOverride.CallSite) {
+        symbol = symbol.fir.unwrapUseSiteSubstitutionOverrides<FirCallableDeclaration>().symbol
+    }
+
+    return symbol
+}
+
 context(Fir2IrComponents)
 @OptIn(ExperimentalContracts::class)
 fun FirReference.toSymbolForCall(
@@ -193,16 +204,8 @@ fun FirReference.toSymbolForCall(
     contract {
         returnsNotNull() implies (this@toSymbolForCall is FirResolvedNamedReference)
     }
-    if (this !is FirResolvedNamedReference) {
-        return null
-    }
-    var symbol = resolvedSymbol
 
-    if (symbol is FirCallableSymbol<*> && symbol.origin == FirDeclarationOrigin.SubstitutionOverride.CallSite) {
+    return extractSymbolForCall()?.toSymbolForCall(
-        symbol = symbol.fir.unwrapUseSiteSubstitutionOverrides<FirCallableDeclaration>().symbol
-    }
-
-    return symbol.toSymbolForCall(
         dispatchReceiver,
         preferGetter,
         explicitReceiver,
@@ -219,9 +222,9 @@ private fun FirResolvedQualifier.toLookupTag(session: FirSession): ConeClassLike
     }
 
 context(Fir2IrComponents)
-private fun FirCallableSymbol<*>.toSymbolForCall(
+fun FirCallableSymbol<*>.toSymbolForCall(
     dispatchReceiver: FirExpression?,
-    preferGetter: Boolean,
+    preferGetter: Boolean = true,
     // Note: in fact LHS for callable references and explicit receiver for normal qualified accesses
     explicitReceiver: FirExpression? = null,
     isDelegate: Boolean = false,

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

@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.fir.expressions.builder.buildAnnotationCall
 import org.jetbrains.kotlin.fir.references.*
 import org.jetbrains.kotlin.fir.references.builder.buildResolvedNamedReference
 import org.jetbrains.kotlin.fir.resolve.*
+import org.jetbrains.kotlin.fir.resolve.calls.FirSimpleSyntheticPropertySymbol
 import org.jetbrains.kotlin.fir.resolve.calls.FirSyntheticFunctionSymbol
 import org.jetbrains.kotlin.fir.resolve.calls.getExpectedType
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
@@ -71,24 +72,18 @@ class CallAndReferenceGenerator(
     ): IrExpression {
         val type = approximateFunctionReferenceType(callableReferenceAccess.resolvedType).toIrType()
 
-        val callableSymbol = callableReferenceAccess.calleeReference.toResolvedCallableSymbol()
+        val firSymbol = callableReferenceAccess.calleeReference.extractSymbolForCall()
-        if (callableSymbol?.origin == FirDeclarationOrigin.SamConstructor) {
+        if (firSymbol?.origin == FirDeclarationOrigin.SamConstructor) {
             assert(explicitReceiverExpression == null) {
                 "Fun interface constructor reference should be unbound: ${explicitReceiverExpression?.dump()}"
             }
             return adapterGenerator.generateFunInterfaceConstructorReference(
                 callableReferenceAccess,
-                callableSymbol as FirSyntheticFunctionSymbol,
+                firSymbol as FirSyntheticFunctionSymbol,
                 type
             )
         }
 
-        val symbol = callableReferenceAccess.calleeReference.toSymbolForCall(
-            callableReferenceAccess.dispatchReceiver,
-            explicitReceiver = callableReferenceAccess.explicitReceiver,
-            isDelegate = isDelegate,
-            isReference = true
-        )
         // val x by y ->
         //   val `x$delegate` = y
         //   val x get() = `x$delegate`.getValue(this, ::x)
@@ -96,18 +91,28 @@ class CallAndReferenceGenerator(
         val isForDelegate = callableReferenceAccess.source?.kind == KtFakeSourceElementKind.DelegatedPropertyAccessor
         val origin = if (isForDelegate) IrStatementOrigin.PROPERTY_REFERENCE_FOR_DELEGATE else null
         return callableReferenceAccess.convertWithOffsets { startOffset, endOffset ->
-            when (symbol) {
+
-                is IrPropertySymbol -> {
+            fun FirCallableSymbol<*>.toSymbolForCall(): IrSymbol? {
-                    val referencedPropertyGetterSymbol = declarationStorage.findGetterOfProperty(symbol)
+                return toSymbolForCall(
+                    callableReferenceAccess.dispatchReceiver,
+                    explicitReceiver = callableReferenceAccess.explicitReceiver,
+                    isDelegate = isDelegate,
+                    isReference = true
+                )
+            }
+
+            fun convertReferenceToRegularProperty(propertySymbol: FirPropertySymbol): IrExpression? {
+                val irPropertySymbol = propertySymbol.toSymbolForCall() as? IrPropertySymbol ?: return null
+                val referencedPropertyGetterSymbol = declarationStorage.findGetterOfProperty(irPropertySymbol)
                 val referencedPropertySetterSymbol = runIf(callableReferenceAccess.resolvedType.isKMutableProperty(session)) {
-                        declarationStorage.findSetterOfProperty(symbol)
+                    declarationStorage.findSetterOfProperty(irPropertySymbol)
                 }
                 val backingFieldSymbol = when {
                     referencedPropertyGetterSymbol != null -> null
-                        else -> declarationStorage.findBackingFieldOfProperty(symbol)
+                    else -> declarationStorage.findBackingFieldOfProperty(irPropertySymbol)
                 }
-                    IrPropertyReferenceImpl(
+                return IrPropertyReferenceImpl(
-                        startOffset, endOffset, type, symbol,
+                    startOffset, endOffset, type, irPropertySymbol,
                     typeArgumentsCount = callableReferenceAccess.toResolvedCallableSymbol()?.fir?.typeParameters?.size ?: 0,
                     field = backingFieldSymbol,
                     getter = referencedPropertyGetterSymbol,
@@ -116,39 +121,65 @@ class CallAndReferenceGenerator(
                 ).applyTypeArguments(callableReferenceAccess).applyReceivers(callableReferenceAccess, explicitReceiverExpression)
             }
 
-                is IrLocalDelegatedPropertySymbol -> {
+            fun convertReferenceToSyntheticProperty(propertySymbol: FirSimpleSyntheticPropertySymbol): IrExpression? {
-                    IrLocalDelegatedPropertyReferenceImpl(
+                val irPropertySymbol = callablesGenerator.generateIrPropertyForSyntheticPropertyReference(
-                        startOffset, endOffset, type, symbol,
+                    propertySymbol,
-                        delegate = declarationStorage.findDelegateVariableOfProperty(symbol),
+                    conversionScope.parentFromStack()
-                        getter = declarationStorage.findGetterOfProperty(symbol),
+                ).symbol
-                        setter = declarationStorage.findSetterOfProperty(symbol),
+                val property = propertySymbol.syntheticProperty
+                val referencedPropertyGetterSymbol = declarationStorage.getIrFunctionSymbol(property.getter.delegate.unwrapUseSiteSubstitutionOverrides().symbol) as? IrSimpleFunctionSymbol ?: return null
+                val referencedPropertySetterSymbol = runIf(callableReferenceAccess.resolvedType.isKMutableProperty(session)) {
+                    property.setter?.delegate?.unwrapUseSiteSubstitutionOverrides()?.symbol?.let {
+                        declarationStorage.getIrFunctionSymbol(it) as? IrSimpleFunctionSymbol? ?: return null
+                    }
+                }
+                return IrPropertyReferenceImpl(
+                    startOffset, endOffset, type, irPropertySymbol,
+                    typeArgumentsCount = callableReferenceAccess.toResolvedCallableSymbol()?.fir?.typeParameters?.size ?: 0,
+                    field = null,
+                    getter = referencedPropertyGetterSymbol,
+                    setter = referencedPropertySetterSymbol,
+                    origin = origin
+                ).applyTypeArguments(callableReferenceAccess).applyReceivers(callableReferenceAccess, explicitReceiverExpression)
+            }
+
+            fun convertReferenceToLocalDelegatedProperty(propertySymbol: FirPropertySymbol): IrExpression? {
+                val irPropertySymbol = propertySymbol.toSymbolForCall() as? IrLocalDelegatedPropertySymbol ?: return null
+
+                return IrLocalDelegatedPropertyReferenceImpl(
+                    startOffset, endOffset, type, irPropertySymbol,
+                    delegate = declarationStorage.findDelegateVariableOfProperty(irPropertySymbol),
+                    getter = declarationStorage.findGetterOfProperty(irPropertySymbol),
+                    setter = declarationStorage.findSetterOfProperty(irPropertySymbol),
                     origin = origin
                 )
             }
 
-                is IrFieldSymbol -> {
+            fun convertReferenceToField(fieldSymbol: FirFieldSymbol): IrExpression? {
-                    val field = (callableSymbol as FirFieldSymbol).fir
+                val irFieldSymbol = fieldSymbol.toSymbolForCall() as? IrFieldSymbol ?: return null
-                    val propertySymbol = declarationStorage.findPropertyForBackingField(symbol)
+
+                val field = fieldSymbol.fir
+                val propertySymbol = declarationStorage.findPropertyForBackingField(irFieldSymbol)
                     ?: run {
                         // In case of [IrField] without the corresponding property, we've created it directly from [FirField].
                         // Since it's used as a field reference, we need a bogus property as a placeholder.
-                            val firSymbol =
-                                (callableReferenceAccess.calleeReference as FirResolvedNamedReference).resolvedSymbol as FirFieldSymbol
                         @OptIn(IrSymbolInternals::class)
-                            declarationStorage.getOrCreateIrPropertyByPureField(firSymbol.fir, symbol.owner.parent).symbol
+                        declarationStorage.getOrCreateIrPropertyByPureField(fieldSymbol.fir, irFieldSymbol.owner.parent).symbol
                     }
-                    IrPropertyReferenceImpl(
+                return IrPropertyReferenceImpl(
                     startOffset, endOffset, type,
                     propertySymbol,
                     typeArgumentsCount = 0,
-                        field = symbol,
+                    field = irFieldSymbol,
                     getter = runIf(!field.isStatic) { declarationStorage.findGetterOfProperty(propertySymbol) },
                     setter = runIf(!field.isStatic) { declarationStorage.findSetterOfProperty(propertySymbol) },
                     origin
                 ).applyReceivers(callableReferenceAccess, explicitReceiverExpression)
             }
 
-                is IrFunctionSymbol -> {
+            fun convertReferenceToFunction(functionSymbol: FirFunctionSymbol<*>): IrExpression? {
+                val irFunctionSymbol = functionSymbol.toSymbolForCall() as? IrFunctionSymbol ?: return null
+
                 require(type is IrSimpleType)
                 var function = callableReferenceAccess.calleeReference.toResolvedFunctionSymbol()!!.fir
                 if (function is FirConstructor) {
@@ -156,32 +187,41 @@ class CallAndReferenceGenerator(
                     // And for IR, we need to use the original constructor as a source of truth
                     function = function.originalConstructorIfTypeAlias ?: function
                 }
-                    if (adapterGenerator.needToGenerateAdaptedCallableReference(callableReferenceAccess, type, function)) {
+                return if (adapterGenerator.needToGenerateAdaptedCallableReference(callableReferenceAccess, type, function)) {
                     // Receivers are being applied inside
                     with(adapterGenerator) {
                         // TODO: Figure out why `adaptedType` is different from the `type`?
                         val adaptedType = callableReferenceAccess.resolvedType.toIrType() as IrSimpleType
-                            generateAdaptedCallableReference(callableReferenceAccess, explicitReceiverExpression, symbol, adaptedType)
+                        generateAdaptedCallableReference(callableReferenceAccess, explicitReceiverExpression, irFunctionSymbol, adaptedType)
                     }
                 } else {
                     IrFunctionReferenceImpl(
-                            startOffset, endOffset, type, symbol,
+                        startOffset, endOffset, type, irFunctionSymbol,
                         typeArgumentsCount = function.typeParameters.size,
                         valueArgumentsCount = function.valueParameters.size + function.contextReceivers.size,
-                            reflectionTarget = symbol
+                        reflectionTarget = irFunctionSymbol
                     ).applyTypeArguments(callableReferenceAccess)
                         .applyReceivers(callableReferenceAccess, explicitReceiverExpression)
                 }
             }
 
-                else -> {
+            when (firSymbol) {
-                    IrErrorCallExpressionImpl(
+                is FirSimpleSyntheticPropertySymbol -> convertReferenceToSyntheticProperty(firSymbol)
+                is FirPropertySymbol -> when {
+                    firSymbol.isLocal -> when {
+                        firSymbol.hasDelegate -> convertReferenceToLocalDelegatedProperty(firSymbol)
+                        else -> null
+                    }
+                    else -> convertReferenceToRegularProperty(firSymbol)
+                }
+                is FirFunctionSymbol<*> -> convertReferenceToFunction(firSymbol)
+                is FirFieldSymbol -> convertReferenceToField(firSymbol)
+                else -> null
+            } ?: IrErrorCallExpressionImpl(
                 startOffset, endOffset, type, "Unsupported callable reference: ${callableReferenceAccess.render()}"
             )
         }
     }
-        }
-    }
 
     private fun approximateFunctionReferenceType(kotlinType: ConeKotlinType): ConeKotlinType {
         // This is a hack to support intersection types in function references on JVM.

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

@@ -84,21 +84,6 @@ class FakeOverrideGenerator(
             // This parameter is only needed for data-class methods that is irrelevant for lazy library classes
             realDeclarationSymbols = emptySet()
         )
-        // Only add synthetic properties if no real properties were found. This can happen in a mixed hierarchy when a Java class
-        // inherits an @JvmField property. When a Kotlin class extends that Java class, CONFLICTING_INHERITED_JVM_DECLARATIONS will be
-        // reported otherwise. See KT-56538.
-        if (none { it is IrProperty }) {
-            FirSyntheticPropertiesScope.createIfSyntheticNamesProviderIsDefined(session, firClass.defaultType(), useSiteMemberScope)?.let {
-                generateFakeOverridesForName(
-                    irClass, it, name, firClass,
-                    // We pass result = null so that the IR declaration is not added to the class' list of declarations
-                    // but is still cached in the declaration storage.
-                    result = null,
-                    // This parameter is only needed for data-class methods that is irrelevant for lazy library classes
-                    realDeclarationSymbols = emptySet()
-                )
-            }
-        }
         val staticScope = firClass.scopeProvider.getStaticMemberScopeForCallables(firClass, session, scopeSession)
         if (staticScope != null) {
             generateFakeOverridesForName(

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

@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirExpressionStub
 import org.jetbrains.kotlin.fir.lazy.Fir2IrLazyClass
 import org.jetbrains.kotlin.fir.lazy.Fir2IrLazyProperty
 import org.jetbrains.kotlin.fir.references.toResolvedBaseSymbol
+import org.jetbrains.kotlin.fir.resolve.calls.FirSimpleSyntheticPropertySymbol
 import org.jetbrains.kotlin.fir.resolve.dfa.cfg.isLocalClassOrAnonymousObject
 import org.jetbrains.kotlin.fir.resolve.isKFunctionInvoke
 import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
@@ -386,6 +387,30 @@ class Fir2IrCallableDeclarationsGenerator(val components: Fir2IrComponents) : Fi
         return initializer
     }
 
+    fun generateIrPropertyForSyntheticPropertyReference(
+        propertySymbol: FirSimpleSyntheticPropertySymbol,
+        parent: IrDeclarationParent,
+    ): IrProperty {
+        val property = propertySymbol.fir
+        return irFactory.createProperty(
+            startOffset = UNDEFINED_OFFSET,
+            endOffset = UNDEFINED_OFFSET,
+            origin = IrDeclarationOrigin.SYNTHETIC_JAVA_PROPERTY_DELEGATE,
+            name = property.name,
+            visibility = visibilityConverter.convertToDescriptorVisibility(property.visibility),
+            modality = property.modality ?: Modality.FINAL,
+            symbol = IrPropertySymbolImpl(),
+            isVar = property.isVar,
+            isConst = false,
+            isLateinit = property.isLateInit,
+            isDelegated = property.delegate != null,
+            isExternal = property.isExternal,
+            isExpect = property.isExpect
+        ).also {
+            it.parent = parent
+        }
+    }
+
     // ------------------------------------ property accessors ------------------------------------
 
     private fun createIrPropertyAccessor(

compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirFunctionSymbol.kt

@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.symbols.impl
 import org.jetbrains.kotlin.fir.FirLabel
 import org.jetbrains.kotlin.fir.contracts.FirResolvedContractDescription
 import org.jetbrains.kotlin.fir.declarations.*
+import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
 import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
 import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
 import org.jetbrains.kotlin.fir.references.toResolvedConstructorSymbol
@@ -81,6 +82,9 @@ class FirConstructorSymbol(callableId: CallableId) : FirFunctionSymbol<FirConstr
  */
 abstract class FirSyntheticPropertySymbol(propertyId: CallableId, val getterId: CallableId) : FirPropertySymbol(propertyId) {
     abstract fun copy(): FirSyntheticPropertySymbol
+
+    val syntheticProperty: FirSyntheticProperty
+        get() = fir as FirSyntheticProperty
 }
 
 // ------------------------ unnamed ------------------------

compiler/testData/ir/irText/declarations/provideDelegate/javaDelegate.fir.ir.txt

@@ -2,7 +2,7 @@ FILE fqName:k fileName:/box.kt
   PROPERTY name:p1 visibility:public modality:FINAL [delegated,var]
     FIELD PROPERTY_DELEGATE name:p1$delegate type:kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> visibility:private [final,static]
       EXPRESSION_BODY
-        PROPERTY_REFERENCE 'public open foo: @[FlexibleNullability] kotlin.String?' field=null getter='public open fun <get-foo> (): @[FlexibleNullability] kotlin.String? declared in <root>.J' setter='public open fun <set-foo> (s: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in <root>.J' type=kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> origin=null
+        PROPERTY_REFERENCE 'public open foo' field=null getter='public open fun getFoo (): @[FlexibleNullability] kotlin.String? declared in <root>.J' setter='public open fun setFoo (s: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in <root>.J' type=kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> origin=null
           $this: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.J' type=<root>.J origin=null
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-p1> visibility:public modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String?
       correspondingProperty: PROPERTY name:p1 visibility:public modality:FINAL [delegated,var]
@@ -27,7 +27,7 @@ FILE fqName:k fileName:/box.kt
   PROPERTY name:p2 visibility:public modality:FINAL [delegated,var]
     FIELD PROPERTY_DELEGATE name:p2$delegate type:kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> visibility:private [final,static]
       EXPRESSION_BODY
-        PROPERTY_REFERENCE 'public open foo: @[FlexibleNullability] kotlin.String?' field=null getter='public open fun <get-foo> (): @[FlexibleNullability] kotlin.String? declared in <root>.J' setter='public open fun <set-foo> (s: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in <root>.J' type=kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> origin=null
+        PROPERTY_REFERENCE 'public open foo' field=null getter='public open fun getFoo (): @[FlexibleNullability] kotlin.String? declared in <root>.J' setter='public open fun setFoo (s: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in <root>.J' type=kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> origin=null
           $this: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.J' type=<root>.J origin=null
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-p2> visibility:public modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String?
       correspondingProperty: PROPERTY name:p2 visibility:public modality:FINAL [delegated,var]