From 5f57311015a0f6b24096d3de1f97884c09e32366 Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Fri, 11 Sep 2020 11:19:19 +0300 Subject: [PATCH] JVM_IR: remove .toKotlinType() from intrinsics.Equals --- .../org/jetbrains/kotlin/backend/jvm/intrinsics/Equals.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Equals.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Equals.kt index c94a8ca34f3..b8663aef106 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Equals.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/Equals.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive import org.jetbrains.kotlin.codegen.StackValue import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods import org.jetbrains.kotlin.config.LanguageFeature +import org.jetbrains.kotlin.ir.descriptors.toIrBasedKotlinType import org.jetbrains.kotlin.ir.expressions.IrExpression import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin @@ -172,11 +173,11 @@ class Ieee754Equals(val operandType: Type) : IntrinsicMethod() { val arg0 = expression.getValueArgument(0)!! val arg1 = expression.getValueArgument(1)!! - val arg0Type = arg0.type.toKotlinType() + val arg0Type = arg0.type.toIrBasedKotlinType() if (!arg0Type.isPrimitiveNumberOrNullableType() && !arg0Type.upperBoundedByPrimitiveNumberOrNullableType()) throw AssertionError("Should be primitive or nullable primitive type: $arg0Type") - val arg1Type = arg1.type.toKotlinType() + val arg1Type = arg1.type.toIrBasedKotlinType() if (!arg1Type.isPrimitiveNumberOrNullableType() && !arg1Type.upperBoundedByPrimitiveNumberOrNullableType()) throw AssertionError("Should be primitive or nullable primitive type: $arg1Type")