Reuse equality constraints during simplification in adding constraints

JetBrains · Nov 25, 2020 · 616e40f · 616e40f
1 parent aabe709
commit 616e40f
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/...common/src/org/jetbrains/kotlin/resolve/calls/inference/model/MutableConstraintStorage.kt b/...common/src/org/jetbrains/kotlin/resolve/calls/inference/model/MutableConstraintStorage.kt
@@ -63,14 +63,16 @@ class MutableVariableWithConstraints private constructor(
                     ConstraintKind.EQUALITY -> true
                 }
                 if (isMatchingForSimplification) {
-                    val actualConstraint = Constraint(
-                        ConstraintKind.EQUALITY,
-                        constraint.type,
-                        constraint.position,
-                        constraint.typeHashCode,
-                        derivedFrom = constraint.derivedFrom,
-                        isNullabilityConstraint = false
-                    )
+                    val actualConstraint = if (constraint.kind != ConstraintKind.EQUALITY) {
+                        Constraint(
+                            ConstraintKind.EQUALITY,
+                            constraint.type,
+                            constraint.position,
+                            constraint.typeHashCode,
+                            derivedFrom = constraint.derivedFrom,
+                            isNullabilityConstraint = false
+                        )
+                    } else constraint
                     mutableConstraints.add(actualConstraint)
                     simplifiedConstraints = null
                     return actualConstraint