From 0b4d9513eb11f92b865bbdfd0269175becf9118b Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Thu, 7 Jun 2018 10:07:17 +0300 Subject: [PATCH] psi2ir: fix generating fake override for property with type parameters (cherry picked from commit 2051177) --- .../jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt index 698d6101273..cd2ba6f04ed 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt @@ -32,6 +32,7 @@ import org.jetbrains.kotlin.psi2ir.startOffsetOrUndefined import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.descriptorUtil.propertyIfAccessor class FunctionGenerator(declarationGenerator: DeclarationGenerator) : DeclarationGeneratorExtension(declarationGenerator) { @@ -89,7 +90,7 @@ class FunctionGenerator(declarationGenerator: DeclarationGenerator) : Declaratio ktParameterOwner: KtElement?, ktReceiverParameterElement: KtElement? ) { - declarationGenerator.generateScopedTypeParameterDeclarations(irFunction, irFunction.descriptor.typeParameters) + declarationGenerator.generateScopedTypeParameterDeclarations(irFunction, irFunction.descriptor.propertyIfAccessor.typeParameters) irFunction.returnType = irFunction.descriptor.returnType!!.toIrType() generateValueParameterDeclarations(irFunction, ktParameterOwner, ktReceiverParameterElement) }