From f434248cb797641c366c812753bf0c7e4160fe90 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Fri, 21 Jun 2019 18:48:36 +0300
Subject: [PATCH] FIR property getter: take return type from property even if
 it's error

---
 .../fir/resolve/transformers/FirBodyResolveTransformer.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 1febdf8c129..29572f74fd4 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
@@ -984,9 +984,6 @@ open class FirBodyResolveTransformer(
                             else -> resultType
                         }
                     )
-                    if (variable is FirProperty) {
-                        variable.getter.transformReturnTypeRef(this, variable.returnTypeRef)
-                    }
                 }
                 variable.delegate != null -> {
                     // TODO: type from delegate
@@ -1018,6 +1015,9 @@ open class FirBodyResolveTransformer(
                     )
                 }
             }
+            if (variable is FirProperty && variable.getter.returnTypeRef is FirImplicitTypeRef) {
+                variable.getter.transformReturnTypeRef(this, variable.returnTypeRef)
+            }
         }
     }