Support partial generic specialization of closures #7938
Merged
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
…ecialized function in the context of a new generic signature
|
@swift-ci please smoke test |
slavapestov
reviewed
Mar 6, 2017
lib/SILOptimizer/Utils/Generics.cpp
Outdated
| @@ -130,10 +130,15 @@ bool ReabstractionInfo::prepareAndCheck(ApplySite Apply, SILFunction *Callee, | |||
| bool HasConcreteGenericParams = false; | |||
| bool HasNonArchetypeGenericParams = false; | |||
| HasUnboundGenericParams = false; | |||
| for (auto DT : CalleeGenericSig->getGenericParams()) { | |||
| auto *SM = Apply.getModule().getSwiftModule(); | |||
| for (auto GP : CalleeGenericSig->getGenericParams()) { | |||
There was a problem hiding this comment.
Instead you can call GenericSignature::getSubstitutableParams(), which skips those that are concrete
There was a problem hiding this comment.
Oh, nice that we have this API now.
slavapestov
reviewed
Mar 6, 2017
lib/SILOptimizer/Utils/Generics.cpp
Outdated
| @@ -382,6 +388,12 @@ ReabstractionInfo::createSubstitutedType(SILFunction *OrigF, | |||
| Lowering::GenericContextScope GenericScope(M.Types, | |||
| CanSpecializedGenericSig); | |||
| FnTy = OrigF->getLoweredFunctionType()->substGenericArgs(M, SubstMap); | |||
| // Some of the added new requirements may not have been taken into account | |||
There was a problem hiding this comment.
Can you add a FIXME here so that I can remember to remove this when I check in my fix?
There was a problem hiding this comment.
You have a fix for this?
|
Looks good, thanks! |
swiftix
force-pushed
the
wip-partial-specialization-v77
branch
from
235846c to
d85013e
Compare
|
@swift-ci please smoke test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Clean-up the code and fix a bug on the way.