From 6daabca90b05271208bcb2963e0d8045ac09b1ef Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Fri, 11 May 2018 12:51:29 +0300 Subject: [PATCH] Fixed forgotten receivers during copying --- .../kotlin/ir/expressions/impl/IrPropertyAccessorCall.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrPropertyAccessorCall.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrPropertyAccessorCall.kt index e52e3b0250f..fa728be5281 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrPropertyAccessorCall.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrPropertyAccessorCall.kt @@ -110,7 +110,7 @@ class IrGetterCallImpl( IrGetterCallImpl( startOffset, endOffset, newCallee, descriptor, // TODO substitute descriptor for new callee? - typeArgumentsCount, newOrigin, newSuperQualifier + typeArgumentsCount, dispatchReceiver, extensionReceiver, newOrigin, newSuperQualifier ).also { newCall -> newCall.copyTypeArgumentsFrom(this) } @@ -121,6 +121,8 @@ class IrGetterCallImpl( createFunctionSymbol(newCallee), newCallee, typeArgumentsCount, + dispatchReceiver, + extensionReceiver, newOrigin, createClassSymbolOrNull(newSuperQualifier) ).also { newCall -> @@ -190,7 +192,7 @@ class IrSetterCallImpl( IrSetterCallImpl( startOffset, endOffset, newCallee, descriptor, // TODO substitute newCallee.descriptor? - typeArgumentsCount, newOrigin, newSuperQualifier + typeArgumentsCount, dispatchReceiver, extensionReceiver, argumentImpl!!, newOrigin, newSuperQualifier ).also { newCall -> newCall.copyTypeArgumentsFrom(this) } @@ -201,6 +203,9 @@ class IrSetterCallImpl( createFunctionSymbol(newCallee), newCallee, typeArgumentsCount, + dispatchReceiver, + extensionReceiver, + argumentImpl!!, newOrigin, createClassSymbolOrNull(newSuperQualifier) ).also { newCall ->