azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JVM_IR: remove .toKotlinType() from PromisedValue

Browse Source
This commit is contained in:
Georgy Bronnikov
2020-09-11 18:43:59 +03:00
parent 7c5e255fa3
commit c7f10c272a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/PromisedValue.kt
+3 -2
View File
@@ -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.backend.jvm.lower.inlineclasses.InlineClassAbi
import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.AsmUtil
import org.jetbrains.kotlin.codegen.StackValue import org.jetbrains.kotlin.codegen.StackValue
import org.jetbrains.kotlin.ir.descriptors.toIrBasedKotlinType
import org.jetbrains.kotlin.ir.types.* import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.util.parentAsClass import org.jetbrains.kotlin.ir.util.parentAsClass
import org.jetbrains.kotlin.resolve.jvm.AsmTypes import org.jetbrains.kotlin.resolve.jvm.AsmTypes
@@ -42,12 +43,12 @@ abstract class PromisedValue(val codegen: ExpressionCodegen, val type: Type, val
when { when {
isFromTypeUnboxed && !isToTypeUnboxed -> { isFromTypeUnboxed && !isToTypeUnboxed -> {
StackValue.boxInlineClass(erasedSourceType.toKotlinType(), mv) StackValue.boxInlineClass(erasedSourceType.toIrBasedKotlinType(), mv)
return return
} }
!isFromTypeUnboxed && isToTypeUnboxed -> { !isFromTypeUnboxed && isToTypeUnboxed -> {
StackValue.unboxInlineClass(type, erasedTargetType.toKotlinType(), mv) StackValue.unboxInlineClass(type, erasedTargetType.toIrBasedKotlinType(), mv)
return return
} }
} }