From 17c6122987cddd55d6ad6ae0beb5e99eb63d1fe4 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 13 Apr 2020 14:44:48 +0300 Subject: [PATCH] [FIR] Make `STATUS` resolve phase as required for body resolve --- .../jetbrains/kotlin/fir/declarations/FirResolvePhase.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt index 1732a3677af..eca57882cea 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.fir.declarations +import java.util.* + enum class FirResolvePhase { RAW_FIR, IMPORTS, @@ -16,7 +18,7 @@ enum class FirResolvePhase { IMPLICIT_TYPES_BODY_RESOLVE, BODY_RESOLVE; - val requiredToLaunch: FirResolvePhase get() = if (this == BODY_RESOLVE) STATUS else values()[ordinal - 1] + val requiredToLaunch: FirResolvePhase get() = if (this in bodyResolvePhases) STATUS else values()[ordinal - 1] val next: FirResolvePhase get() = values()[ordinal + 1] @@ -24,5 +26,7 @@ enum class FirResolvePhase { // Short-cut val DECLARATIONS = STATUS val ANALYZED_DEPENDENCIES = BODY_RESOLVE + + private val bodyResolvePhases = EnumSet.copyOf(setOf(IMPLICIT_TYPES_BODY_RESOLVE, BODY_RESOLVE)) } }