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

[LL FIR] remove useless checks for resolve phases inside transformers

Browse Source 
Those checks are not performed during locking

^KT-56543
This commit is contained in:
Dmitrii Gridin
2023-01-04 19:34:10 +01:00
committed by Space Team
parent 0f379e592a
commit 72fce82f2f
11 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationArgumentsMappingTransformer.kt
-4
View File
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
import org.jetbrains.kotlin.fir.resolve.ResolutionMode
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.transformers.plugin.FirAnnotationArgumentsMappingTransformer
import org.jetbrains.kotlin.fir.declarations.resolvePhase
/**
* Transform designation into ANNOTATIONS_ARGUMENTS_MAPPING declaration. Affects only for target declaration, it's children and dependents
@@ -39,9 +38,6 @@ internal class LLFirDesignatedAnnotationArgumentsMappingTransformer(
}
override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) {
if (designation.target.resolvePhase >= FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING) return
designation.target.checkPhase(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE)
phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING) {
FirLazyBodiesCalculator.calculateAnnotations(designation.firFile)
designation.firFile.transform<FirFile, ResolutionMode>(this, ResolutionMode.ContextIndependent)
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationArgumentsResolveTransformer.kt
-3
View File
@@ -56,9 +56,6 @@ internal class LLFirDesignatedAnnotationArgumentsResolveTransformer(
}
override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) {
if (designation.target.resolvePhase >= FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS) return
designation.target.checkPhase(FirResolvePhase.STATUS)
val designationIterator = designation.toSequenceWithFile(includeTarget = false).iterator()
phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS) {
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationsResolveTransformed.kt
-2
View File
@@ -49,8 +49,6 @@ internal class LLFirDesignatedAnnotationsResolveTransformed(
}
override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) {
if (designation.target.resolvePhase >= FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS) return
val designationIterator = designation.toSequenceWithFile(includeTarget = false).iterator()
phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS) {
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedBodyResolveTransformer.kt
-4
View File
@@ -15,7 +15,6 @@ import org.jetbrains.kotlin.fir.FirSession
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.declarations.resolvePhase
import org.jetbrains.kotlin.fir.resolve.ResolutionMode
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirBodyResolveTransformer
@@ -51,9 +50,6 @@ internal class LLFirDesignatedBodyResolveTransformer(
}
override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) {
if (designation.target.resolvePhase >= FirResolvePhase.BODY_RESOLVE) return
designation.target.checkPhase(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE)
phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.BODY_RESOLVE) {
designation.firFile.transform<FirFile, ResolutionMode>(this, ResolutionMode.ContextIndependent)
}
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedContractsResolveTransformer.kt
-3
View File
@@ -44,9 +44,6 @@ internal class LLFirDesignatedContractsResolveTransformer(
}
override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) {
if (designation.target.resolvePhase >= FirResolvePhase.CONTRACTS) return
designation.target.checkPhase(FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS)
FirLazyBodiesCalculator.calculateLazyBodiesInside(designation)
phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.CONTRACTS) {
designation.firFile.transform<FirFile, ResolutionMode>(this, ResolutionMode.ContextIndependent)
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedExpectActualMatcherTransformer.kt
-4
View File
@@ -16,7 +16,6 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclaration
import org.jetbrains.kotlin.fir.declarations.FirFile
import org.jetbrains.kotlin.fir.declarations.FirRegularClass
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
import org.jetbrains.kotlin.fir.declarations.resolvePhase
import org.jetbrains.kotlin.fir.expressions.FirStatement
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.transformers.mpp.FirExpectActualMatcherTransformer
@@ -42,9 +41,6 @@ internal class LLFirDesignatedExpectActualMatcherTransformer(
}
override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) {
if (designation.target.resolvePhase >= FirResolvePhase.EXPECT_ACTUAL_MATCHING) return
designation.target.checkPhase(FirResolvePhase.STATUS)
FirLazyBodiesCalculator.calculateLazyBodiesInside(designation)
phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.EXPECT_ACTUAL_MATCHING) {
designation.firFile.transform<FirFile, Nothing?>(this, null)
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedGeneratedCompanionObjectResolveTransformer.kt
-2
View File
@@ -22,8 +22,6 @@ internal class LLFirDesignatedGeneratedCompanionObjectResolveTransformer(
private val transformer: FirCompanionGenerationTransformer = FirCompanionGenerationTransformer(session)
override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) {
if (designation.target.resolvePhase >= FirResolvePhase.COMPANION_GENERATION) return
phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.COMPANION_GENERATION) {
designation.target.transform<FirDeclaration, Nothing?>(transformer, null)
}
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedImplicitTypesTransformer.kt
-4
View File
@@ -17,7 +17,6 @@ import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration
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.declarations.resolvePhase
import org.jetbrains.kotlin.fir.resolve.ResolutionMode
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirImplicitAwareBodyResolveTransformer
@@ -55,9 +54,6 @@ internal class LLFirDesignatedImplicitTypesTransformer(
}
override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) {
if (designation.target.resolvePhase >= FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) return
designation.target.checkPhase(FirResolvePhase.CONTRACTS)
phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) {
designation.firFile.transform<FirFile, ResolutionMode>(this, ResolutionMode.ContextIndependent)
}
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedStatusResolveTransformer.kt
-3
View File
@@ -77,9 +77,6 @@ internal class LLFirDesignatedStatusResolveTransformer(
override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) {
if (designation.target.resolvePhase >= FirResolvePhase.STATUS) return
designation.target.checkPhase(FirResolvePhase.TYPES)
val designationIterator = designation.path.iterator()
val transformer = FirDesignatedStatusResolveTransformerForIDE(designationIterator)
phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.STATUS) {
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedSupertypeResolverTransformer.kt
-3
View File
@@ -155,9 +155,6 @@ internal class LLFirDesignatedSupertypeResolverTransformer(
}
override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) {
if (designation.target.resolvePhase >= FirResolvePhase.SUPER_TYPES) return
designation.firFile.checkPhase(FirResolvePhase.IMPORTS)
val targetDesignation = if (designation.target !is FirClassLikeDeclaration) {
val resolvableTarget = designation.path.lastOrNull() ?: return
val targetPath = designation.path.dropLast(1)
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedTypeResolverTransformer.kt
-3
View File
@@ -45,9 +45,6 @@ internal class LLFirDesignatedTypeResolverTransformer(
}
override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) {
if (designation.target.resolvePhase >= FirResolvePhase.TYPES) return
designation.target.checkPhase(FirResolvePhase.SUPER_TYPES)
phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.TYPES) {
designation.firFile.transform<FirFile, Any?>(this, null)
}