Desugar synthetic Java properties in psi2ir

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/KotlinUtils.kt

@@ -18,9 +18,7 @@ package org.jetbrains.kotlin.psi2ir
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
-import org.jetbrains.kotlin.descriptors.ClassDescriptor
-import org.jetbrains.kotlin.descriptors.FunctionDescriptor
+import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.name.Name
@@ -82,4 +80,8 @@ fun KotlinBuiltIns.findSingleFunction(name: Name): FunctionDescriptor =
 val PsiElement?.startOffsetOrUndefined get() = this?.startOffset ?: UNDEFINED_OFFSET
 val PsiElement?.endOffsetOrUndefined get() = this?.endOffset ?: UNDEFINED_OFFSET
 
+val PropertyDescriptor.unwrappedGetMethod: FunctionDescriptor?
+    get() = if (this is SyntheticPropertyDescriptor) this.getMethod else getter
 
+val PropertyDescriptor.unwrappedSetMethod: FunctionDescriptor?
+    get() = if (this is SyntheticPropertyDescriptor) this.setMethod else setter

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/AssignmentGenerator.kt

@@ -29,6 +29,8 @@ import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 import org.jetbrains.kotlin.psi2ir.intermediate.*
+import org.jetbrains.kotlin.psi2ir.unwrappedGetMethod
+import org.jetbrains.kotlin.psi2ir.unwrappedSetMethod
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.callUtil.isSafeCall
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
@@ -102,7 +104,7 @@ class AssignmentGenerator(statementGenerator: StatementGenerator) : StatementGen
         }
     }
 
-    fun generateAssignmentReceiver(ktLeft: KtExpression, origin: IrStatementOrigin): AssignmentReceiver {
+    private fun generateAssignmentReceiver(ktLeft: KtExpression, origin: IrStatementOrigin): AssignmentReceiver {
         if (ktLeft is KtArrayAccessExpression) {
             return generateArrayAccessAssignmentReceiver(ktLeft, origin)
         }
@@ -204,10 +206,10 @@ class AssignmentGenerator(statementGenerator: StatementGenerator) : StatementGen
     ): PropertyLValueBase {
         val superQualifierSymbol = superQualifier?.let { context.symbolTable.referenceClass(it) }
 
-        val getterDescriptor = descriptor.getter
-        val getterSymbol = getterDescriptor?.let { context.symbolTable.referenceFunction(it.original) }
+        val getterDescriptor = descriptor.unwrappedGetMethod
+        val setterDescriptor = descriptor.unwrappedSetMethod
 
-        val setterDescriptor = descriptor.setter
+        val getterSymbol = getterDescriptor?.let { context.symbolTable.referenceFunction(it.original) }
         val setterSymbol = setterDescriptor?.let { context.symbolTable.referenceFunction(it.original) }
 
         val propertyIrType = descriptor.type.toIrType()

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/CallGenerator.kt

@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 import org.jetbrains.kotlin.psi2ir.intermediate.*
+import org.jetbrains.kotlin.psi2ir.unwrappedGetMethod
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument
 import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForObject
@@ -103,7 +104,7 @@ class CallGenerator(statementGenerator: StatementGenerator) : StatementGenerator
     fun generateDelegatingConstructorCall(startOffset: Int, endOffset: Int, call: CallBuilder): IrExpression =
         call.callReceiver.call { dispatchReceiver, extensionReceiver ->
             val descriptor = call.descriptor as? ClassConstructorDescriptor
-                    ?: throw AssertionError("Class constructor expected: ${call.descriptor}")
+                ?: throw AssertionError("Class constructor expected: ${call.descriptor}")
             val constructorSymbol = context.symbolTable.referenceConstructor(descriptor.original)
             val irCall = IrDelegatingConstructorCallImpl(
                 startOffset, endOffset,
@@ -142,7 +143,8 @@ class CallGenerator(statementGenerator: StatementGenerator) : StatementGenerator
         return call.callReceiver.call { dispatchReceiverValue, extensionReceiverValue ->
             val superQualifierSymbol = call.superQualifier?.let { context.symbolTable.referenceClass(it) }
 
-            val getterDescriptor = descriptor.getter
+            val getterDescriptor = descriptor.unwrappedGetMethod
+
             if (getterDescriptor != null) {
                 val getterSymbol = context.symbolTable.referenceFunction(getterDescriptor.original)
                 IrGetterCallImpl(

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/OperatorExpressionGenerator.kt

@@ -236,7 +236,7 @@ class OperatorExpressionGenerator(statementGenerator: StatementGenerator) : Stat
         val comparisonType = comparisonInfo?.comparisonType
 
         val eqeqSymbol = context.irBuiltIns.ieee754equalsFunByOperandType[comparisonType]?.symbol
-                ?: context.irBuiltIns.eqeqSymbol
+            ?: context.irBuiltIns.eqeqSymbol
 
         val irEquals = IrBinaryPrimitiveImpl(
             expression.startOffset, expression.endOffset,
@@ -275,7 +275,7 @@ class OperatorExpressionGenerator(statementGenerator: StatementGenerator) : Stat
             val comparisonType = comparisonInfo.comparisonType
             val eqeqSymbol =
                 context.irBuiltIns.ieee754equalsFunByOperandType[comparisonType]?.symbol
-                        ?: context.irBuiltIns.eqeqSymbol
+                    ?: context.irBuiltIns.eqeqSymbol
             IrBinaryPrimitiveImpl(
                 startOffset, endOffset,
                 context.irBuiltIns.booleanType,