From c7f10c272a9c23262611684cba22891dc9b3007c Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Fri, 11 Sep 2020 18:43:59 +0300 Subject: [PATCH] JVM_IR: remove .toKotlinType() from PromisedValue --- .../jetbrains/kotlin/backend/jvm/codegen/PromisedValue.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/PromisedValue.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/PromisedValue.kt index 36e5eeebc7c..2b04dcdac52 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/PromisedValue.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/PromisedValue.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.backend.jvm.ir.erasedUpperBound import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.InlineClassAbi import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.StackValue +import org.jetbrains.kotlin.ir.descriptors.toIrBasedKotlinType import org.jetbrains.kotlin.ir.types.* import org.jetbrains.kotlin.ir.util.parentAsClass import org.jetbrains.kotlin.resolve.jvm.AsmTypes @@ -42,12 +43,12 @@ abstract class PromisedValue(val codegen: ExpressionCodegen, val type: Type, val when { isFromTypeUnboxed && !isToTypeUnboxed -> { - StackValue.boxInlineClass(erasedSourceType.toKotlinType(), mv) + StackValue.boxInlineClass(erasedSourceType.toIrBasedKotlinType(), mv) return } !isFromTypeUnboxed && isToTypeUnboxed -> { - StackValue.unboxInlineClass(type, erasedTargetType.toKotlinType(), mv) + StackValue.unboxInlineClass(type, erasedTargetType.toIrBasedKotlinType(), mv) return } }