averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37734 from xedin/rdar-78425221

Browse Source 
[CSBindings] Don't record variable adjacency for `member chain base` constraint
This commit is contained in:
Pavel Yaskevich
2021-06-02 09:38:46 -07:00
committed by GitHub
parent 106357bc80 b881142486
commit 7558832f94
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Sema/CSBindings.cpp
View File

@@ -1214,8 +1214,6 @@ PotentialBindings::inferFromRelational(Constraint *constraint) {
if (!bindingTypeVar)
return None;
AdjacentVars.insert({bindingTypeVar, constraint});
// If current type variable is associated with a code completion token
// it's possible that it doesn't have enough contextual information
// to be resolved to anything, so let's note that fact in the potential
@@ -1237,14 +1235,24 @@ PotentialBindings::inferFromRelational(Constraint *constraint) {
assert(kind == AllowedBindingKind::Supertypes);
SupertypeOf.insert({bindingTypeVar, constraint});
}
AdjacentVars.insert({bindingTypeVar, constraint});
break;
}
case ConstraintKind::Bind:
case ConstraintKind::BindParam:
case ConstraintKind::Equal:
case ConstraintKind::Equal: {
EquivalentTo.insert({bindingTypeVar, constraint});
AdjacentVars.insert({bindingTypeVar, constraint});
break;
}
case ConstraintKind::UnresolvedMemberChainBase: {
EquivalentTo.insert({bindingTypeVar, constraint});
// Don't record adjacency between base and result types,
// this is just an auxiliary contraint to enforce ordering.
break;
}