From 8e331c8afeb985b79d9208cb216e5f6dc42fb285 Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Sun, 18 Oct 2020 14:15:35 +0300 Subject: [PATCH] IR: relax type cast for WrappedVariableDescriptor.containingDeclaration --- .../org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt | 2 +- .../org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt | 2 +- 2 files changed, 2 insertions(+), 2 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 e80bb19bd98..f4fd06ee9bf 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 @@ -308,7 +308,7 @@ fun IrTypeParameter.toIrBasedDescriptor() = IrBasedTypeParameterDescriptor(this) open class IrBasedVariableDescriptor(owner: IrVariable) : VariableDescriptor, IrBasedCallableDescriptor(owner) { - override fun getContainingDeclaration() = (owner.parent as IrFunction).toIrBasedDescriptor() + override fun getContainingDeclaration() = (owner.parent as IrDeclaration).toIrBasedDescriptor() override fun getType() = owner.type.toIrBasedKotlinType() override fun getReturnType() = getType() override fun getName() = owner.name diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt index dbedd98a63f..3d5fced9fa4 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt @@ -303,7 +303,7 @@ open class WrappedTypeParameterDescriptor : TypeParameterDescriptor, WrappedDecl @OptIn(ObsoleteDescriptorBasedAPI::class) open class WrappedVariableDescriptor : VariableDescriptor, WrappedCallableDescriptor() { - override fun getContainingDeclaration() = (owner.parent as IrFunction).descriptor + override fun getContainingDeclaration() = (owner.parent as IrDeclaration).descriptor override fun getType() = owner.type.toKotlinType() override fun getReturnType() = getType() override fun getName() = owner.name