From caf325934c028b43f9d853e8dd4e0e1a90c494cd Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 8 Sep 2020 16:07:57 +0300 Subject: [PATCH] [FIR] Unmake FirSamResolver as session component It can not be stored in session because it depends on scope session and have mutable state --- .../org/jetbrains/kotlin/fir/resolve/SamResolution.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt index 39a8da8ae08..fc3258dd4e3 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt @@ -33,10 +33,10 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.types.Variance -interface FirSamResolver : FirSessionComponent { - fun getFunctionTypeForPossibleSamType(type: ConeKotlinType): ConeKotlinType? - fun shouldRunSamConversionForFunction(firFunction: FirFunction<*>): Boolean - fun getSamConstructor(firRegularClass: FirRegularClass): FirSimpleFunction? +abstract class FirSamResolver { + abstract fun getFunctionTypeForPossibleSamType(type: ConeKotlinType): ConeKotlinType? + abstract fun shouldRunSamConversionForFunction(firFunction: FirFunction<*>): Boolean + abstract fun getSamConstructor(firRegularClass: FirRegularClass): FirSimpleFunction? } private val NULL_STUB = Any() @@ -45,7 +45,7 @@ val SAM_PARAMETER_NAME = Name.identifier("block") class FirSamResolverImpl( private val firSession: FirSession, private val scopeSession: ScopeSession, -) : FirSamResolver { +) : FirSamResolver() { private val resolvedFunctionType: MutableMap = mutableMapOf() private val samConstructor: MutableMap = mutableMapOf()