From 7989a0ff250112619863a984d0d1cb3fa6f1a6e7 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Wed, 26 Oct 2016 12:34:34 +0300 Subject: [PATCH] Use original descriptor on delegating to DefaultImpls --- .../kotlin/backend/jvm/lower/InterfaceDelegationLowering.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceDelegationLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceDelegationLowering.kt index 2faff6a2e17..fd4fcc76742 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceDelegationLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceDelegationLowering.kt @@ -74,7 +74,7 @@ class InterfaceDelegationLowering(val state: GenerationState) : IrElementTransfo val interfaceDescriptor = interfaceFun.containingDeclaration as ClassDescriptor val defaultImpls = InterfaceLowering.createDefaultImplsClassDescriptor(interfaceDescriptor) - val defaultImplFun = InterfaceLowering.createDefaultImplFunDescriptor(defaultImpls, interfaceFun, interfaceDescriptor, state.typeMapper) + val defaultImplFun = InterfaceLowering.createDefaultImplFunDescriptor(defaultImpls, interfaceFun.original, interfaceDescriptor, state.typeMapper) val returnType = inheritedFun.returnType!! val irCallImpl = IrCallImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, returnType, defaultImplFun, null, JvmLoweredStatementOrigin.DEFAULT_IMPLS_DELEGATION) irBody.statements.add(IrReturnImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, returnType, inheritedFun, irCallImpl))