Skip to content

[GSB] Use addConditionalRequirements for all conditional-requirement-adding. #15566

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 1 commit into from
Mar 28, 2018
Merged

[GSB] Use addConditionalRequirements for all conditional-requirement-adding. #15566

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 6 additions & 8 deletions lib/AST/GenericSignatureBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2596,13 +2596,14 @@ ConstraintResult GenericSignatureBuilder::handleUnresolvedRequirement(
// Function for feeding through any other requirements that the conformance
// requires to be satisfied. These are things we're inferring.
static void addConditionalRequirements(GenericSignatureBuilder &builder,
ProtocolConformanceRef conformance) {
ProtocolConformanceRef conformance,
ModuleDecl *inferForModule) {
// Abstract conformances don't have associated decl-contexts/modules, but also
// don't have conditional requirements.
if (conformance.isConcrete()) {
auto source = FloatingRequirementSource::forInferred(nullptr);
for (auto requirement : conformance.getConditionalRequirements()) {
builder.addRequirement(requirement, source, /*inferForModule=*/nullptr);
builder.addRequirement(requirement, source, inferForModule);
++NumConditionalRequirementsAdded;
}
}
Expand Down Expand Up @@ -2646,7 +2647,7 @@ GenericSignatureBuilder::resolveConcreteConformance(ResolvedType type,

concreteSource = concreteSource->viaConcrete(*this, *conformance);
equivClass->recordConformanceConstraint(*this, type, proto, concreteSource);
addConditionalRequirements(*this, *conformance);
addConditionalRequirements(*this, *conformance, /*inferForModule=*/nullptr);
return concreteSource;
}
const RequirementSource *GenericSignatureBuilder::resolveSuperConformance(
Expand Down Expand Up @@ -2677,7 +2678,7 @@ const RequirementSource *GenericSignatureBuilder::resolveSuperConformance(
superclassSource =
superclassSource->viaSuperclass(*this, *conformance);
equivClass->recordConformanceConstraint(*this, type, proto, superclassSource);
addConditionalRequirements(*this, *conformance);
addConditionalRequirements(*this, *conformance, /*inferForModule=*/nullptr);
return superclassSource;
}

Expand Down Expand Up @@ -4718,10 +4719,7 @@ ConstraintResult GenericSignatureBuilder::addTypeRequirement(

// FIXME: diagnose if there's no conformance.
if (conformance) {
auto inferredSource = FloatingRequirementSource::forInferred(nullptr);
for (auto req : conformance->getConditionalRequirements()) {
addRequirement(req, inferredSource, inferForModule);
}
addConditionalRequirements(*this, *conformance, inferForModule);
}
}
}
Expand Down