FIR: Substitute dispatch receiver in substitution overrides

2021-10-28 16:02:10 +03:00
parent 6cf2c6f93a
commit 2e01377ce0
1 changed files with 6 additions and 2 deletions
@@ -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
        )
    }
 }