From 5927ae84123711cc2a883c9bfde750f6f7d992b5 Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Mon, 28 Jan 2019 18:17:24 +0300 Subject: [PATCH] Replaced code on descriptors to code on IR --- .../jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt index b133a3a173d..acb3e5b16e2 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.config.languageVersionSettings import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.ValueDescriptor import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor -import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.builders.irCall @@ -278,7 +277,7 @@ internal class FunctionInlining(val context: Context) : IrElementTransformerVoid val isImmutableVariableLoad: Boolean get() = argumentExpression.let { - it is IrGetValue && !it.descriptor.let { it is VariableDescriptor && it.isVar } + it is IrGetValue && !it.symbol.owner.let { it is IrVariable && it.isVar } } }