From 52caa6a58d8a02f770b313364dcbc82e0caa2c99 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 25 Nov 2019 12:10:51 +0300 Subject: [PATCH] [FIR] Don't recreate type resolver in `FirSpecificTypeResolverTransformer` --- .../transformers/FirSpecificTypeResolverTransformer.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSpecificTypeResolverTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSpecificTypeResolverTransformer.kt index dfbc7831819..67d6328773a 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSpecificTypeResolverTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSpecificTypeResolverTransformer.kt @@ -19,14 +19,14 @@ class FirSpecificTypeResolverTransformer( private val towerScope: FirScope, override val session: FirSession ) : FirAbstractTreeTransformer(phase = FirResolvePhase.SUPER_TYPES) { + private val typeResolver = FirTypeResolver.getInstance(session) + override fun transformTypeRef(typeRef: FirTypeRef, data: Nothing?): CompositeTransformResult { - val typeResolver = FirTypeResolver.getInstance(session) typeRef.transformChildren(this, null) return transformType(typeRef, typeResolver.resolveType(typeRef, towerScope)) } override fun transformFunctionTypeRef(functionTypeRef: FirFunctionTypeRef, data: Nothing?): CompositeTransformResult { - val typeResolver = FirTypeResolver.getInstance(session) functionTypeRef.transformChildren(this, data) return FirResolvedFunctionTypeRefImpl( functionTypeRef.source,