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 the pattern of a pack expansion.

Browse Source
This commit is contained in:
Holly Borla
2022-11-15 21:32:30 -08:00
parent 9eccfbd3ca
commit 72d87b5ca5
5 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Sema/CSSimplify.cpp
View File

@@ -7559,9 +7559,10 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifySubclassOfConstraint(
for (unsigned i = 0, e = packType->getNumElements(); i < e; ++i) {
auto eltType = packType->getElementType(i);
if (auto *packExpansionType = eltType->getAs<PackExpansionType>()) {
// FIXME: Locator element for pack expansion pattern
auto patternLoc =
locator.withPathElement(ConstraintLocator::PackExpansionPattern);
addConstraint(ConstraintKind::SubclassOf, packExpansionType->getPatternType(),
classType, locator.withPathElement(LocatorPathElt::PackElement(i)));
classType, patternLoc);
} else {
addConstraint(ConstraintKind::SubclassOf, eltType,
classType, locator.withPathElement(LocatorPathElt::PackElement(i)));
@@ -7677,11 +7678,12 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
for (unsigned i = 0, e = packType->getNumElements(); i < e; ++i) {
auto eltType = packType->getElementType(i);
if (auto *packExpansionType = eltType->getAs<PackExpansionType>()) {
// FIXME: Locator element for pack expansion pattern
auto patternLoc =
locator.withPathElement(ConstraintLocator::PackExpansionPattern);
addConstraint(ConstraintKind::ConformsTo,
packExpansionType->getPatternType(),
protocol->getDeclaredInterfaceType(),
locator.withPathElement(LocatorPathElt::PackElement(i)));
patternLoc);
} else {
addConstraint(ConstraintKind::ConformsTo, eltType,
protocol->getDeclaredInterfaceType(),