From f8459f820170ff94813ff59e9ac8c50032d4c567 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Tue, 3 Sep 2019 16:29:24 +0300
Subject: [PATCH] [FIR] Fix result type of const expressions with expected type

---
 .../fir/resolve/transformers/FirBodyResolveTransformer.kt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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<ConeKotlinType>().withNullability(ConeNullability.NOT_NULL)
+                )
+            } else {
+                expectedType
+            }
         }