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 #70457 from slavapestov/parameter-pack-open-type

Browse Source 
Fix openType() handling of parameter packs
This commit is contained in:
Slava Pestov
2024-01-10 13:41:08 -05:00
committed by GitHub
parent 25789fd767 bc7044e944
commit 597fb216cb
10 changed files with 205 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/Sema/CSSimplify.cpp
View File

@@ -1810,7 +1810,14 @@ static ConstraintSystem::TypeMatchResult matchCallArguments(
}
auto *argPack = PackType::get(cs.getASTContext(), argTypes);
auto *argPackExpansion = PackExpansionType::get(argPack, argPack);
auto argPackExpansion = [&]() {
if (argPack->getNumElements() == 1 &&
argPack->getElementType(0)->is<PackExpansionType>()) {
return argPack->getElementType(0)->castTo<PackExpansionType>();
}
return PackExpansionType::get(argPack, argPack);
}();
auto firstArgIdx =
argTypes.empty() ? paramIdx : parameterBindings[paramIdx].front();
@@ -13536,33 +13543,34 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifySameShapeConstraint(
auto argLoc =
loc->castLastElementTo<LocatorPathElt::ApplyArgToParam>();
if (type1->getAs<PackArchetypeType>() &&
type2->getAs<PackArchetypeType>())
if (type1->is<PackArchetypeType>() &&
type2->is<PackArchetypeType>())
return recordShapeMismatchFix();
auto argPack = type1->getAs<PackType>();
auto paramPack = type2->getAs<PackType>();
if (!(argPack && paramPack))
return SolutionKind::Error;
auto numArgs = (shape1->is<PackType>()
? shape1->castTo<PackType>()->getNumElements()
: 1);
auto numParams = (shape2->is<PackType>()
? shape2->castTo<PackType>()->getNumElements()
: 1);
// Tailed diagnostic to explode tuples.
// FIXME: This is very similar to
// 'cannot_convert_single_tuple_into_multiple_arguments'; can we emit
// both of these in the same place?
if (argPack->getNumElements() == 1) {
if (argPack->getElementType(0)->is<TupleType>() &&
paramPack->getNumElements() >= 1) {
if (numArgs == 1) {
if (type1->is<TupleType>() &&
numParams >= 1) {
return recordShapeFix(
DestructureTupleToMatchPackExpansionParameter::create(
*this, paramPack, loc),
/*impact=*/2 * paramPack->getNumElements());
*this,
(type2->is<PackType>()
? type2->castTo<PackType>()
: PackType::getSingletonPackExpansion(type2)), loc),
/*impact=*/2 * numParams);
}
}
auto numArgs = shape1->castTo<PackType>()->getNumElements();
auto numParams = shape2->castTo<PackType>()->getNumElements();
// Drops `ApplyArgToParam` and left with `ApplyArgument`.
path.pop_back();