[FIR] Add forgotten settings of resolve phase

This commit is contained in:
Dmitriy Novozhilov
2021-07-08 15:35:17 +03:00
committed by teamcityserver
parent 9f161f16b3
commit 8df56af068
6 changed files with 7 additions and 0 deletions
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.deserialization
import org.jetbrains.kotlin.builtins.functions.FunctionClassKind
import org.jetbrains.kotlin.fir.FirModuleData
import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRefsOwner
import org.jetbrains.kotlin.fir.declarations.utils.addDefaultBoundIfNecessary
import org.jetbrains.kotlin.fir.declarations.builder.FirTypeParameterBuilder
@@ -68,6 +69,7 @@ class FirTypeDeserializer(
}
builders += FirTypeParameterBuilder().apply {
moduleData = this@FirTypeDeserializer.moduleData
resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
origin = FirDeclarationOrigin.Library
this.name = name
this.symbol = symbol
@@ -113,6 +113,7 @@ class JavaSymbolProvider(
return FirTypeParameterBuilder().apply {
moduleData = this@JavaSymbolProvider.baseModuleData
origin = FirDeclarationOrigin.Java
resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
this.name = this@toFirTypeParameter.name
symbol = firSymbol
variance = INVARIANT
@@ -122,6 +122,7 @@ fun FirTypeParameter.copy(
): FirTypeParameter {
return buildTypeParameter {
source = this@copy.source
resolvePhase = this@copy.resolvePhase
moduleData = this@copy.moduleData
name = this@copy.name
symbol = this@copy.symbol
@@ -136,6 +136,7 @@ class FirSamResolverImpl(
source = declaredTypeParameter.source
moduleData = firSession.moduleData
origin = FirDeclarationOrigin.SamConstructor
resolvePhase = FirResolvePhase.DECLARATIONS
name = declaredTypeParameter.name
this.symbol = FirTypeParameterSymbol()
variance = Variance.INVARIANT
@@ -224,6 +224,7 @@ class FirSyntheticCallGenerator(
buildTypeParameter {
moduleData = session.moduleData
origin = FirDeclarationOrigin.Library
resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
name = Name.identifier("K")
symbol = typeParameterSymbol
variance = Variance.INVARIANT
@@ -480,6 +480,7 @@ object FirFakeOverrideGenerator {
source = typeParameter.source
moduleData = typeParameter.moduleData
origin = FirDeclarationOrigin.SubstitutionOverride
resolvePhase = FirResolvePhase.DECLARATIONS
name = typeParameter.name
symbol = FirTypeParameterSymbol()
variance = typeParameter.variance