Skip to content

Commit 38a2c82

Browse files
hborlahborla
committed
[Requirement] Rename RequirementKind::SameCount to SameShape.
1 parent fab5b7d commit 38a2c82

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+128
-128
lines changed

‎include/swift/AST/Requirement.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Requirement
5858
Requirement subst(Args &&...args) const {
5959
auto newFirst = getFirstType().subst(std::forward<Args>(args)...);
6060
switch (getKind()) {
61-
case RequirementKind::SameCount:
61+
case RequirementKind::SameShape:
6262
case RequirementKind::Conformance:
6363
case RequirementKind::Superclass:
6464
case RequirementKind::SameType: {

‎include/swift/AST/RequirementBase.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ enum class RequirementKind : unsigned {
3636
/// A layout bound T : L, where T is a type that depends on a generic
3737
/// parameter and L is some layout specification that should bound T.
3838
Layout,
39-
/// A same-count requirement T.count == U.count, where T and U are pack
39+
/// A same-shape requirement shape(T) == shape(U), where T and U are pack
4040
/// parameters.
41-
SameCount
41+
SameShape
4242

4343
// Note: there is code that packs this enum in a 3-bit bitfield. Audit users
4444
// when adding enumerators.
@@ -105,7 +105,7 @@ class RequirementBase {
105105
hash_value(requirement.FirstTypeAndKind.getOpaqueValue());
106106
llvm::hash_code second;
107107
switch (requirement.getKind()) {
108-
case RequirementKind::SameCount:
108+
case RequirementKind::SameShape:
109109
case RequirementKind::Conformance:
110110
case RequirementKind::Superclass:
111111
case RequirementKind::SameType:
@@ -127,7 +127,7 @@ class RequirementBase {
127127
return false;
128128

129129
switch (lhs.getKind()) {
130-
case RequirementKind::SameCount:
130+
case RequirementKind::SameShape:
131131
case RequirementKind::Conformance:
132132
case RequirementKind::Superclass:
133133
case RequirementKind::SameType:

‎include/swift/SIL/SILWitnessVisitor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ template <class T> class SILWitnessVisitor : public ASTVisitor<T> {
5757
auto requirements = protocol->getRequirementSignature().getRequirements();
5858
for (const auto &reqt : requirements) {
5959
switch (reqt.getKind()) {
60-
case RequirementKind::SameCount:
61-
llvm_unreachable("Same-count requirement not supported here");
60+
case RequirementKind::SameShape:
61+
llvm_unreachable("Same-shape requirement not supported here");
6262

6363
// These requirements don't show up in the witness table.
6464
case RequirementKind::Superclass:

‎lib/AST/ASTContext.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5584,8 +5584,8 @@ ASTContext::getOpenedElementSignature(CanGenericSignature baseGenericSig) {
55845584

55855585
for (auto requirement : baseGenericSig.getRequirements()) {
55865586
switch (requirement.getKind()) {
5587-
case RequirementKind::SameCount:
5588-
// Drop same-length requirements from the element signature.
5587+
case RequirementKind::SameShape:
5588+
// Drop same-shape requirements from the element signature.
55895589
break;
55905590
case RequirementKind::Conformance:
55915591
case RequirementKind::Superclass:

‎lib/AST/ASTDemangler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -635,8 +635,8 @@ Type ASTBuilder::createConstrainedExistentialType(
635635
llvm::SmallDenseMap<Identifier, Type> cmap;
636636
for (const auto &req : constraints) {
637637
switch (req.getKind()) {
638-
case RequirementKind::SameCount:
639-
llvm_unreachable("Same-count requirement not supported here");
638+
case RequirementKind::SameShape:
639+
llvm_unreachable("Same-shape requirement not supported here");
640640
case RequirementKind::Conformance:
641641
case RequirementKind::Superclass:
642642
case RequirementKind::Layout:

‎lib/AST/ASTDumper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4277,8 +4277,8 @@ void Requirement::dump() const {
42774277
}
42784278
void Requirement::dump(raw_ostream &out) const {
42794279
switch (getKind()) {
4280-
case RequirementKind::SameCount:
4281-
out << "same_count: ";
4280+
case RequirementKind::SameShape:
4281+
out << "same_shape: ";
42824282
break;
42834283
case RequirementKind::Conformance:
42844284
out << "conforms_to: ";

‎lib/AST/ASTMangler.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2868,8 +2868,8 @@ void ASTMangler::appendRequirement(const Requirement &reqt,
28682868
Type FirstTy = reqt.getFirstType()->getCanonicalType();
28692869

28702870
switch (reqt.getKind()) {
2871-
case RequirementKind::SameCount:
2872-
llvm_unreachable("Same-count requirement not supported here");
2871+
case RequirementKind::SameShape:
2872+
llvm_unreachable("Same-shape requirement not supported here");
28732873
case RequirementKind::Layout:
28742874
break;
28752875
case RequirementKind::Conformance: {
@@ -2891,8 +2891,8 @@ void ASTMangler::appendRequirement(const Requirement &reqt,
28912891
if (auto *DT = FirstTy->getAs<DependentMemberType>()) {
28922892
if (tryMangleTypeSubstitution(DT, sig)) {
28932893
switch (reqt.getKind()) {
2894-
case RequirementKind::SameCount:
2895-
llvm_unreachable("Same-count requirement not supported here");
2894+
case RequirementKind::SameShape:
2895+
llvm_unreachable("Same-shape requirement not supported here");
28962896
case RequirementKind::Conformance:
28972897
return appendOperator("RQ");
28982898
case RequirementKind::Layout:
@@ -2912,8 +2912,8 @@ void ASTMangler::appendRequirement(const Requirement &reqt,
29122912
addTypeSubstitution(DT, sig);
29132913
assert(gpBase);
29142914
switch (reqt.getKind()) {
2915-
case RequirementKind::SameCount:
2916-
llvm_unreachable("Same-count requirement not supported here");
2915+
case RequirementKind::SameShape:
2916+
llvm_unreachable("Same-shape requirement not supported here");
29172917
case RequirementKind::Conformance:
29182918
return appendOpWithGenericParamIndex(isAssocTypeAtDepth ? "RP" : "Rp",
29192919
gpBase, lhsBaseIsProtocolSelf);
@@ -2933,8 +2933,8 @@ void ASTMangler::appendRequirement(const Requirement &reqt,
29332933
}
29342934
GenericTypeParamType *gpBase = FirstTy->castTo<GenericTypeParamType>();
29352935
switch (reqt.getKind()) {
2936-
case RequirementKind::SameCount:
2937-
llvm_unreachable("Same-count requirement not supported here");
2936+
case RequirementKind::SameShape:
2937+
llvm_unreachable("Same-shape requirement not supported here");
29382938
case RequirementKind::Conformance:
29392939
return appendOpWithGenericParamIndex("R", gpBase);
29402940
case RequirementKind::Layout:
@@ -3494,8 +3494,8 @@ void ASTMangler::appendConcreteProtocolConformance(
34943494
bool firstRequirement = true;
34953495
for (const auto &conditionalReq : conformance->getConditionalRequirements()) {
34963496
switch (conditionalReq.getKind()) {
3497-
case RequirementKind::SameCount:
3498-
llvm_unreachable("Same-count requirement not supported here");
3497+
case RequirementKind::SameShape:
3498+
llvm_unreachable("Same-shape requirement not supported here");
34993499
case RequirementKind::Layout:
35003500
case RequirementKind::SameType:
35013501
case RequirementKind::Superclass:
@@ -3645,8 +3645,8 @@ void ASTMangler::appendConstrainedExistential(Type base, GenericSignature sig,
36453645
bool firstRequirement = true;
36463646
for (const auto &reqt : requirements) {
36473647
switch (reqt.getKind()) {
3648-
case RequirementKind::SameCount:
3649-
llvm_unreachable("Same-count requirement not supported here");
3648+
case RequirementKind::SameShape:
3649+
llvm_unreachable("Same-shape requirement not supported here");
36503650
case RequirementKind::Layout:
36513651
case RequirementKind::Conformance:
36523652
case RequirementKind::Superclass:

‎lib/AST/ASTPrinter.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ PrintOptions PrintOptions::printSwiftInterfaceFile(ModuleDecl *ModuleToPrint,
240240
if (!isPublicOrUsableFromInline(req.getSecondType()))
241241
return false;
242242
break;
243-
case RequirementKind::SameCount:
243+
case RequirementKind::SameShape:
244244
case RequirementKind::Layout:
245245
break;
246246
}
@@ -1415,8 +1415,8 @@ bestRequirementPrintLocation(ProtocolDecl *proto, const Requirement &req) {
14151415
bool inWhereClause;
14161416

14171417
switch (req.getKind()) {
1418-
case RequirementKind::SameCount:
1419-
llvm_unreachable("Same-count requirements not supported here");
1418+
case RequirementKind::SameShape:
1419+
llvm_unreachable("Same-shape requirements not supported here");
14201420
case RequirementKind::Layout:
14211421
case RequirementKind::Conformance:
14221422
case RequirementKind::Superclass: {
@@ -1510,7 +1510,7 @@ static unsigned getDepthOfRequirement(const Requirement &req) {
15101510

15111511
case RequirementKind::Superclass:
15121512
case RequirementKind::SameType:
1513-
case RequirementKind::SameCount: {
1513+
case RequirementKind::SameShape: {
15141514
// Return the max valid depth of firstType and secondType.
15151515
unsigned firstDepth = getDepthOfType(req.getFirstType());
15161516
unsigned secondDepth = getDepthOfType(req.getSecondType());
@@ -1757,8 +1757,8 @@ void PrintAST::printSingleDepthOfGenericSignature(
17571757
// We only print the second part of a requirement in the "inherited"
17581758
// clause.
17591759
switch (req.getKind()) {
1760-
case RequirementKind::SameCount:
1761-
llvm_unreachable("Same-count requirement not supported here");
1760+
case RequirementKind::SameShape:
1761+
llvm_unreachable("Same-shape requirement not supported here");
17621762

17631763
case RequirementKind::Layout:
17641764
req.getLayoutConstraint()->print(Printer, Options);
@@ -1788,10 +1788,10 @@ void PrintAST::printSingleDepthOfGenericSignature(
17881788
void PrintAST::printRequirement(const Requirement &req) {
17891789
printTransformedType(req.getFirstType());
17901790
switch (req.getKind()) {
1791-
case RequirementKind::SameCount:
1792-
Printer << ".count == ";
1791+
case RequirementKind::SameShape:
1792+
Printer << ".shape == ";
17931793
printTransformedType(req.getSecondType());
1794-
Printer << ".count";
1794+
Printer << ".shape";
17951795
return;
17961796
case RequirementKind::Layout:
17971797
Printer << " : ";

‎lib/AST/Decl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4067,8 +4067,8 @@ findGenericParameterReferences(CanGenericSignature genericSig,
40674067
auto opaqueSig = opaque->getDecl()->getOpaqueInterfaceGenericSignature();
40684068
for (const auto &req : opaqueSig.getRequirements()) {
40694069
switch (req.getKind()) {
4070-
case RequirementKind::SameCount:
4071-
llvm_unreachable("Same-count requirement not supported here");
4070+
case RequirementKind::SameShape:
4071+
llvm_unreachable("Same-shape requirement not supported here");
40724072

40734073
case RequirementKind::Conformance:
40744074
case RequirementKind::Layout:

‎lib/AST/GenericSignature.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void GenericSignatureImpl::forEachParam(
131131
case RequirementKind::Superclass:
132132
case RequirementKind::Conformance:
133133
case RequirementKind::Layout:
134-
case RequirementKind::SameCount:
134+
case RequirementKind::SameShape:
135135
continue;
136136
}
137137

@@ -160,7 +160,7 @@ bool GenericSignatureImpl::areAllParamsConcrete() const {
160160
case RequirementKind::Conformance:
161161
case RequirementKind::Superclass:
162162
case RequirementKind::Layout:
163-
case RequirementKind::SameCount:
163+
case RequirementKind::SameShape:
164164
continue;
165165
}
166166
}
@@ -654,7 +654,7 @@ bool Requirement::isCanonical() const {
654654
return false;
655655

656656
switch (getKind()) {
657-
case RequirementKind::SameCount:
657+
case RequirementKind::SameShape:
658658
case RequirementKind::Conformance:
659659
case RequirementKind::SameType:
660660
case RequirementKind::Superclass:
@@ -674,7 +674,7 @@ Requirement Requirement::getCanonical() const {
674674
Type firstType = getFirstType()->getCanonicalType();
675675

676676
switch (getKind()) {
677-
case RequirementKind::SameCount:
677+
case RequirementKind::SameShape:
678678
case RequirementKind::Conformance:
679679
case RequirementKind::SameType:
680680
case RequirementKind::Superclass: {
@@ -697,8 +697,8 @@ bool
697697
Requirement::isSatisfied(ArrayRef<Requirement> &conditionalRequirements,
698698
bool allowMissing) const {
699699
switch (getKind()) {
700-
case RequirementKind::SameCount:
701-
llvm_unreachable("Same-count requirements not supported here");
700+
case RequirementKind::SameShape:
701+
llvm_unreachable("Same-shape requirements not supported here");
702702

703703
case RequirementKind::Conformance: {
704704
auto *proto = getProtocolDecl();
@@ -738,8 +738,8 @@ Requirement::isSatisfied(ArrayRef<Requirement> &conditionalRequirements,
738738

739739
bool Requirement::canBeSatisfied() const {
740740
switch (getKind()) {
741-
case RequirementKind::SameCount:
742-
llvm_unreachable("Same-count requirements not supported here");
741+
case RequirementKind::SameShape:
742+
llvm_unreachable("Same-shape requirements not supported here");
743743

744744
case RequirementKind::Conformance:
745745
return getFirstType()->is<ArchetypeType>();
@@ -768,7 +768,7 @@ bool Requirement::canBeSatisfied() const {
768768
/// Determine the canonical ordering of requirements.
769769
static unsigned getRequirementKindOrder(RequirementKind kind) {
770770
switch (kind) {
771-
case RequirementKind::SameCount: return 4;
771+
case RequirementKind::SameShape: return 4;
772772
case RequirementKind::Conformance: return 2;
773773
case RequirementKind::Superclass: return 0;
774774
case RequirementKind::SameType: return 3;
@@ -916,7 +916,7 @@ void GenericSignature::verify(ArrayRef<Requirement> reqts) const {
916916

917917
// Check canonicalization of requirement itself.
918918
switch (reqt.getKind()) {
919-
case RequirementKind::SameCount:
919+
case RequirementKind::SameShape:
920920
if (!reqt.getFirstType()->is<GenericTypeParamType>()) {
921921
llvm::errs() << "Left hand side is not a generic parameter: ";
922922
reqt.dump(llvm::errs());
@@ -1114,8 +1114,8 @@ static Requirement stripBoundDependentMemberTypes(Requirement req) {
11141114
auto subjectType = stripBoundDependentMemberTypes(req.getFirstType());
11151115

11161116
switch (req.getKind()) {
1117-
case RequirementKind::SameCount:
1118-
// Same-count requirements do not involve dependent member types.
1117+
case RequirementKind::SameShape:
1118+
// Same-shape requirements do not involve dependent member types.
11191119
return req;
11201120

11211121
case RequirementKind::Conformance:

‎lib/AST/RequirementMachine/ConcreteContraction.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,8 @@ ConcreteContraction::substRequirement(const Requirement &req) const {
371371
auto firstType = req.getFirstType();
372372

373373
switch (req.getKind()) {
374-
case RequirementKind::SameCount:
375-
llvm_unreachable("Same-count requirement not supported here");
374+
case RequirementKind::SameShape:
375+
llvm_unreachable("Same-shape requirement not supported here");
376376

377377
case RequirementKind::Superclass:
378378
case RequirementKind::SameType: {
@@ -553,7 +553,7 @@ bool ConcreteContraction::performConcreteContraction(
553553

554554
auto kind = req.req.getKind();
555555
switch (kind) {
556-
case RequirementKind::SameCount:
556+
case RequirementKind::SameShape:
557557
assert(req.req.getSecondType()->isTypeParameter());
558558
continue;
559559

‎lib/AST/RequirementMachine/Diagnostics.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ bool swift::rewriting::diagnoseRequirementErrors(
182182
break;
183183

184184
switch (requirement.getKind()) {
185-
case RequirementKind::SameCount:
186-
llvm_unreachable("Same-count requirement not supported here");
185+
case RequirementKind::SameShape:
186+
llvm_unreachable("Same-shape requirement not supported here");
187187

188188
case RequirementKind::SameType:
189189
ctx.Diags.diagnose(loc, diag::redundant_same_type_to_concrete,

‎lib/AST/RequirementMachine/Diagnostics.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct RequirementError {
3434
/// A type requirement on a trivially invalid subject type,
3535
/// e.g. Bool: Collection.
3636
InvalidRequirementSubject,
37-
/// An invalid shape requirement, e.g. length(T...) == length(Int)
37+
/// An invalid shape requirement, e.g. T.shape == Int.shape
3838
InvalidShapeRequirement,
3939
/// A pair of conflicting requirements, T == Int, T == String
4040
ConflictingRequirement,

‎lib/AST/RequirementMachine/RequirementBuilder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ void RequirementBuilder::processConnectedComponents() {
329329
MutableTerm subjectTerm(pair.first);
330330
RequirementKind kind;
331331
if (subjectTerm.back().getKind() == Symbol::Kind::Shape) {
332-
kind = RequirementKind::SameCount;
332+
kind = RequirementKind::SameShape;
333333
// Strip off the shape symbol from the subject term.
334334
subjectTerm = MutableTerm{subjectTerm.begin(), subjectTerm.end() - 1};
335335
} else {

‎lib/AST/RequirementMachine/RequirementLowering.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,10 @@ static void desugarSameShapeRequirement(Type lhs, Type rhs, SourceLoc loc,
359359
// For now, only allow shape requirements directly between pack types.
360360
if (!lhs->isTypeSequenceParameter() || !rhs->isTypeSequenceParameter()) {
361361
errors.push_back(RequirementError::forInvalidShapeRequirement(
362-
{RequirementKind::SameCount, lhs, rhs}, loc));
362+
{RequirementKind::SameShape, lhs, rhs}, loc));
363363
}
364364

365-
result.emplace_back(RequirementKind::SameCount,
365+
result.emplace_back(RequirementKind::SameShape,
366366
lhs->getRootGenericParam(),
367367
rhs->getRootGenericParam());
368368
}
@@ -378,7 +378,7 @@ swift::rewriting::desugarRequirement(Requirement req, SourceLoc loc,
378378
auto firstType = req.getFirstType();
379379

380380
switch (req.getKind()) {
381-
case RequirementKind::SameCount:
381+
case RequirementKind::SameShape:
382382
desugarSameShapeRequirement(firstType, req.getSecondType(),
383383
loc, result, errors);
384384
break;
@@ -504,7 +504,7 @@ struct InferRequirementsWalker : public TypeWalker {
504504
auto first = packReferences.begin();
505505
auto second = first + 1;
506506
while (second != packReferences.end()) {
507-
Requirement req(RequirementKind::SameCount, *first++, *second++);
507+
Requirement req(RequirementKind::SameShape, *first++, *second++);
508508
desugarRequirement(req, SourceLoc(), reqs, errors);
509509
}
510510
}
@@ -613,8 +613,8 @@ void swift::rewriting::realizeRequirement(
613613
auto *moduleForInference = dc->getParentModule();
614614

615615
switch (req.getKind()) {
616-
case RequirementKind::SameCount:
617-
llvm_unreachable("Same-count requirement not supported here");
616+
case RequirementKind::SameShape:
617+
llvm_unreachable("Same-shape requirement not supported here");
618618

619619
case RequirementKind::Superclass:
620620
case RequirementKind::Conformance: {

0 commit comments

Comments
 (0)