From b8920114f8dadce578542d9917d40f63293527ec Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 17 Aug 2020 17:20:55 +0300 Subject: [PATCH] FIR: set resolvePhase to BODY_RESOLVE in deserialized Kotlin declarations --- .../kotlin/fir/deserialization/FirMemberDeserializer.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt index 9065a6a4813..4b0b19ddd18 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt @@ -221,6 +221,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { session = c.session origin = FirDeclarationOrigin.Library this.returnTypeRef = returnTypeRef + resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES isGetter = true status = FirResolvedDeclarationStatusImpl(visibility, modality) annotations += @@ -245,6 +246,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { session = c.session origin = FirDeclarationOrigin.Library this.returnTypeRef = FirImplicitUnitTypeRef(source) + resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES isGetter = false status = FirResolvedDeclarationStatusImpl(visibility, modality) annotations += @@ -456,6 +458,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { returnTypeRef = proto.type(c.typeTable).toTypeRef(c) this.name = name symbol = FirVariableSymbol(name) + resolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES defaultValue = defaultValue(flags) if (addDefaultValue) { defaultValue = buildExpressionStub()