From be413e4fabc27e3add0b7c03443454f41ca1063f Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Thu, 7 Jun 2018 10:06:47 +0300 Subject: [PATCH] psi2ir: don't generate accessor type parameter supertypes twice (cherry picked from commit 22e6d5f) --- .../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 cdaead48e66..698d6101273 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 @@ -105,7 +105,8 @@ class FunctionGenerator(declarationGenerator: DeclarationGenerator) : Declaratio if (ktAccessor != null) IrDeclarationOrigin.DEFINED else IrDeclarationOrigin.DEFAULT_PROPERTY_ACCESSOR ).buildWithScope { irAccessor -> declarationGenerator.generateScopedTypeParameterDeclarations(irAccessor, descriptor.correspondingProperty.typeParameters) - generateFunctionParameterDeclarationsAndReturnType(irAccessor, ktAccessor ?: ktProperty, ktProperty.receiverTypeReference) + irAccessor.returnType = irAccessor.descriptor.returnType!!.toIrType() + generateValueParameterDeclarations(irAccessor, ktAccessor ?: ktProperty, ktProperty.receiverTypeReference) val ktBodyExpression = ktAccessor?.bodyExpression irAccessor.body = if (ktBodyExpression != null)