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

[ConstraintSystem] Use an explicit generic argument constraint for

Browse Source 
UnresolvedSpecializeExpr.

The eager generic argument matching code in CSGen for unresolved
specializations was incorrect because it didn't account for parameter
packs. Fortunately, a constraint to delay explicit generic argument
matching already exists for macros. Use it here.
This commit is contained in:
Holly Borla
2023-06-14 18:24:58 -07:00
parent e42667bde6
commit eb858d938e
3 changed files with 39 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Sema/CSSimplify.cpp
View File

@@ -13520,7 +13520,26 @@ ConstraintSystem::simplifyExplicitGenericArgumentsConstraint(
auto genericParamDepth = genericParams->getParams()[0]->getDepth();
for (const auto &openedType : getOpenedTypes(overloadLocator)) {
if (openedType.first->getDepth() == genericParamDepth) {
openedGenericParams.push_back(Type(openedType.second));
// A generic argument list containing pack references expects
// those packs to be wrapped in pack expansion types. If this
// opened type represents the generic argument for a parameter
// pack, wrap generate the appropriate shape constraints and
// add a pack expansion to the argument list.
if (openedType.first->isParameterPack()) {
auto patternType = openedType.second;
auto *shapeLoc = getConstraintLocator(
locator.withPathElement(ConstraintLocator::PackShape));
auto *shapeType = createTypeVariable(shapeLoc,
TVO_CanBindToPack |
TVO_CanBindToHole);
addConstraint(ConstraintKind::ShapeOf,
shapeType, patternType, shapeLoc);
auto *expansion = PackExpansionType::get(patternType, shapeType);
openedGenericParams.push_back(expansion);
} else {
openedGenericParams.push_back(Type(openedType.second));
}
}
}
assert(openedGenericParams.size() == genericParams->size());