From 2e01377ce020338604fa91775a4f14dccef2bec7 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <simon.ogorodnik@jetbrains.com>
Date: Thu, 28 Oct 2021 16:02:10 +0300
Subject: [PATCH] FIR: Substitute dispatch receiver in substitution overrides

---
 .../jetbrains/kotlin/fir/scopes/FirKotlinScopeProvider.kt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/FirKotlinScopeProvider.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/FirKotlinScopeProvider.kt
index d097c11b87e..61e076db428 100644
--- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/FirKotlinScopeProvider.kt
+++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/FirKotlinScopeProvider.kt
@@ -165,8 +165,12 @@ private fun FirClass.scopeForClassImpl(
         this, key
     ) {
         FirClassSubstitutionScope(
-            useSiteSession, basicScope, key, substitutor, classFirDispatchReceiver.defaultType(),
-            skipPrivateMembers, makeExpect = isFromExpectClass
+            useSiteSession,
+            basicScope,
+            key, substitutor,
+            substitutor.substituteOrSelf(classFirDispatchReceiver.defaultType()) as ConeClassLikeType,
+            skipPrivateMembers,
+            makeExpect = isFromExpectClass
         )
     }
 }