Fix capturing dynamic Self #3235
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
This also adds some tests for the existing generic parameter capture logic, which was only tested as part of SILGen tests until now. Also, move capture analysis into a new TypeCheckCaptures.cpp file.
To support closures that capture the dynamic Self type, we need to add a new hidden parameter which does not have a VarDecl.
…type of $Self Formerly SILGen would never emit this sequence. In fact in most places we lower away dynamic Self, replacing it with the concrete Self type instead. However, with an upcoming change, I'm using 'metatype $Self' as a handy way to grab IRGenSILFunction::LocalSelfMetadata, since that's what it already does. Note that the tests for this are in the next patch.
If a closure captures the dynamic 'Self' type, but no value of type 'Self' (for example, it is possible to have a weak capture of 'self'; if the weak reference becomes nil, there's no way for the closure to get the dynamic 'Self' type from the value). In this case, add a hidden argument of type $Self.Type, and pass in the Self metatype. Fixes <https://bugs.swift.org/browse/SR-1558> / <rdar://problem/22299905>.
| @@ -26,12 +26,6 @@ using namespace swift; | |||
| SILArgument::SILArgument(SILBasicBlock *ParentBB, SILType Ty, | |||
| const ValueDecl *D) | |||
| : ValueBase(ValueKind::SILArgument, Ty), ParentBB(ParentBB), Decl(D) { | |||
| // Function arguments need to have a decl. | |||
There was a problem hiding this comment.
Hi @jckarter, if you have a better idea here, let me know. I'm not a fan of removing assertions for all the usual reasons.
There was a problem hiding this comment.
I'm not a fan of this particular assertion, but you might want to check with @adrian-prantl to make sure the debugger's able to do something reasonable with the self metadata.
|
@swift-ci Please 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.
No description provided.