From 5cff8c15ab9c5eb095927db6d479ea1fbb6f1aad Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Sat, 15 Apr 2023 13:25:12 +0200 Subject: [PATCH] K2: fix intrinsic analysis in FirToConstantValueChecker #KT-57986 Fixed --- .../constant/FirToConstantValueTransformer.kt | 7 ++++--- compiler/testData/codegen/box/fir/toLong.kt | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/FirToConstantValueTransformer.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/FirToConstantValueTransformer.kt index 6eb30485acc..5723ea88cc8 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/FirToConstantValueTransformer.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/FirToConstantValueTransformer.kt @@ -214,6 +214,8 @@ internal object FirToConstantValueChecker : FirDefaultVisitor { val dispatchReceiver = qualifiedAccessExpression.dispatchReceiver when (symbol.callableId.callableName.asString()) { - in setOf("toByte", "toLong", "toShort", "toFloat", "toDouble", "toChar") -> true - "unaryMinus" -> dispatchReceiver.accept(this, data) - else -> false + !in constantIntrinsicCalls -> false + else -> dispatchReceiver.accept(this, data) } } diff --git a/compiler/testData/codegen/box/fir/toLong.kt b/compiler/testData/codegen/box/fir/toLong.kt index 82d8ca69798..42b584b910a 100644 --- a/compiler/testData/codegen/box/fir/toLong.kt +++ b/compiler/testData/codegen/box/fir/toLong.kt @@ -1,5 +1,4 @@ // ISSUE: KT-57986 -// IGNORE_BACKEND_K2: JS_IR, NATIVE // MODULE: m1 // FILE: m1.kt