From 3f7bffa6fdf4f8cf5452ffc229a5fb11def9acde Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 12 Nov 2019 11:08:22 +0300 Subject: [PATCH] FIR: Do not use FirClass::supertypesComputationStatus --- .../body/resolve/FirDeclarationsResolveTransformer.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt index 0e55d86e326..36f3aecc046 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt @@ -183,13 +183,12 @@ class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransformer) } private fun prepareLocalClassForBodyResolve(klass: FirClass<*>) { - if (klass.supertypesComputationStatus == SupertypesComputationStatus.NOT_COMPUTED) { + if (klass.superTypeRefs.any { it !is FirResolvedTypeRef }) { klass.replaceSuperTypeRefs( klass.superTypeRefs.map { superTypeRef -> this.transformer.transformTypeRef(superTypeRef, ResolutionMode.ContextIndependent).single } ) - klass.replaceSupertypesComputationStatus(SupertypesComputationStatus.COMPUTED) } if (klass is FirRegularClass) { klass.transformStatus(transformer, klass.resolveStatus(klass.status).mode()) @@ -550,4 +549,4 @@ class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransformer) return valueParameter.compose() } } -} \ No newline at end of file +}