diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirInferenceSession.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirInferenceSession.kt index 13c37c6918e..73b41195e54 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirInferenceSession.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirInferenceSession.kt @@ -14,8 +14,6 @@ import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.ConeTypeVariableTypeConstructor import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemBuilder import org.jetbrains.kotlin.resolve.calls.inference.components.ConstraintSystemCompletionMode -import org.jetbrains.kotlin.types.model.StubTypeMarker -import org.jetbrains.kotlin.types.model.TypeVariableMarker abstract class FirInferenceSession { companion object { @@ -33,8 +31,6 @@ abstract class FirInferenceSession { abstract fun processPartiallyResolvedCall(call: T, resolutionMode: ResolutionMode) where T : FirResolvable, T : FirStatement abstract fun addCompletedCall(call: T, candidate: Candidate) where T : FirResolvable, T : FirStatement - abstract fun registerStubTypes(map: Map) - abstract fun inferPostponedVariables( lambda: ResolvedLambdaAtom, constraintSystemBuilder: ConstraintSystemBuilder, @@ -42,7 +38,6 @@ abstract class FirInferenceSession { candidate: Candidate ): Map? - abstract fun clear() open fun onCandidatesResolution(call: FirFunctionCall, candidatesResolutionCallback: () -> R) = candidatesResolutionCallback() } @@ -58,9 +53,4 @@ abstract class FirStubInferenceSession : FirInferenceSession() { completionMode: ConstraintSystemCompletionMode, candidate: Candidate ): Map? = null - - override fun registerStubTypes(map: Map) {} - - override fun clear() { - } } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirInferenceSessionForChainedResolve.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirInferenceSessionForChainedResolve.kt index 1543acbed38..0df1f35d992 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirInferenceSessionForChainedResolve.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirInferenceSessionForChainedResolve.kt @@ -12,13 +12,11 @@ import org.jetbrains.kotlin.fir.resolve.ResolutionMode import org.jetbrains.kotlin.fir.resolve.calls.Candidate import org.jetbrains.kotlin.fir.resolve.calls.ResolutionContext import org.jetbrains.kotlin.fir.resolve.calls.candidate -import org.jetbrains.kotlin.types.model.* abstract class FirInferenceSessionForChainedResolve( protected val resolutionContext: ResolutionContext ) : FirInferenceSession() { protected val partiallyResolvedCalls: MutableList> = mutableListOf() - private val completedCalls: MutableSet = mutableSetOf() protected val components: BodyResolveComponents get() = resolutionContext.bodyResolveComponents @@ -31,13 +29,6 @@ abstract class FirInferenceSessionForChainedResolve( partiallyResolvedCalls += call to call.candidate } - override fun registerStubTypes(map: Map) {} - protected val FirResolvable.candidate: Candidate get() = candidate()!! - - override fun clear() { - partiallyResolvedCalls.clear() - completedCalls.clear() - } }