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 6a055314b26..dcd473d68a5 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
@@ -48,6 +48,8 @@ internal data class FirToConstantValueTransformerData(
     val constValueProvider: ConstValueProvider?,
 )
 
+private val constantIntrinsicCalls = setOf("toByte", "toLong", "toShort", "toFloat", "toDouble", "toChar", "unaryMinus")
+
 internal abstract class FirToConstantValueTransformer(
     private val failOnNonConst: Boolean,
 ) : FirDefaultVisitor<ConstantValue<*>?, FirToConstantValueTransformerData>() {
@@ -162,22 +164,25 @@ internal abstract class FirToConstantValueTransformer(
             }
 
             symbol.callableId.packageName.asString() == "kotlin" -> {
+                val callableName = symbol.callableId.callableName.asString()
+                if (callableName !in constantIntrinsicCalls) return null
+
                 val dispatchReceiver = qualifiedAccessExpression.dispatchReceiver
-                val dispatchReceiverValue by lazy { dispatchReceiver.toConstantValue(data) }
-                when (symbol.callableId.callableName.asString()) {
-                    "toByte" -> ByteValue((dispatchReceiverValue!!.value as Number).toByte())
-                    "toLong" -> LongValue((dispatchReceiverValue!!.value as Number).toLong())
-                    "toShort" -> ShortValue((dispatchReceiverValue!!.value as Number).toShort())
-                    "toFloat" -> FloatValue((dispatchReceiverValue!!.value as Number).toFloat())
-                    "toDouble" -> DoubleValue((dispatchReceiverValue!!.value as Number).toDouble())
-                    "toChar" -> CharValue((dispatchReceiverValue!!.value as Number).toInt().toChar())
+                val dispatchReceiverValue = dispatchReceiver.toConstantValue(data) ?: return null
+                when (callableName) {
+                    "toByte" -> ByteValue((dispatchReceiverValue.value as Number).toByte())
+                    "toLong" -> LongValue((dispatchReceiverValue.value as Number).toLong())
+                    "toShort" -> ShortValue((dispatchReceiverValue.value as Number).toShort())
+                    "toFloat" -> FloatValue((dispatchReceiverValue.value as Number).toFloat())
+                    "toDouble" -> DoubleValue((dispatchReceiverValue.value as Number).toDouble())
+                    "toChar" -> CharValue((dispatchReceiverValue.value as Number).toInt().toChar())
                     "unaryMinus" -> {
-                        when (val receiverValue = dispatchReceiverValue) {
-                            is ByteValue -> ByteValue((-receiverValue.value).toByte())
-                            is LongValue -> LongValue(-receiverValue.value)
-                            is ShortValue -> ShortValue((-receiverValue.value).toShort())
-                            is FloatValue -> FloatValue(-receiverValue.value)
-                            is DoubleValue -> DoubleValue(-receiverValue.value)
+                        when (dispatchReceiverValue) {
+                            is ByteValue -> ByteValue((-dispatchReceiverValue.value).toByte())
+                            is LongValue -> LongValue(-dispatchReceiverValue.value)
+                            is ShortValue -> ShortValue((-dispatchReceiverValue.value).toShort())
+                            is FloatValue -> FloatValue(-dispatchReceiverValue.value)
+                            is DoubleValue -> DoubleValue(-dispatchReceiverValue.value)
                             else -> null
                         }
                     }
@@ -235,8 +240,6 @@ internal object FirToConstantValueChecker : FirDefaultVisitor<Boolean, FirSessio
         ConstantValueKind.Int, ConstantValueKind.UnsignedInt, ConstantValueKind.Long, ConstantValueKind.UnsignedLong,
     )
 
-    private val constantIntrinsicCalls = setOf("toByte", "toLong", "toShort", "toFloat", "toDouble", "toChar", "unaryMinus")
-
     override fun visitElement(element: FirElement, data: FirSession): Boolean {
         return false
     }
diff --git a/compiler/testData/cli/metadata/kt58139.args b/compiler/testData/cli/metadata/kt58139.args
index 5b28c78e2a3..bea481daf8c 100644
--- a/compiler/testData/cli/metadata/kt58139.args
+++ b/compiler/testData/cli/metadata/kt58139.args
@@ -4,4 +4,6 @@ $TESTDATA_DIR$/kt58139/platform.kt
 -language-version
 2.0
 -d
-$TEMP_DIR$
\ No newline at end of file
+$TEMP_DIR$
+-cp
+$TESTDATA_DIR$/../../../../dist/common/kotlin-stdlib-common.jar
\ No newline at end of file
diff --git a/compiler/testData/cli/metadata/kt58139/common.kt b/compiler/testData/cli/metadata/kt58139/common.kt
index e0d7209916e..087671e6bfa 100644
--- a/compiler/testData/cli/metadata/kt58139/common.kt
+++ b/compiler/testData/cli/metadata/kt58139/common.kt
@@ -6,3 +6,4 @@ annotation class AnnKlass(val arg: String)
 fun foo() {}
 
 const val BATCH_SIZE: Int = 16 * 1024
+const val REPLACEMENT_BYTE: Byte = '?'.code.toByte()
diff --git a/compiler/testData/cli/metadata/kt58139/platform.kt b/compiler/testData/cli/metadata/kt58139/platform.kt
index 6594306309b..ed8e51ae13a 100644
--- a/compiler/testData/cli/metadata/kt58139/platform.kt
+++ b/compiler/testData/cli/metadata/kt58139/platform.kt
@@ -1,4 +1,5 @@
 const val DOUBLE_BATCH_SIZE = 2 * BATCH_SIZE
+const val REPLACEMENT_BYTE_AS_INT = REPLACEMENT_BYTE.toInt()
 
 annotation class A(val value: Int)