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 ) } }