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

AST: Move getReducedShape() from CSSimplify.cpp to a method on TypeBase

Browse Source
This commit is contained in:
Slava Pestov
2022-11-09 18:27:27 -05:00
parent 6d75fac3b7
commit 30a1211a3b
5 changed files with 76 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/Sema/CSSimplify.cpp
View File

@@ -12603,40 +12603,6 @@ ConstraintSystem::simplifyDynamicCallableApplicableFnConstraint(
return SolutionKind::Solved;
}
/// FIXME: Move this elsewhere if it is broadly useful
static Type getReducedShape(Type type, ASTContext &ctx) {
// Pack archetypes know their reduced shape
if (auto *packArchetype = type->getAs<PackArchetypeType>())
return packArchetype->getShape();
// Reduced shape of pack is computed recursively
if (auto *packType = type->getAs<PackType>()) {
SmallVector<Type, 2> elts;
for (auto elt : packType->getElementTypes()) {
// T... => shape(T)...
if (auto *packExpansionType = elt->getAs<PackExpansionType>()) {
if (packExpansionType->getCountType()->is<PlaceholderType>()) {
elts.push_back(ctx.TheEmptyTupleType);
continue;
}
auto shapeType = getReducedShape(packExpansionType->getCountType(), ctx);
elts.push_back(PackExpansionType::get(shapeType, shapeType));
}
// Use () as a placeholder for scalar shape.
elts.push_back(ctx.TheEmptyTupleType);
}
return PackType::get(ctx, elts);
}
assert(!type->isTypeVariableOrMember());
// Use () as a placeholder for scalar shape.
return ctx.TheEmptyTupleType;
}
ConstraintSystem::SolutionKind ConstraintSystem::simplifyShapeOfConstraint(
Type type1, Type type2, TypeMatchOptions flags,
ConstraintLocatorBuilder locator) {
@@ -12667,12 +12633,9 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyShapeOfConstraint(
return formUnsolved();
}
if (Type shape = getReducedShape(type1, getASTContext())) {
addConstraint(ConstraintKind::Bind, shape, type2, locator);
return SolutionKind::Solved;
}
return SolutionKind::Error;
auto shape = type1->getReducedShape();
addConstraint(ConstraintKind::Bind, shape, type2, locator);
return SolutionKind::Solved;
}
static llvm::PointerIntPair<Type, 3, unsigned>