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

FIR: Register type variables properly in builder inference

Browse Source
This commit is contained in:
Simon Ogorodnik
2021-11-17 19:21:57 +03:00
committed by teamcity
parent 0d9ed6990e
commit 64944a1247
1 changed files with 2 additions and 2 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
@@ -181,7 +181,7 @@ class FirBuilderInferenceSession(
nonFixedToVariablesSubstitutor: ConeSubstitutor, nonFixedToVariablesSubstitutor: ConeSubstitutor,
shouldIntegrateAllConstraints: Boolean shouldIntegrateAllConstraints: Boolean
): Boolean { ): Boolean {
storage.notFixedTypeVariables.values.forEach { commonSystem.registerVariable(it.typeVariable) } storage.notFixedTypeVariables.values.forEach { commonSystem.registerTypeVariableIfNotPresent(it.typeVariable) }
/* /*
* storage can contain the following substitutions: * storage can contain the following substitutions:
@@ -224,7 +224,7 @@ class FirBuilderInferenceSession(
if (shouldIntegrateAllConstraints) { if (shouldIntegrateAllConstraints) {
for ((variableConstructor, type) in storage.fixedTypeVariables) { for ((variableConstructor, type) in storage.fixedTypeVariables) {
val typeVariable = storage.allTypeVariables.getValue(variableConstructor) val typeVariable = storage.allTypeVariables.getValue(variableConstructor)
commonSystem.registerVariable(typeVariable) commonSystem.registerTypeVariableIfNotPresent(typeVariable)
commonSystem.addEqualityConstraint((typeVariable as ConeTypeVariable).defaultType, type, BuilderInferencePosition) commonSystem.addEqualityConstraint((typeVariable as ConeTypeVariable).defaultType, type, BuilderInferencePosition)
introducedConstraint = true introducedConstraint = true
} }