Skip to content

Commit e4f23a3

Browse files
authored
Merge pull request #7550 from DougGregor/requirement-source
[GenericSig Builder] Rework RequirementSource to describe requirement path
2 parents 6458571 + da39d9b commit e4f23a3

File tree

11 files changed

+937
-372
lines changed

11 files changed

+937
-372
lines changed

include/swift/AST/GenericSignatureBuilder.h

Lines changed: 343 additions & 65 deletions
Large diffs are not rendered by default.

lib/AST/Decl.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3020,12 +3020,12 @@ void ProtocolDecl::computeRequirementSignature() {
30203020
auto selfType = genericSig->getGenericParams()[0];
30213021
auto requirement = genericSig->getRequirements()[0];
30223022

3023-
RequirementSource source(RequirementSource::ProtocolRequirementSignatureSelf,
3024-
getLoc());
3025-
3026-
GenericSignatureBuilder builder(getASTContext(), LookUpConformanceInModule(module));
3023+
GenericSignatureBuilder builder(getASTContext(),
3024+
LookUpConformanceInModule(module));
30273025
builder.addGenericParameter(selfType);
3028-
builder.addRequirement(requirement, source);
3026+
builder.addRequirement(requirement,
3027+
RequirementSource::forRequirementSignature(builder,
3028+
this));
30293029
builder.finalize(SourceLoc(), { selfType });
30303030

30313031
RequirementSignature = builder.getGenericSignature();

0 commit comments

Comments
 (0)