diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConstructorProcessing.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConstructorProcessing.kt index 2587e37357c..0ec67b63897 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConstructorProcessing.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConstructorProcessing.kt @@ -255,6 +255,7 @@ private fun prepareSubstitutingScopeForTypeAliasConstructors( buildValueParameter { source = valueParameter.source this.session = session + resolvePhase = valueParameter.resolvePhase origin = FirDeclarationOrigin.FakeOverride returnTypeRef = valueParameter.returnTypeRef.withReplacedConeType(newParameterType) name = valueParameter.name diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt index b2a1f6b9238..ee919895ea9 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt @@ -72,6 +72,7 @@ abstract class AbstractFirOverrideScope( FirSimpleFunctionBuilder().apply { source = firSimpleFunction.source session = firSimpleFunction.session + resolvePhase = firSimpleFunction.resolvePhase origin = FirDeclarationOrigin.FakeOverride returnTypeRef = firSimpleFunction.returnTypeRef receiverTypeRef = firSimpleFunction.receiverTypeRef @@ -84,6 +85,7 @@ abstract class AbstractFirOverrideScope( FirValueParameterBuilder().apply { source = parameter.source session = parameter.session + resolvePhase = parameter.resolvePhase origin = FirDeclarationOrigin.FakeOverride returnTypeRef = parameter.returnTypeRef name = parameter.name @@ -101,6 +103,7 @@ abstract class AbstractFirOverrideScope( FirPropertyBuilder().apply { source = firProperty.source session = firProperty.session + resolvePhase = firProperty.resolvePhase origin = FirDeclarationOrigin.FakeOverride returnTypeRef = firProperty.returnTypeRef receiverTypeRef = firProperty.receiverTypeRef diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt index 09153ce14df..d5908efdfab 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt @@ -327,6 +327,7 @@ class FirClassSubstitutionScope( buildValueParameter { source = valueParameter.source this.session = session + resolvePhase = valueParameter.resolvePhase origin = FirDeclarationOrigin.FakeOverride returnTypeRef = valueParameter.returnTypeRef.withReplacedConeType(newType) name = valueParameter.name @@ -452,6 +453,7 @@ class FirClassSubstitutionScope( source = baseField.source this.session = session origin = FirDeclarationOrigin.FakeOverride + resolvePhase = baseField.resolvePhase returnTypeRef = baseField.returnTypeRef.withReplacedConeType(newReturnType) name = baseField.name this.symbol = symbol