From 8343ca093c7941518317f57f0a93881eaed4fbcf Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Thu, 17 Sep 2020 12:42:46 +0300 Subject: [PATCH] IR: bugfix in wrapped, IR-based descriptors --- .../org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt | 4 +++- .../org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt | 4 +++- 2 files changed, 6 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 1c88ff33f3f..e80bb19bd98 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 @@ -242,7 +242,7 @@ fun IrValueParameter.toIrBasedDescriptor() = IrBasedValueParameterDescriptor(this) open class IrBasedTypeParameterDescriptor(owner: IrTypeParameter) : TypeParameterDescriptor, - IrBasedCallableDescriptor(owner) { + IrBasedDeclarationDescriptor(owner) { override fun getName() = owner.name override fun isReified() = owner.isReified @@ -273,6 +273,8 @@ open class IrBasedTypeParameterDescriptor(owner: IrTypeParameter) : TypeParamete override fun getOriginal() = this + override fun getSource() = SourceElement.NO_SOURCE + override fun getIndex() = owner.index override fun isCapturedFromOuterDeclaration() = false 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 07c9b8ac64b..d9419aec6d9 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 @@ -236,7 +236,7 @@ open class WrappedReceiverParameterDescriptor : ReceiverParameterDescriptor, Wra } @OptIn(ObsoleteDescriptorBasedAPI::class) -open class WrappedTypeParameterDescriptor : TypeParameterDescriptor, WrappedCallableDescriptor() { +open class WrappedTypeParameterDescriptor : TypeParameterDescriptor, WrappedDeclarationDescriptor() { override fun getName() = owner.name override fun isReified() = owner.isReified @@ -267,6 +267,8 @@ open class WrappedTypeParameterDescriptor : TypeParameterDescriptor, WrappedCall override fun getOriginal() = this + override fun getSource() = SourceElement.NO_SOURCE + override fun getIndex() = owner.index override fun isCapturedFromOuterDeclaration() = false