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

FIR: save resolvePhase of declaration when creating it fake override copy

Browse Source
This commit is contained in:
Ilya Kirillov
2020-08-19 13:57:43 +03:00
parent b1d3ab04c2
commit 9e0bb4ce8e
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConstructorProcessing.kt
+1
View File
@@ -255,6 +255,7 @@ private fun prepareSubstitutingScopeForTypeAliasConstructors(
buildValueParameter { buildValueParameter {
source = valueParameter.source source = valueParameter.source
this.session = session this.session = session
resolvePhase = valueParameter.resolvePhase
origin = FirDeclarationOrigin.FakeOverride origin = FirDeclarationOrigin.FakeOverride
returnTypeRef = valueParameter.returnTypeRef.withReplacedConeType(newParameterType) returnTypeRef = valueParameter.returnTypeRef.withReplacedConeType(newParameterType)
name = valueParameter.name name = valueParameter.name
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/AbstractFirOverrideScope.kt
+3
View File
@@ -72,6 +72,7 @@ abstract class AbstractFirOverrideScope(
FirSimpleFunctionBuilder().apply { FirSimpleFunctionBuilder().apply {
source = firSimpleFunction.source source = firSimpleFunction.source
session = firSimpleFunction.session session = firSimpleFunction.session
resolvePhase = firSimpleFunction.resolvePhase
origin = FirDeclarationOrigin.FakeOverride origin = FirDeclarationOrigin.FakeOverride
returnTypeRef = firSimpleFunction.returnTypeRef returnTypeRef = firSimpleFunction.returnTypeRef
receiverTypeRef = firSimpleFunction.receiverTypeRef receiverTypeRef = firSimpleFunction.receiverTypeRef
@@ -84,6 +85,7 @@ abstract class AbstractFirOverrideScope(
FirValueParameterBuilder().apply { FirValueParameterBuilder().apply {
source = parameter.source source = parameter.source
session = parameter.session session = parameter.session
resolvePhase = parameter.resolvePhase
origin = FirDeclarationOrigin.FakeOverride origin = FirDeclarationOrigin.FakeOverride
returnTypeRef = parameter.returnTypeRef returnTypeRef = parameter.returnTypeRef
name = parameter.name name = parameter.name
@@ -101,6 +103,7 @@ abstract class AbstractFirOverrideScope(
FirPropertyBuilder().apply { FirPropertyBuilder().apply {
source = firProperty.source source = firProperty.source
session = firProperty.session session = firProperty.session
resolvePhase = firProperty.resolvePhase
origin = FirDeclarationOrigin.FakeOverride origin = FirDeclarationOrigin.FakeOverride
returnTypeRef = firProperty.returnTypeRef returnTypeRef = firProperty.returnTypeRef
receiverTypeRef = firProperty.receiverTypeRef receiverTypeRef = firProperty.receiverTypeRef
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt
+2
View File
@@ -327,6 +327,7 @@ class FirClassSubstitutionScope(
buildValueParameter { buildValueParameter {
source = valueParameter.source source = valueParameter.source
this.session = session this.session = session
resolvePhase = valueParameter.resolvePhase
origin = FirDeclarationOrigin.FakeOverride origin = FirDeclarationOrigin.FakeOverride
returnTypeRef = valueParameter.returnTypeRef.withReplacedConeType(newType) returnTypeRef = valueParameter.returnTypeRef.withReplacedConeType(newType)
name = valueParameter.name name = valueParameter.name
@@ -452,6 +453,7 @@ class FirClassSubstitutionScope(
source = baseField.source source = baseField.source
this.session = session this.session = session
origin = FirDeclarationOrigin.FakeOverride origin = FirDeclarationOrigin.FakeOverride
resolvePhase = baseField.resolvePhase
returnTypeRef = baseField.returnTypeRef.withReplacedConeType(newReturnType) returnTypeRef = baseField.returnTypeRef.withReplacedConeType(newReturnType)
name = baseField.name name = baseField.name
this.symbol = symbol this.symbol = symbol