From ec1c2eb42ddb58213feefe121b58a3e1886b6794 Mon Sep 17 00:00:00 2001
From: Roman Artemev <roman.artemev@jetbrains.com>
Date: Mon, 28 Oct 2019 11:24:32 +0300
Subject: [PATCH] [IR] Remove deprecated `correspondingProperty` from
 IrSimpleFunction

---
 .../kotlin/backend/common/lower/LateinitLowering.kt        | 3 ++-
 .../jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt   | 3 ---
 .../kotlin/ir/declarations/impl/IrFunctionImpl.kt          | 7 -------
 .../kotlin/ir/declarations/lazy/IrLazyFunction.kt          | 7 -------
 .../common/serialization/SerializeDescriptorReference.kt   | 2 +-
 5 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LateinitLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LateinitLowering.kt
index 8027b041b93..9f56bb709b4 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LateinitLowering.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LateinitLowering.kt
@@ -172,7 +172,8 @@ open class LateinitLowering(val context: CommonBackendContext) : FileLoweringPas
 
                 val receiver = expression.extensionReceiver as IrPropertyReference
 
-                val property = receiver.getter?.owner?.resolveFakeOverride()?.correspondingProperty!!.also { assert(it.isLateinit) }
+                val property =
+                    receiver.getter?.owner?.resolveFakeOverride()?.correspondingPropertySymbol!!.owner.also { assert(it.isLateinit) }
 
                 val nullableField =
                     buildOrGetNullableField(property.backingField ?: error("Lateinit property is supposed to have backing field"))
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt
index 0b63fd44895..c224ee660e2 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt
@@ -30,9 +30,6 @@ interface IrSimpleFunction :
     val isSuspend: Boolean
     val isFakeOverride: Boolean
 
-    @Deprecated("Use correspondingPropertySymbol")
-    var correspondingProperty: IrProperty?
-
     var correspondingPropertySymbol: IrPropertySymbol?
 }
 
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt
index 7e1d5cc6d5b..b3853b64b95 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt
@@ -64,13 +64,6 @@ class IrFunctionImpl(
 
     override val overriddenSymbols: MutableList<IrSimpleFunctionSymbol> = SmartList()
 
-    @Suppress("OverridingDeprecatedMember")
-    override var correspondingProperty: IrProperty?
-        get() = correspondingPropertySymbol?.owner
-        set(value) {
-            correspondingPropertySymbol = value?.symbol
-        }
-
     override var correspondingPropertySymbol: IrPropertySymbol? = null
 
     // Used by kotlin-native in InteropLowering.kt and IrUtils2.kt
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt
index 254fbdd7fc5..b3e2fb1c7e7 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt
@@ -89,13 +89,6 @@ class IrLazyFunction(
         }
     }
 
-    @Suppress("OverridingDeprecatedMember")
-    override var correspondingProperty: IrProperty?
-        get() = correspondingPropertySymbol?.owner
-        set(value) {
-            correspondingPropertySymbol = value?.symbol
-        }
-
     override var correspondingPropertySymbol: IrPropertySymbol? = null
 
     init {
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/SerializeDescriptorReference.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/SerializeDescriptorReference.kt
index ce433e7d1fd..6e3d9e5453f 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/SerializeDescriptorReference.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/SerializeDescriptorReference.kt
@@ -88,7 +88,7 @@ open class DescriptorReferenceSerializer(
         }
 
         val discoverableDescriptorsDeclaration: IrDeclaration? = if (isAccessor) {
-            (realDeclaration as IrSimpleFunction).correspondingProperty!!
+            (realDeclaration as IrSimpleFunction).correspondingPropertySymbol!!.owner
         } else if (isBackingField) {
             (realDeclaration as IrField).correspondingProperty!!
         } else if (isDefaultConstructor || isEnumEntry) {