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

AbstractMany...InferenceSession -> FirInferenceSessionForChainedResolve

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-12-22 16:09:51 +03:00
committed by teamcity
parent 6342eb96c0
commit 2fc372413e
3 changed files with 3 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/inference/FirBuilderInferenceSession.kt
+1 -1
View File
@@ -32,7 +32,7 @@ class FirBuilderInferenceSession(
private val lambda: FirAnonymousFunction, private val lambda: FirAnonymousFunction,
resolutionContext: ResolutionContext, resolutionContext: ResolutionContext,
private val stubsForPostponedVariables: Map<ConeTypeVariable, ConeStubType>, private val stubsForPostponedVariables: Map<ConeTypeVariable, ConeStubType>,
) : AbstractManyCandidatesInferenceSession(resolutionContext) { ) : FirInferenceSessionForChainedResolve(resolutionContext) {
private val commonCalls: MutableList<Pair<FirStatement, Candidate>> = mutableListOf() private val commonCalls: MutableList<Pair<FirStatement, Candidate>> = mutableListOf()
override val currentConstraintStorage: ConstraintStorage override val currentConstraintStorage: ConstraintStorage
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirDelegatedPropertyInferenceSession.kt
+1 -1
View File
@@ -26,7 +26,7 @@ class FirDelegatedPropertyInferenceSession(
val property: FirProperty, val property: FirProperty,
resolutionContext: ResolutionContext, resolutionContext: ResolutionContext,
private val postponedArgumentsAnalyzer: PostponedArgumentsAnalyzer, private val postponedArgumentsAnalyzer: PostponedArgumentsAnalyzer,
) : AbstractManyCandidatesInferenceSession(resolutionContext) { ) : FirInferenceSessionForChainedResolve(resolutionContext) {
private val currentConstraintSystem = components.session.inferenceComponents.createConstraintSystem() private val currentConstraintSystem = components.session.inferenceComponents.createConstraintSystem()
override val currentConstraintStorage: ConstraintStorage get() = currentConstraintSystem.currentStorage() override val currentConstraintStorage: ConstraintStorage get() = currentConstraintSystem.currentStorage()
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/AbstractManyCandidatesInferenceSession.kt → compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirInferenceSessionForChainedResolve.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.resolve.calls.inference.model.InitialConstraint
import org.jetbrains.kotlin.resolve.calls.inference.model.NewConstraintSystemImpl import org.jetbrains.kotlin.resolve.calls.inference.model.NewConstraintSystemImpl
import org.jetbrains.kotlin.types.model.* import org.jetbrains.kotlin.types.model.*
abstract class AbstractManyCandidatesInferenceSession( abstract class FirInferenceSessionForChainedResolve(
protected val resolutionContext: ResolutionContext protected val resolutionContext: ResolutionContext
) : FirInferenceSession() { ) : FirInferenceSession() {
override fun fixSyntheticTypeVariableWithNotEnoughInformation( override fun fixSyntheticTypeVariableWithNotEnoughInformation(