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

FIR: Do not use FirClass::supertypesComputationStatus

Browse Source
This commit is contained in:
Denis Zharkov
2019-11-12 11:08:22 +03:00
parent 5e0e78e555
commit 3f7bffa6fd
1 changed files with 2 additions and 3 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
+2 -3
View File
@@ -183,13 +183,12 @@ class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransformer)
} }
private fun prepareLocalClassForBodyResolve(klass: FirClass<*>) { private fun prepareLocalClassForBodyResolve(klass: FirClass<*>) {
if (klass.supertypesComputationStatus == SupertypesComputationStatus.NOT_COMPUTED) { if (klass.superTypeRefs.any { it !is FirResolvedTypeRef }) {
klass.replaceSuperTypeRefs( klass.replaceSuperTypeRefs(
klass.superTypeRefs.map { superTypeRef -> klass.superTypeRefs.map { superTypeRef ->
this.transformer.transformTypeRef(superTypeRef, ResolutionMode.ContextIndependent).single this.transformer.transformTypeRef(superTypeRef, ResolutionMode.ContextIndependent).single
} }
) )
klass.replaceSupertypesComputationStatus(SupertypesComputationStatus.COMPUTED)
} }
if (klass is FirRegularClass) { if (klass is FirRegularClass) {
klass.transformStatus(transformer, klass.resolveStatus(klass.status).mode()) klass.transformStatus(transformer, klass.resolveStatus(klass.status).mode())
@@ -550,4 +549,4 @@ class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransformer)
return valueParameter.compose() return valueParameter.compose()
} }
} }
} }