Skip to content

[Archetype builder] Remove an unnecessary use of TypeSubstitutionMap. #6740

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
Jan 11, 2017
Merged

[Archetype builder] Remove an unnecessary use of TypeSubstitutionMap. #6740

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
26 changes: 15 additions & 11 deletions lib/AST/ArchetypeBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1566,24 +1566,28 @@ class ArchetypeBuilder::InferRequirementsWalker : public TypeWalker {
if (!genericSig)
return Action::Stop;

auto params = genericSig->getInnermostGenericParams();
/// Retrieves the type substitution.
auto args = boundGeneric->getGenericArgs();
auto genericSigDepth =
genericSig->getInnermostGenericParams().front()->getDepth();
auto getTypeSubstitution = [&](SubstitutableType *dependentType) -> Type {
if (auto gp = dyn_cast<GenericTypeParamType>(dependentType)) {
if (gp->getDepth() == genericSigDepth)
return args[gp->getIndex()];

return gp;
}

// Produce substitutions from the generic parameters to the actual
// arguments.
TypeSubstitutionMap substitutions;
for (unsigned i = 0, n = params.size(); i != n; ++i) {
substitutions[params[i]->getCanonicalType()->castTo<SubstitutableType>()]
= args[i];
}
return dependentType;
};

// Handle the requirements.
RequirementSource source(RequirementSource::Inferred, Loc);
for (const auto &req : genericSig->getRequirements()) {
switch (req.getKind()) {
case RequirementKind::SameType: {
auto firstType = req.getFirstType().subst(
QueryTypeSubstitutionMap{substitutions},
getTypeSubstitution,
Builder.getLookupConformanceFn());
if (!firstType)
break;
Expand All @@ -1594,7 +1598,7 @@ class ArchetypeBuilder::InferRequirementsWalker : public TypeWalker {
return Action::Continue;

auto secondType = req.getSecondType().subst(
QueryTypeSubstitutionMap{substitutions},
getTypeSubstitution,
Builder.getLookupConformanceFn());
if (!secondType)
break;
Expand All @@ -1618,7 +1622,7 @@ class ArchetypeBuilder::InferRequirementsWalker : public TypeWalker {
case RequirementKind::Superclass:
case RequirementKind::Conformance: {
auto subjectType = req.getFirstType().subst(
QueryTypeSubstitutionMap{substitutions},
getTypeSubstitution,
Builder.getLookupConformanceFn());
if (!subjectType)
break;
Expand Down