azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Add missing ensureResolved to FirClassSubstitutionScope

Browse Source 
`createNewTypeParametersAndSubstitutor` call might need resolved types
to be able to work correctly with the generics' type bounds
This commit is contained in:
Roman Golyshev
2021-10-28 13:58:12 +03:00
committed by TeamCityServer
parent 534beb8553
commit 29bb8cea8f
4 changed files with 184 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt
+2 -1
View File
@@ -255,6 +255,7 @@ class FirClassSubstitutionScope(
)
private fun createSubstitutedData(member: FirCallableDeclaration): SubstitutedData {
member.ensureResolved(FirResolvePhase.TYPES)
val (newTypeParameters, substitutor) = FirFakeOverrideGenerator.createNewTypeParametersAndSubstitutor(
session,
member as FirTypeParameterRefsOwner,
@@ -267,7 +268,7 @@ class FirClassSubstitutionScope(
val newDispatchReceiverType = dispatchReceiverTypeForSubstitutedMembers.substitute(substitutor)
member.symbol.ensureResolved(FirResolvePhase.STATUS)
member.ensureResolved(FirResolvePhase.STATUS)
val returnType = member.returnTypeRef.coneTypeSafe<ConeKotlinType>()
val fakeOverrideSubstitution = runIf(returnType == null) { FakeOverrideSubstitution(substitutor, member.symbol) }
val newReturnType = returnType?.substitute(substitutor)