From 63110ab636c0b809515e4728a94e9c661e7861e4 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Thu, 7 Nov 2019 16:35:13 +0300 Subject: [PATCH] [IR] Remove deprecated `correspondingProperty` from IrField --- .../src/org/jetbrains/kotlin/ir/declarations/IrField.kt | 3 --- .../jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt | 7 ------- .../jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt | 7 ------- .../common/serialization/SerializeDescriptorReference.kt | 4 ++-- .../compiler/backend/ir/SerializerIrGenerator.kt | 2 +- 5 files changed, 3 insertions(+), 20 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt index 63628b89322..546cfd53b2b 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt @@ -25,9 +25,6 @@ interface IrField : var initializer: IrExpressionBody? - @Deprecated("Use correspondingPropertySymbol") - var correspondingProperty: IrProperty? - var correspondingPropertySymbol: IrPropertySymbol? override val metadata: MetadataSource.Property? diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt index 005705aec6f..54c0bd8fbf6 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt @@ -82,13 +82,6 @@ class IrFieldImpl( override var initializer: IrExpressionBody? = null - @Suppress("OverridingDeprecatedMember") - override var correspondingProperty: IrProperty? - get() = correspondingPropertySymbol?.owner - set(value) { - correspondingPropertySymbol = value?.symbol - } - override var correspondingPropertySymbol: IrPropertySymbol? = null override val overriddenSymbols: MutableList = mutableListOf() diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt index 6a8f025f59e..85612375f65 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyField.kt @@ -89,13 +89,6 @@ class IrLazyField( } } - @Suppress("OverridingDeprecatedMember") - override var correspondingProperty: IrProperty? - get() = correspondingPropertySymbol?.owner - set(value) { - correspondingPropertySymbol = value?.symbol - } - override var correspondingPropertySymbol: IrPropertySymbol? by lazyVar { stubGenerator.generatePropertyStub(descriptor).symbol } 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 6e3d9e5453f..97d6fbeb1b2 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 @@ -64,7 +64,7 @@ open class DescriptorReferenceSerializer( val (packageFqName, classFqName) = extractPackageAndClassFqns(descriptor) ?: return null val isAccessor = declaration.isAccessor - val isBackingField = declaration is IrField && declaration.correspondingProperty != null + val isBackingField = declaration is IrField && declaration.correspondingPropertySymbol != null val isFakeOverride = declaration.origin == IrDeclarationOrigin.FAKE_OVERRIDE val isDefaultConstructor = descriptor is ClassConstructorDescriptor && containingDeclaration is ClassDescriptor && (containingDeclaration.kind == ClassKind.OBJECT) val isEnumEntry = descriptor is ClassDescriptor && descriptor.kind == ClassKind.ENUM_ENTRY @@ -90,7 +90,7 @@ open class DescriptorReferenceSerializer( val discoverableDescriptorsDeclaration: IrDeclaration? = if (isAccessor) { (realDeclaration as IrSimpleFunction).correspondingPropertySymbol!!.owner } else if (isBackingField) { - (realDeclaration as IrField).correspondingProperty!! + (realDeclaration as IrField).correspondingPropertySymbol!!.owner } else if (isDefaultConstructor || isEnumEntry) { null } else { diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt index b1685802f52..4c637d0a415 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt @@ -136,7 +136,7 @@ open class SerializerIrGenerator(val irClass: IrClass, final override val compil +addFieldCall(classProp) // add property annotations copySerialInfoAnnotationsToDescriptor( - classProp.irField.correspondingProperty?.annotations.orEmpty(), + classProp.irField.correspondingPropertySymbol?.owner?.annotations.orEmpty(), localDescriptor, serialDescImplClass.referenceMethod(CallingConventions.addAnnotation) )