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

Get rid of containingClass storage in FirDeclarationsResolveTransformer

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-03-04 12:52:28 +03:00
parent 91607044d0
commit 4cff6d93be
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
+6 -9
View File
@@ -41,10 +41,11 @@ import org.jetbrains.kotlin.fir.types.impl.FirImplicitUnitTypeRef
import org.jetbrains.kotlin.fir.visitors.* import org.jetbrains.kotlin.fir.visitors.*
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
import org.jetbrains.kotlin.utils.addToStdlib.safeAs
open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransformer) : FirPartialBodyResolveTransformer(transformer) { open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransformer) : FirPartialBodyResolveTransformer(transformer) {
private var containingClass: FirRegularClass? = null private val containingClass: FirRegularClass?
get() = context.containers.asReversed().firstOrNull { it is FirRegularClass } as? FirRegularClass
private val statusResolver: FirStatusResolver = FirStatusResolver(session, scopeSession) private val statusResolver: FirStatusResolver = FirStatusResolver(session, scopeSession)
private fun FirDeclaration.visibilityForApproximation(): Visibility { private fun FirDeclaration.visibilityForApproximation(): Visibility {
@@ -414,8 +415,6 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
dataFlowAnalyzer.enterClass() dataFlowAnalyzer.enterClass()
} }
val oldContainingClass = containingClass
containingClass = regularClass
val type = regularClass.defaultType() val type = regularClass.defaultType()
val result = withScopesForClass(regularClass.name, regularClass, type) { val result = withScopesForClass(regularClass.name, regularClass, type) {
transformDeclarationContent(regularClass, data).single as FirRegularClass transformDeclarationContent(regularClass, data).single as FirRegularClass
@@ -430,7 +429,6 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
} }
} }
containingClass = oldContainingClass
return (@Suppress("UNCHECKED_CAST") return (@Suppress("UNCHECKED_CAST")
result.compose()) result.compose())
} }
@@ -603,7 +601,8 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
override fun transformConstructor(constructor: FirConstructor, data: ResolutionMode): CompositeTransformResult<FirDeclaration> { override fun transformConstructor(constructor: FirConstructor, data: ResolutionMode): CompositeTransformResult<FirDeclaration> {
if (implicitTypeOnly) return constructor.compose() if (implicitTypeOnly) return constructor.compose()
if (constructor.isPrimary && containingClass?.classKind == ClassKind.ANNOTATION_CLASS) { val container = context.containerIfAny as? FirRegularClass
if (constructor.isPrimary && container?.classKind == ClassKind.ANNOTATION_CLASS) {
return withFirArrayOfCallTransformer { return withFirArrayOfCallTransformer {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
doTransformConstructor(constructor, data) doTransformConstructor(constructor, data)
@@ -614,6 +613,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
} }
private fun doTransformConstructor(constructor: FirConstructor, data: ResolutionMode): CompositeTransformResult<FirConstructor> { private fun doTransformConstructor(constructor: FirConstructor, data: ResolutionMode): CompositeTransformResult<FirConstructor> {
val owningClass = context.containerIfAny as? FirRegularClass
return context.withContainer(constructor) { return context.withContainer(constructor) {
transformer.replaceDeclarationResolvePhaseIfNeeded(constructor, transformerPhase) transformer.replaceDeclarationResolvePhaseIfNeeded(constructor, transformerPhase)
dataFlowAnalyzer.enterFunction(constructor) dataFlowAnalyzer.enterFunction(constructor)
@@ -623,9 +623,6 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
.transformReceiverTypeRef(transformer, data) .transformReceiverTypeRef(transformer, data)
.transformReturnTypeRef(transformer, data) .transformReturnTypeRef(transformer, data)
val containers = context.containers
val owningClass = containers[containers.lastIndex - 1].safeAs<FirRegularClass>()
/* /*
* Default values of constructor can't access members of constructing class * Default values of constructor can't access members of constructing class
*/ */