From 67158caf7300caadd62aa39785b11a468619fa6e Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 4 Jun 2020 18:42:31 +0300 Subject: [PATCH] FunctionGenerator: use owner instead of descriptor --- .../kotlin/ir2cfg/generators/FunctionGenerator.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/compiler/ir/ir.ir2cfg/src/org/jetbrains/kotlin/ir2cfg/generators/FunctionGenerator.kt b/compiler/ir/ir.ir2cfg/src/org/jetbrains/kotlin/ir2cfg/generators/FunctionGenerator.kt index b41f2c45934..536a78df120 100644 --- a/compiler/ir/ir.ir2cfg/src/org/jetbrains/kotlin/ir2cfg/generators/FunctionGenerator.kt +++ b/compiler/ir/ir.ir2cfg/src/org/jetbrains/kotlin/ir2cfg/generators/FunctionGenerator.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.ir2cfg.generators -import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.declarations.IrFunction @@ -177,9 +176,9 @@ class FunctionGenerator(val function: IrFunction) { override fun visitMemberAccess(expression: IrMemberAccessExpression, data: Boolean): IrStatement? { expression.dispatchReceiver?.process() expression.extensionReceiver?.process() - val descriptor = expression.symbol.descriptor as CallableDescriptor - for (valueParameter in descriptor.valueParameters) { - expression.getValueArgument(valueParameter)?.process() + val callee = expression.symbol.owner as IrFunction + for (valueParameter in callee.valueParameters) { + expression.getValueArgument(valueParameter.index)?.process() } if (data) { builder.add(expression)