[FIR] Add forgotten settings of resolve phase
This commit is contained in:
committed by
teamcityserver
parent
9f161f16b3
commit
8df56af068
+2
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.deserialization
|
|||||||
import org.jetbrains.kotlin.builtins.functions.FunctionClassKind
|
import org.jetbrains.kotlin.builtins.functions.FunctionClassKind
|
||||||
import org.jetbrains.kotlin.fir.FirModuleData
|
import org.jetbrains.kotlin.fir.FirModuleData
|
||||||
import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
|
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.FirTypeParameterRefsOwner
|
||||||
import org.jetbrains.kotlin.fir.declarations.utils.addDefaultBoundIfNecessary
|
import org.jetbrains.kotlin.fir.declarations.utils.addDefaultBoundIfNecessary
|
||||||
import org.jetbrains.kotlin.fir.declarations.builder.FirTypeParameterBuilder
|
import org.jetbrains.kotlin.fir.declarations.builder.FirTypeParameterBuilder
|
||||||
@@ -68,6 +69,7 @@ class FirTypeDeserializer(
|
|||||||
}
|
}
|
||||||
builders += FirTypeParameterBuilder().apply {
|
builders += FirTypeParameterBuilder().apply {
|
||||||
moduleData = this@FirTypeDeserializer.moduleData
|
moduleData = this@FirTypeDeserializer.moduleData
|
||||||
|
resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
|
||||||
origin = FirDeclarationOrigin.Library
|
origin = FirDeclarationOrigin.Library
|
||||||
this.name = name
|
this.name = name
|
||||||
this.symbol = symbol
|
this.symbol = symbol
|
||||||
|
|||||||
@@ -113,6 +113,7 @@ class JavaSymbolProvider(
|
|||||||
return FirTypeParameterBuilder().apply {
|
return FirTypeParameterBuilder().apply {
|
||||||
moduleData = this@JavaSymbolProvider.baseModuleData
|
moduleData = this@JavaSymbolProvider.baseModuleData
|
||||||
origin = FirDeclarationOrigin.Java
|
origin = FirDeclarationOrigin.Java
|
||||||
|
resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
|
||||||
this.name = this@toFirTypeParameter.name
|
this.name = this@toFirTypeParameter.name
|
||||||
symbol = firSymbol
|
symbol = firSymbol
|
||||||
variance = INVARIANT
|
variance = INVARIANT
|
||||||
|
|||||||
@@ -122,6 +122,7 @@ fun FirTypeParameter.copy(
|
|||||||
): FirTypeParameter {
|
): FirTypeParameter {
|
||||||
return buildTypeParameter {
|
return buildTypeParameter {
|
||||||
source = this@copy.source
|
source = this@copy.source
|
||||||
|
resolvePhase = this@copy.resolvePhase
|
||||||
moduleData = this@copy.moduleData
|
moduleData = this@copy.moduleData
|
||||||
name = this@copy.name
|
name = this@copy.name
|
||||||
symbol = this@copy.symbol
|
symbol = this@copy.symbol
|
||||||
|
|||||||
@@ -136,6 +136,7 @@ class FirSamResolverImpl(
|
|||||||
source = declaredTypeParameter.source
|
source = declaredTypeParameter.source
|
||||||
moduleData = firSession.moduleData
|
moduleData = firSession.moduleData
|
||||||
origin = FirDeclarationOrigin.SamConstructor
|
origin = FirDeclarationOrigin.SamConstructor
|
||||||
|
resolvePhase = FirResolvePhase.DECLARATIONS
|
||||||
name = declaredTypeParameter.name
|
name = declaredTypeParameter.name
|
||||||
this.symbol = FirTypeParameterSymbol()
|
this.symbol = FirTypeParameterSymbol()
|
||||||
variance = Variance.INVARIANT
|
variance = Variance.INVARIANT
|
||||||
|
|||||||
+1
@@ -224,6 +224,7 @@ class FirSyntheticCallGenerator(
|
|||||||
buildTypeParameter {
|
buildTypeParameter {
|
||||||
moduleData = session.moduleData
|
moduleData = session.moduleData
|
||||||
origin = FirDeclarationOrigin.Library
|
origin = FirDeclarationOrigin.Library
|
||||||
|
resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
|
||||||
name = Name.identifier("K")
|
name = Name.identifier("K")
|
||||||
symbol = typeParameterSymbol
|
symbol = typeParameterSymbol
|
||||||
variance = Variance.INVARIANT
|
variance = Variance.INVARIANT
|
||||||
|
|||||||
+1
@@ -480,6 +480,7 @@ object FirFakeOverrideGenerator {
|
|||||||
source = typeParameter.source
|
source = typeParameter.source
|
||||||
moduleData = typeParameter.moduleData
|
moduleData = typeParameter.moduleData
|
||||||
origin = FirDeclarationOrigin.SubstitutionOverride
|
origin = FirDeclarationOrigin.SubstitutionOverride
|
||||||
|
resolvePhase = FirResolvePhase.DECLARATIONS
|
||||||
name = typeParameter.name
|
name = typeParameter.name
|
||||||
symbol = FirTypeParameterSymbol()
|
symbol = FirTypeParameterSymbol()
|
||||||
variance = typeParameter.variance
|
variance = typeParameter.variance
|
||||||
|
|||||||
Reference in New Issue
Block a user