From 4cdc36abb326c1c6ac2cad0e1d0f76685a01eb58 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 26 Aug 2020 16:16:14 +0300 Subject: [PATCH] FIR: Drop unused 'phasedFir' callables --- .../kotlin/fir/resolve/BodyResolveComponents.kt | 10 ++++------ .../transformers/FirAbstractPhaseTransformer.kt | 8 -------- .../kotlin/fir/resolve/transformers/PhaseUtils.kt | 9 --------- .../body/resolve/FirAbstractBodyResolveTransformer.kt | 7 ------- 4 files changed, 4 insertions(+), 30 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/BodyResolveComponents.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/BodyResolveComponents.kt index af9abe526f6..fc51c314b4d 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/BodyResolveComponents.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/BodyResolveComponents.kt @@ -9,7 +9,6 @@ import kotlinx.collections.immutable.PersistentList import kotlinx.collections.immutable.persistentListOf import org.jetbrains.kotlin.fir.FirCallResolver import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.FirSymbolOwner import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.resolve.calls.ImplicitDispatchReceiverValue import org.jetbrains.kotlin.fir.resolve.calls.ImplicitExtensionReceiverValue @@ -19,10 +18,12 @@ import org.jetbrains.kotlin.fir.resolve.dfa.FirDataFlowAnalyzer import org.jetbrains.kotlin.fir.resolve.inference.FirCallCompleter import org.jetbrains.kotlin.fir.resolve.inference.InferenceComponents import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider -import org.jetbrains.kotlin.fir.resolve.transformers.* +import org.jetbrains.kotlin.fir.resolve.transformers.FirSyntheticCallGenerator +import org.jetbrains.kotlin.fir.resolve.transformers.IntegerLiteralTypeApproximationTransformer +import org.jetbrains.kotlin.fir.resolve.transformers.IntegerOperatorsTypeUpdater +import org.jetbrains.kotlin.fir.resolve.transformers.ReturnTypeCalculator import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.fir.scopes.impl.FirLocalScope -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -58,9 +59,6 @@ interface BodyResolveComponents : SessionHolder { val integerLiteralTypeApproximator: IntegerLiteralTypeApproximationTransformer val integerOperatorsTypeUpdater: IntegerOperatorsTypeUpdater val outerClassManager: FirOuterClassManager - - val AbstractFirBasedSymbol.phasedFir: D where D : FirDeclaration, D : FirSymbolOwner - get() = phasedFir(FirResolvePhase.DECLARATIONS) } typealias FirLocalScopes = PersistentList diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirAbstractPhaseTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirAbstractPhaseTransformer.kt index 9c499fc392f..1af1a36c9c3 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirAbstractPhaseTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirAbstractPhaseTransformer.kt @@ -6,12 +6,10 @@ package org.jetbrains.kotlin.fir.resolve.transformers import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.FirSymbolOwner import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.resolve.ScopeSession -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.visitors.CompositeTransformResult import org.jetbrains.kotlin.fir.visitors.FirDefaultTransformer @@ -27,12 +25,6 @@ abstract class FirAbstractPhaseTransformer( } } - open val AbstractFirBasedSymbol.phasedFir: D where D : FirDeclaration, D : FirSymbolOwner - get() { - val requiredPhase = transformerPhase.requiredToLaunch - return phasedFir(requiredPhase) - } - override fun transformFile(file: FirFile, data: D): CompositeTransformResult { checkSessionConsistency(file) file.replaceResolvePhase(transformerPhase) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt index bff6942f4c9..53da148d916 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/PhaseUtils.kt @@ -13,15 +13,6 @@ import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol -fun AbstractFirBasedSymbol.phasedFir( - requiredPhase: FirResolvePhase = FirResolvePhase.DECLARATIONS -): D where D : FirDeclaration, D : FirSymbolOwner { - - ensureResolved(requiredPhase, fir.session) - - return fir -} - fun AbstractFirBasedSymbol.ensureResolved( requiredPhase: FirResolvePhase, // TODO: Currently, the parameter is unused but it's needed to guarantee that all call-sites are able to supply use-site session diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt index a65a3c61749..eb68745cb23 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt @@ -21,7 +21,6 @@ import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider import org.jetbrains.kotlin.fir.resolve.transformers.* import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.fir.scopes.impl.FirLocalScope -import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -39,12 +38,6 @@ abstract class FirAbstractBodyResolveTransformer(phase: FirResolvePhase) : FirAb final override val session: FirSession get() = components.session - final override val AbstractFirBasedSymbol.phasedFir: D where D : FirDeclaration, D : FirSymbolOwner - get() { - val requiredPhase = transformerPhase.requiredToLaunch - return phasedFir(requiredPhase) - } - protected inline fun withLocalScopeCleanup(crossinline l: () -> T): T { return context.withTowerDataCleanup(l) }