[4.2] SILGen: createWithoutActuallyEscapingClosure needs to use a sub… #17434
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
…stitution map in the context of the current generic enviroment We used a substitution map derived from a thunk that might have been created in a different function if that other function used the same thunk type. Instead use a substitution map that was derived from the current functions generic environment. rdar://41331672 SR-8064
|
@swift-ci Please test |
|
Build failed |
|
Build failed |
slavapestov
approved these changes
Jun 22, 2018
lib/SILGen/SILGenPoly.cpp
Outdated
| // thunk->getForwardingSubstitutionMap() / thunk might have been created in a | ||
| // different function's generic enviroment. | ||
| if (auto genericSig = thunkType->getGenericSignature()) { | ||
| substFnTy = thunkType->substGenericArgs(F.getModule(), interfaceSubs); |
There was a problem hiding this comment.
Oh, nice catch. I wonder if thunks should always get a new generic environment instead of inheriting one from their parent. We might have the same issue with any other kind of thunk we emit lazily.
There was a problem hiding this comment.
On quick review, all the other places that call 'buildThunkType' perform this substitution.
|
@swift-ci Please test |
|
Build failed |
|
Build failed |
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.
…stitution map in the context of the current generic enviroment
We used a substitution map derived from a thunk that might have been
created in a different function if that other function used the same
thunk type.
Instead use a substitution map that was derived from the
current functions generic environment.
rdar://41331672
SR-8064