From 9f06c1a500a856bbca298d7db9a6aed9e5ca9fb5 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Thu, 14 Jan 2021 18:26:32 +0300
Subject: [PATCH] FIR cleanup: runResolverForDelegatingConstructor

---
 .../resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt   | 2 +-
 .../body/resolve/FirExpressionsResolveTransformer.kt          | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
index 96063040316..655c3f8994e 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
@@ -289,7 +289,7 @@ class FirCallResolver(
     fun resolveDelegatingConstructorCall(
         delegatedConstructorCall: FirDelegatedConstructorCall,
         constructedType: ConeClassLikeType
-    ): FirDelegatedConstructorCall? {
+    ): FirDelegatedConstructorCall {
         val name = Name.special("<init>")
         val symbol = constructedType.lookupTag.toSymbol(components.session)
         val typeArguments =
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
index 1c186683cf5..62c48e0ceb6 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
@@ -809,9 +809,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform
                 else -> return delegatedConstructorCall.compose()
             }
 
-            val resolvedCall =
-                callResolver.resolveDelegatingConstructorCall(delegatedConstructorCall, constructorType)
-                    ?: return delegatedConstructorCall.compose()
+            val resolvedCall = callResolver.resolveDelegatingConstructorCall(delegatedConstructorCall, constructorType)
             if (reference is FirThisReference && reference.boundSymbol == null) {
                 resolvedCall.dispatchReceiver.typeRef.coneTypeSafe<ConeClassLikeType>()?.lookupTag?.toSymbol(session)?.let {
                     reference.replaceBoundSymbol(it)