Skip to content

[GenericSignatureBuilder] Remove self-derived same-type-to-concrete constraints. #7812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 28, 2017
Merged

[GenericSignatureBuilder] Remove self-derived same-type-to-concrete constraints. #7812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6adeb2d
[GenericSigBuilder] Track associated type declarations in Requirement…
DougGregor Feb 27, 2017
40a813b
[GenericSigBuilder] Sink RequirementSource into GenericSignatureBuilder.
DougGregor Feb 28, 2017
f7bc907
[GSB] Provide a root potential archetype for nested-type-name-match s…
DougGregor Feb 28, 2017
dbf5782
[GSB] Provide a root potential archetype for requirement-signature so…
DougGregor Feb 28, 2017
2d430d8
[GSB] Always pass a root potential archetype to a requirement source.
DougGregor Feb 28, 2017
c2da971
[GSB] Store the root potential archetype in RequirementSource.
DougGregor Feb 28, 2017
5ec3857
[GSB] Remove self-derived same-type-to-concrete constraints.
DougGregor Feb 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
934 changes: 533 additions & 401 deletions include/swift/AST/GenericSignatureBuilder.h
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions lib/AST/Decl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3104,9 +3104,10 @@ void ProtocolDecl::computeRequirementSignature() {
GenericSignatureBuilder builder(getASTContext(),
LookUpConformanceInModule(module));
builder.addGenericParameter(selfType);
builder.addRequirement(requirement,
RequirementSource::forRequirementSignature(builder,
this));
builder.addRequirement(
requirement,
GenericSignatureBuilder::RequirementSource
::forRequirementSignature(builder.resolveArchetype(selfType), this));
builder.finalize(SourceLoc(), { selfType });

RequirementSignature = builder.getGenericSignature();
Expand Down
Loading