azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IR] Remove deprecated correspondingProperty from IrField

Browse Source
This commit is contained in:
Roman Artemev
2019-11-07 16:35:13 +03:00
committed by romanart
parent 646df8d40a
commit 63110ab636
5 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/SerializeDescriptorReference.kt
+2 -2
View File
@@ -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 {