From b79e9c9f90312c34b1ab5e9d4a5206a0f4d29ebc Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Fri, 26 Nov 2021 14:27:09 +0300 Subject: [PATCH] IR: Compute IrBasedDescriptor.isExpect where possible --- .../jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt index 6ca946b8a92..34bf68e31d0 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt @@ -409,7 +409,7 @@ open class IrBasedSimpleFunctionDescriptor(owner: IrSimpleFunction) : SimpleFunc override fun isTailrec() = owner.isTailrec override fun isInline() = owner.isInline - override fun isExpect() = false + override fun isExpect() = owner.isExpect override fun isActual() = false override fun isInfix() = false override fun isOperator() = false @@ -532,7 +532,7 @@ open class IrBasedClassConstructorDescriptor(owner: IrConstructor) : ClassConstr override fun isPrimary() = owner.isPrimary - override fun isExpect() = false + override fun isExpect() = owner.isExpect override fun isTailrec() = false @@ -630,7 +630,7 @@ open class IrBasedClassDescriptor(owner: IrClass) : ClassDescriptor, IrBasedDecl override fun getOriginal() = this - override fun isExpect() = false + override fun isExpect() = owner.isExpect override fun substitute(substitutor: TypeSubstitutor): ClassifierDescriptorWithTypeParameters = throw UnsupportedOperationException("IrBased descriptors SHOULD NOT be substituted") @@ -850,7 +850,7 @@ open class IrBasedPropertyDescriptor(owner: IrProperty) : override fun getOriginal() = this - override fun isExpect() = false + override fun isExpect() = owner.isExpect override fun substitute(substitutor: TypeSubstitutor): PropertyDescriptor = throw UnsupportedOperationException("IrBased descriptors SHOULD NOT be substituted")