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

[ConstraintSystem] Add a locator path element for pack shapes, and use it for

Browse Source 
type variables representing pack shapes.
This commit is contained in:
Holly Borla
2022-11-15 17:14:02 -08:00
parent 9e21404013
commit 5218a0d77a
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Sema/CSSimplify.cpp
View File

@@ -2498,10 +2498,9 @@ ConstraintSystem::matchPackExpansionTypes(PackExpansionType *expansion1,
ConstraintKind kind, TypeMatchOptions flags,
ConstraintLocatorBuilder locator) {
// The count types of two pack expansion types must have the same shape.
//
// FIXME: Locator for diagnostics.
auto *loc = getConstraintLocator(locator);
auto *shapeTypeVar = createTypeVariable(loc, TVO_CanBindToPack);
auto *shapeLoc = getConstraintLocator(
locator.withPathElement(ConstraintLocator::PackShape));
auto *shapeTypeVar = createTypeVariable(shapeLoc, TVO_CanBindToPack);
addConstraint(ConstraintKind::ShapeOf,
expansion1->getCountType(), shapeTypeVar, locator);
addConstraint(ConstraintKind::ShapeOf,
@@ -14156,8 +14155,9 @@ void ConstraintSystem::addConstraint(Requirement req,
auto type1 = req.getFirstType();
auto type2 = req.getSecondType();
// FIXME: Locator for diagnostics
auto typeVar = createTypeVariable(getConstraintLocator(locator),
auto *shapeLoc = getConstraintLocator(
locator.withPathElement(ConstraintLocator::PackShape));
auto typeVar = createTypeVariable(shapeLoc,
TVO_CanBindToPack);
addConstraint(ConstraintKind::ShapeOf, type1, typeVar, locator);