From fd279860f7b4937ef58bb388f8b2ac2c18efc550 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Thu, 18 Apr 2019 18:14:41 +0300
Subject: [PATCH] FIR resolve: provide unconditional typing for block

---
 .../fir/resolve/transformers/FirBodyResolveTransformer.kt      | 3 ++-
 1 file changed, 2 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 edc4a7c34c3..c823e6581f1 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
@@ -511,7 +511,8 @@ open class FirBodyResolveTransformer(val session: FirSession, val implicitTypeOn
             is FirExpression -> statement
             else -> null
         }
-        (resultExpression?.resultType as? FirResolvedTypeRef)?.let { block.resultType = it }
+        block.resultType = (resultExpression?.resultType as? FirResolvedTypeRef) ?: FirErrorTypeRefImpl(session, null, "No type for block")
+
         return block.compose()
     }