Skip to content

Check if new constraint is useless against all previous constraints #5565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −6
Open

Check if new constraint is useless against all previous constraints #5565

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions ...common/src/org/jetbrains/kotlin/resolve/calls/inference/model/MutableConstraintStorage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,18 @@ class MutableVariableWithConstraints private constructor(
fun addConstraint(constraint: Constraint, inferenceLogger: InferenceLogger?): Pair<Constraint, Boolean> {
val isLowerAndFlexibleTypeWithDefNotNullLowerBound = constraint.isLowerAndFlexibleTypeWithDefNotNullLowerBound()

for (previousConstraint in getConstraintsWithSameTypeHashCode(constraint)) {
if (previousConstraint.type == constraint.type
&& previousConstraint.isNullabilityConstraint == constraint.isNullabilityConstraint
val previousConstraints = getConstraintsWithSameTypeHashCode(constraint)

for (previousConstraint in previousConstraints) {
if (constraintMatchesTypeAndIsNullability(previousConstraint, constraint) &&
newConstraintIsUseless(previousConstraint, constraint)
) {
if (newConstraintIsUseless(previousConstraint, constraint)) {
return previousConstraint to false
}
return previousConstraint to false
}
}

for (previousConstraint in previousConstraints) {
if (constraintMatchesTypeAndIsNullability(previousConstraint, constraint)) {
val isMatchingForSimplification = when (previousConstraint.kind) {
ConstraintKind.LOWER -> constraint.kind.isUpper()
ConstraintKind.UPPER -> constraint.kind.isLower()
Expand Down Expand Up @@ -217,6 +221,10 @@ class MutableVariableWithConstraints private constructor(
clearGroupedConstraintCaches()
}

private fun constraintMatchesTypeAndIsNullability(old: Constraint, new: Constraint): Boolean {
return old.type == new.type && old.isNullabilityConstraint == new.isNullabilityConstraint
}

private fun newConstraintIsUseless(old: Constraint, new: Constraint): Boolean {
// Constraints from declared upper bound are quite special -- they aren't considered as a proper ones
// In other words, user-defined constraints have "higher" priority and here we're trying not to loose them
Expand Down