diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt index d41fbb3a40e..96752ebf55c 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt @@ -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 diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt index 93115b4b9c2..62a0fdacf63 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt @@ -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 diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/CopyUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/CopyUtils.kt index 0bc064d1658..b4bc25ff502 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/CopyUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/CopyUtils.kt @@ -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 diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt index fb3a7fdf71e..78d39fb80de 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt @@ -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 diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt index e102d94a4ce..55afb709455 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt @@ -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 diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt index e29c7210b5d..49641d8b8a4 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirFakeOverrideGenerator.kt @@ -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