[IR] Remove deprecated correspondingProperty from IrSimpleFunction
This commit is contained in:
+2
-1
@@ -172,7 +172,8 @@ open class LateinitLowering(val context: CommonBackendContext) : FileLoweringPas
|
|||||||
|
|
||||||
val receiver = expression.extensionReceiver as IrPropertyReference
|
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 =
|
val nullableField =
|
||||||
buildOrGetNullableField(property.backingField ?: error("Lateinit property is supposed to have backing field"))
|
buildOrGetNullableField(property.backingField ?: error("Lateinit property is supposed to have backing field"))
|
||||||
|
|||||||
@@ -30,9 +30,6 @@ interface IrSimpleFunction :
|
|||||||
val isSuspend: Boolean
|
val isSuspend: Boolean
|
||||||
val isFakeOverride: Boolean
|
val isFakeOverride: Boolean
|
||||||
|
|
||||||
@Deprecated("Use correspondingPropertySymbol")
|
|
||||||
var correspondingProperty: IrProperty?
|
|
||||||
|
|
||||||
var correspondingPropertySymbol: IrPropertySymbol?
|
var correspondingPropertySymbol: IrPropertySymbol?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -64,13 +64,6 @@ class IrFunctionImpl(
|
|||||||
|
|
||||||
override val overriddenSymbols: MutableList<IrSimpleFunctionSymbol> = SmartList()
|
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
|
override var correspondingPropertySymbol: IrPropertySymbol? = null
|
||||||
|
|
||||||
// Used by kotlin-native in InteropLowering.kt and IrUtils2.kt
|
// Used by kotlin-native in InteropLowering.kt and IrUtils2.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
|
override var correspondingPropertySymbol: IrPropertySymbol? = null
|
||||||
|
|
||||||
init {
|
init {
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ open class DescriptorReferenceSerializer(
|
|||||||
}
|
}
|
||||||
|
|
||||||
val discoverableDescriptorsDeclaration: IrDeclaration? = if (isAccessor) {
|
val discoverableDescriptorsDeclaration: IrDeclaration? = if (isAccessor) {
|
||||||
(realDeclaration as IrSimpleFunction).correspondingProperty!!
|
(realDeclaration as IrSimpleFunction).correspondingPropertySymbol!!.owner
|
||||||
} else if (isBackingField) {
|
} else if (isBackingField) {
|
||||||
(realDeclaration as IrField).correspondingProperty!!
|
(realDeclaration as IrField).correspondingProperty!!
|
||||||
} else if (isDefaultConstructor || isEnumEntry) {
|
} else if (isDefaultConstructor || isEnumEntry) {
|
||||||
|
|||||||
Reference in New Issue
Block a user