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

FIR: set resolvePhase to BODY_RESOLVE in deserialized Kotlin declarations

Browse Source
This commit is contained in:
Ilya Kirillov
2020-08-17 17:20:55 +03:00
committed by Simon Ogorodnik
parent c7d6a79c25
commit b8920114f8
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt
+3
View File
@@ -221,6 +221,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
session = c.session session = c.session
origin = FirDeclarationOrigin.Library origin = FirDeclarationOrigin.Library
this.returnTypeRef = returnTypeRef this.returnTypeRef = returnTypeRef
resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
isGetter = true isGetter = true
status = FirResolvedDeclarationStatusImpl(visibility, modality) status = FirResolvedDeclarationStatusImpl(visibility, modality)
annotations += annotations +=
@@ -245,6 +246,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
session = c.session session = c.session
origin = FirDeclarationOrigin.Library origin = FirDeclarationOrigin.Library
this.returnTypeRef = FirImplicitUnitTypeRef(source) this.returnTypeRef = FirImplicitUnitTypeRef(source)
resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
isGetter = false isGetter = false
status = FirResolvedDeclarationStatusImpl(visibility, modality) status = FirResolvedDeclarationStatusImpl(visibility, modality)
annotations += annotations +=
@@ -456,6 +458,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
returnTypeRef = proto.type(c.typeTable).toTypeRef(c) returnTypeRef = proto.type(c.typeTable).toTypeRef(c)
this.name = name this.name = name
symbol = FirVariableSymbol(name) symbol = FirVariableSymbol(name)
resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES
defaultValue = defaultValue(flags) defaultValue = defaultValue(flags)
if (addDefaultValue) { if (addDefaultValue) {
defaultValue = buildExpressionStub() defaultValue = buildExpressionStub()