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 #66708 from xedin/generalize-default-closure-type-constraint

Browse Source 
[ConstraintSystem] Use fallback type constraint to default pack expansion
This commit is contained in:
Pavel Yaskevich
2023-06-19 00:47:18 -07:00
committed by GitHub
parent 5528b40acb 83bb9c1f5a
commit 199616a49b
9 changed files with 91 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Sema/ConstraintSystem.cpp
View File

@@ -1031,7 +1031,7 @@ Type ConstraintSystem::openPackExpansionType(PackExpansionType *expansion,
// This constraint is important to make sure that pack expansion always
// has a binding and connect pack expansion var to any type variables
// that appear in pattern and shape types.
addUnsolvedConstraint(Constraint::create(*this, ConstraintKind::Defaultable,
addUnsolvedConstraint(Constraint::create(*this, ConstraintKind::FallbackType,
expansionVar, openedPackExpansion,
expansionLoc));
@@ -7419,7 +7419,7 @@ bool TypeVarBindingProducer::requiresOptionalAdjustment(
PotentialBinding
TypeVarBindingProducer::getDefaultBinding(Constraint *constraint) const {
assert(constraint->getKind() == ConstraintKind::Defaultable ||
constraint->getKind() == ConstraintKind::DefaultClosureType);
constraint->getKind() == ConstraintKind::FallbackType);
auto type = constraint->getSecondType();
Binding binding{type, BindingKind::Exact, constraint};