[IR] Remove deprecated correspondingProperty from IrField
This commit is contained in:
@@ -25,9 +25,6 @@ interface IrField :
|
|||||||
|
|
||||||
var initializer: IrExpressionBody?
|
var initializer: IrExpressionBody?
|
||||||
|
|
||||||
@Deprecated("Use correspondingPropertySymbol")
|
|
||||||
var correspondingProperty: IrProperty?
|
|
||||||
|
|
||||||
var correspondingPropertySymbol: IrPropertySymbol?
|
var correspondingPropertySymbol: IrPropertySymbol?
|
||||||
|
|
||||||
override val metadata: MetadataSource.Property?
|
override val metadata: MetadataSource.Property?
|
||||||
|
|||||||
@@ -82,13 +82,6 @@ class IrFieldImpl(
|
|||||||
|
|
||||||
override var initializer: IrExpressionBody? = null
|
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 var correspondingPropertySymbol: IrPropertySymbol? = null
|
||||||
|
|
||||||
override val overriddenSymbols: MutableList<IrFieldSymbol> = mutableListOf()
|
override val overriddenSymbols: MutableList<IrFieldSymbol> = mutableListOf()
|
||||||
|
|||||||
@@ -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 {
|
override var correspondingPropertySymbol: IrPropertySymbol? by lazyVar {
|
||||||
stubGenerator.generatePropertyStub(descriptor).symbol
|
stubGenerator.generatePropertyStub(descriptor).symbol
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -64,7 +64,7 @@ open class DescriptorReferenceSerializer(
|
|||||||
val (packageFqName, classFqName) = extractPackageAndClassFqns(descriptor) ?: return null
|
val (packageFqName, classFqName) = extractPackageAndClassFqns(descriptor) ?: return null
|
||||||
|
|
||||||
val isAccessor = declaration.isAccessor
|
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 isFakeOverride = declaration.origin == IrDeclarationOrigin.FAKE_OVERRIDE
|
||||||
val isDefaultConstructor = descriptor is ClassConstructorDescriptor && containingDeclaration is ClassDescriptor && (containingDeclaration.kind == ClassKind.OBJECT)
|
val isDefaultConstructor = descriptor is ClassConstructorDescriptor && containingDeclaration is ClassDescriptor && (containingDeclaration.kind == ClassKind.OBJECT)
|
||||||
val isEnumEntry = descriptor is ClassDescriptor && descriptor.kind == ClassKind.ENUM_ENTRY
|
val isEnumEntry = descriptor is ClassDescriptor && descriptor.kind == ClassKind.ENUM_ENTRY
|
||||||
@@ -90,7 +90,7 @@ open class DescriptorReferenceSerializer(
|
|||||||
val discoverableDescriptorsDeclaration: IrDeclaration? = if (isAccessor) {
|
val discoverableDescriptorsDeclaration: IrDeclaration? = if (isAccessor) {
|
||||||
(realDeclaration as IrSimpleFunction).correspondingPropertySymbol!!.owner
|
(realDeclaration as IrSimpleFunction).correspondingPropertySymbol!!.owner
|
||||||
} else if (isBackingField) {
|
} else if (isBackingField) {
|
||||||
(realDeclaration as IrField).correspondingProperty!!
|
(realDeclaration as IrField).correspondingPropertySymbol!!.owner
|
||||||
} else if (isDefaultConstructor || isEnumEntry) {
|
} else if (isDefaultConstructor || isEnumEntry) {
|
||||||
null
|
null
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
+1
-1
@@ -136,7 +136,7 @@ open class SerializerIrGenerator(val irClass: IrClass, final override val compil
|
|||||||
+addFieldCall(classProp)
|
+addFieldCall(classProp)
|
||||||
// add property annotations
|
// add property annotations
|
||||||
copySerialInfoAnnotationsToDescriptor(
|
copySerialInfoAnnotationsToDescriptor(
|
||||||
classProp.irField.correspondingProperty?.annotations.orEmpty(),
|
classProp.irField.correspondingPropertySymbol?.owner?.annotations.orEmpty(),
|
||||||
localDescriptor,
|
localDescriptor,
|
||||||
serialDescImplClass.referenceMethod(CallingConventions.addAnnotation)
|
serialDescImplClass.referenceMethod(CallingConventions.addAnnotation)
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user