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

Reuse equality constraints during simplification in adding constraints

Browse Source
This commit is contained in:
Victor Petukhov
2020-11-19 11:28:26 +03:00
parent aabe709079
commit 616e40f879
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/model/MutableConstraintStorage.kt
+3 -1
View File
@@ -63,7 +63,8 @@ class MutableVariableWithConstraints private constructor(
ConstraintKind.EQUALITY -> true ConstraintKind.EQUALITY -> true
} }
if (isMatchingForSimplification) { if (isMatchingForSimplification) {
val actualConstraint = Constraint( val actualConstraint = if (constraint.kind != ConstraintKind.EQUALITY) {
Constraint(
ConstraintKind.EQUALITY, ConstraintKind.EQUALITY,
constraint.type, constraint.type,
constraint.position, constraint.position,
@@ -71,6 +72,7 @@ class MutableVariableWithConstraints private constructor(
derivedFrom = constraint.derivedFrom, derivedFrom = constraint.derivedFrom,
isNullabilityConstraint = false isNullabilityConstraint = false
) )
} else constraint
mutableConstraints.add(actualConstraint) mutableConstraints.add(actualConstraint)
simplifiedConstraints = null simplifiedConstraints = null
return actualConstraint return actualConstraint