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

FIR: extract some inference-related type substitutors to classes

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-12-22 09:30:08 +03:00
committed by teamcity
parent 97ed14cdee
commit 6614e1f3af
3 changed files with 31 additions and 12 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
+2 -2
View File
@@ -165,14 +165,14 @@ class FirBuilderInferenceSession(
}
private fun createNonFixedTypeToVariableSubstitutor(): ConeSubstitutor {
val ctx = components.session.typeContext
val typeContext = components.session.typeContext
val bindings = mutableMapOf<TypeConstructorMarker, ConeKotlinType>()
for ((variable, nonFixedType) in stubsForPostponedVariables) {
bindings[nonFixedType.constructor] = variable.defaultType
}
return ctx.typeSubstitutorByTypeConstructor(bindings)
return typeContext.typeSubstitutorByTypeConstructor(bindings)
}
private fun integrateConstraints(
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirDelegatedPropertyInferenceSession.kt
+3 -9
View File
@@ -10,9 +10,9 @@ import org.jetbrains.kotlin.fir.expressions.FirResolvable
import org.jetbrains.kotlin.fir.expressions.FirStatement
import org.jetbrains.kotlin.fir.resolve.calls.*
import org.jetbrains.kotlin.fir.resolve.inference.model.ConeFixVariableConstraintPosition
import org.jetbrains.kotlin.fir.resolve.substitution.AbstractConeSubstitutor
import org.jetbrains.kotlin.fir.resolve.substitution.ChainedSubstitutor
import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
import org.jetbrains.kotlin.fir.resolve.substitution.NotFixedTypeToVariableSubstitutorForDelegateInference
import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.resolve.calls.inference.NewConstraintSystem
import org.jetbrains.kotlin.resolve.calls.inference.buildAbstractResultingSubstitutor
@@ -110,7 +110,7 @@ class FirDelegatedPropertyInferenceSession(
completionMode: ConstraintSystemCompletionMode
): Map<ConeTypeVariableTypeConstructor, ConeKotlinType>? = null
private fun createNonFixedTypeToVariableSubstitutor(): ConeSubstitutor {
private fun createNonFixedTypeToVariableSubstitutor(): NotFixedTypeToVariableSubstitutorForDelegateInference {
val typeContext = components.session.typeContext
val bindings = mutableMapOf<TypeVariableMarker, ConeKotlinType>()
@@ -118,13 +118,7 @@ class FirDelegatedPropertyInferenceSession(
bindings[synthetic] = variable.defaultType(typeContext) as ConeKotlinType
}
return object : AbstractConeSubstitutor(typeContext) {
override fun substituteType(type: ConeKotlinType): ConeKotlinType? {
if (type !is ConeStubType) return null
if (type.constructor.isTypeVariableInSubtyping) return null
return bindings[type.constructor.variable].updateNullabilityIfNeeded(type)
}
}
return NotFixedTypeToVariableSubstitutorForDelegateInference(bindings, typeContext)
}