SubstitutionMap cleanups #7211
Merged
SubstitutionMap cleanups #7211
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
slavapestov
force-pushed
the
subst-map-cleanups
branch
from
47a371b to
b651864
Compare
When looking up a generic parameter inside a nominal type context, we would go down the most general substitution-based code path, usually meant for typealiases, instead of calling the much simpler resolveGenericTypeParamType(). Amazingly, everything still worked.
Now we have LookUpConformanceInModule and LookUpConformanceInSubstitutionMap.
First, add some new utility methods to create SubstitutionMaps: - GenericSignature::getSubstitutionMap() -- provides a new way to directly build a SubstitutionMap. It takes a TypeSubstitutionFn and LookupConformanceFn. This is equivalent to first calling getSubstitutions() with the two functions to create an ArrayRef<Substitution>, followed by the old form of getSubstitutionMap() on the result. - TypeBase::getContextSubstitutionMap() -- replacement for getContextSubstitutions(), returning a SubstitutionMap. - TypeBase::getMemberSubstitutionMap() -- replacement for getMemberSubstitutions(), returning a SubstitutionMap. With these in place, almost all existing uses of subst() taking a ModuleDecl can now use the new form taking a SubstitutionMap instead. The few remaining cases are explicitly written to use a TypeSubstitutionFn and LookupConformanceFn.
… places The crazy indexing logic is gone.
slavapestov
force-pushed
the
subst-map-cleanups
branch
from
b651864 to
c90a77d
Compare
Contributor
Author
|
Please test with following pull request: @swift-ci Please smoke test |
slavapestov
added a commit
to slavapestov/swift
that referenced
this pull request
Feb 17, 2017
The hasPolymorphicParameters() method always returns true for a SILFunctionType with witness_method calling convention, because we have to pass the type metadata for 'Self'. However, it is possible for a witness_method to have no generic signature, if we're directly calling a concrete witness method thunk, as can happen after devirtualization. In this case, we would crash if the witness_method was partially applied. Handle this case. This fixes a regression from the recent cleanup to have IRGen use SubstitutionMap: <swiftlang#7211>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.