From 15918fc475cc2d505c82aa83da29d8ae95303443 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 28 Feb 2019 12:43:42 +0300 Subject: [PATCH] IR: deprecations --- .../org/jetbrains/kotlin/ir/declarations/IrField.kt | 2 ++ .../kotlin/ir/declarations/IrSimpleFunction.kt | 2 ++ .../kotlin/ir/declarations/impl/IrFieldImpl.kt | 1 + .../kotlin/ir/declarations/impl/IrFunctionImpl.kt | 1 + .../kotlin/ir/declarations/impl/IrPropertyImpl.kt | 10 +++++----- .../kotlin/ir/declarations/lazy/IrLazyFunction.kt | 1 + .../ir/expressions/impl/IrPropertyReferenceImpl.kt | 2 +- 7 files changed, 13 insertions(+), 6 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 826719420f9..6343e55faa1 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 @@ -22,7 +22,9 @@ interface IrField : IrSymbolDeclaration, IrOverridableDeclaration 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/IrSimpleFunction.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt index 22f7ea46eb1..501417cb2ea 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 @@ -29,7 +29,9 @@ interface IrSimpleFunction : val isTailrec: Boolean val isSuspend: Boolean + @Deprecated("Use correspondingPropertySymbol") var correspondingProperty: IrProperty? + var correspondingPropertySymbol: IrPropertySymbol? } 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 632a495367c..1e22f9dc956 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 @@ -79,6 +79,7 @@ class IrFieldImpl( override var initializer: IrExpressionBody? = null + @Suppress("OverridingDeprecatedMember") override var correspondingProperty: IrProperty? get() = correspondingPropertySymbol?.owner set(value) { 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 659398adf5b..d56d45d8572 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 @@ -61,6 +61,7 @@ class IrFunctionImpl( override val overriddenSymbols: MutableList = SmartList() + @Suppress("OverridingDeprecatedMember") override var correspondingProperty: IrProperty? get() = correspondingPropertySymbol?.owner set(value) { diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt index 2fe547a16ae..25e30562e11 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt @@ -44,7 +44,7 @@ class IrPropertyImpl( ) : IrDeclarationBase(startOffset, endOffset, origin), IrProperty { - @Deprecated(message = "Don't use descriptor-based API for IrProperty", level = DeprecationLevel.ERROR) + @Deprecated(message = "Don't use descriptor-based API for IrProperty", level = DeprecationLevel.WARNING) constructor( startOffset: Int, endOffset: Int, @@ -69,7 +69,7 @@ class IrPropertyImpl( isExternal = isExternal ) - @Deprecated(message = "Don't use descriptor-based API for IrProperty", level = DeprecationLevel.ERROR) + @Deprecated(message = "Don't use descriptor-based API for IrProperty", level = DeprecationLevel.WARNING) constructor( startOffset: Int, endOffset: Int, @@ -86,7 +86,7 @@ class IrPropertyImpl( isExternal = descriptor.isEffectivelyExternal() ) - @Deprecated(message = "Don't use descriptor-based API for IrProperty", level = DeprecationLevel.ERROR) + @Deprecated(message = "Don't use descriptor-based API for IrProperty", level = DeprecationLevel.WARNING) constructor( startOffset: Int, endOffset: Int, @@ -94,7 +94,7 @@ class IrPropertyImpl( descriptor: PropertyDescriptor ) : this(startOffset, endOffset, origin, descriptor.isDelegated, descriptor) - @Deprecated(message = "Don't use descriptor-based API for IrProperty", level = DeprecationLevel.ERROR) + @Deprecated(message = "Don't use descriptor-based API for IrProperty", level = DeprecationLevel.WARNING) constructor( startOffset: Int, endOffset: Int, @@ -106,7 +106,7 @@ class IrPropertyImpl( this.backingField = backingField } - @Deprecated(message = "Don't use descriptor-based API for IrProperty", level = DeprecationLevel.ERROR) + @Deprecated(message = "Don't use descriptor-based API for IrProperty", level = DeprecationLevel.WARNING) constructor( startOffset: Int, endOffset: Int, 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 1ef4a682b26..a49262821f2 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 @@ -85,6 +85,7 @@ class IrLazyFunction( } } + @Suppress("OverridingDeprecatedMember") override var correspondingProperty: IrProperty? get() = correspondingPropertySymbol?.owner set(value) { diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrPropertyReferenceImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrPropertyReferenceImpl.kt index 001e9891c28..a9d5af76fe5 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrPropertyReferenceImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrPropertyReferenceImpl.kt @@ -40,7 +40,7 @@ class IrPropertyReferenceImpl( IrNoArgumentsCallableReferenceBase(startOffset, endOffset, type, typeArgumentsCount, origin), IrPropertyReference { - @Deprecated(message = "Don't use descriptor-based API for IrPropertyReference", level = DeprecationLevel.ERROR) + @Deprecated(message = "Don't use descriptor-based API for IrPropertyReference", level = DeprecationLevel.WARNING) constructor( startOffset: Int, endOffset: Int,