Convert ObjectLiteralExpr to not use tc.callWitness() or generate a SemanticExpr #25350
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
…emanticExpr. For reference, all other literal types except dictionaries and string interpolation have been converted over to this form.
This method was only ever called with non-generic witnesses, because it assumed the substitutions stored in the witness would always be derived from the conforming type. There were two cases where this wasn't the case though: 1) If the witness is itself generic 2) The witness was defined in a protocol extension and the conforming type is a non-final class In all cases, the SubstitutionMap stored in a Witness always uses the 'synthetic environment'. In some cases, the 'synthetic environment' is the generic environment of the witness. But in 1) and 2) it was different. While 1) never occurred because we never used this method to look up witnesses for generic requirements, 2) could happen.
|
@swift-ci Please test source compatibility |
|
@swift-ci Please test |
pschuh
approved these changes
Jun 11, 2019
|
|
||
| // If the witness is generic, you have to call getWitness() and build | ||
| // your own substitutions in terms of the synthetic environment. | ||
| if (auto *witnessDC = dyn_cast<DeclContext>(witnessDecl)) |
There was a problem hiding this comment.
Would this be triggered by just another level of genericness in the crasher example?
There was a problem hiding this comment.
I’ll take a look. It would not have worked before anyway though.
|
This broke the windows tests! https://dev.azure.com/compnerd/windows-swift/_build/results?buildId=3115 |
|
I would have expected this to break 32-bit iOS as well |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This takes the patch from #23624 and adds a fix for a tricky bug in ProtocolConformance::getWitnessDeclRef(). Also a couple of tiny related cleanups. Thanks @pschuh for the actual refactoring!