diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirBodyResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirBodyResolveTransformer.kt index a7ea87ef063..bf7a90ce9f1 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirBodyResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirBodyResolveTransformer.kt @@ -585,7 +585,13 @@ open class FirBodyResolveTransformer( constExpression.resultType = FirResolvedTypeRefImpl(null, type, emptyList()) } else { - constExpression.resultType = expectedType + constExpression.resultType = if (kind != IrConstKind.Null) { + expectedType.resolvedTypeFromPrototype( + expectedType.coneTypeUnsafe().withNullability(ConeNullability.NOT_NULL) + ) + } else { + expectedType + } }