[NFC] Fold The Tri-State In Optional<ProtocolConformanceRef> #27949
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
ProtocolConformanceRef already has an invalid state. Drop all of the uses of Optional<ProtocolConformanceRef> and just use ProtocolConformanceRef::forInvalid() to represent it. Mechanically translate all of the callers and callsites to use this new representation.
Use ProtocolConformanceRef::forInvalid() in implementations only as a semantic signal. In one place, use the default constructor to drop the final use of Optional<ProtocolConformanceRef>.
ProtocolConformanceRef::isConcrete checks the invalid bit for us.
Contributor
Author
|
@swift-ci please test |
Contributor
Author
|
@swift-ci please test source compatibility |
Contributor
|
Build failed |
DougGregor
approved these changes
Oct 30, 2019
Member
DougGregor
left a comment
DougGregor
left a comment
There was a problem hiding this comment.
This all looks reasonable to me, although wow is it a big change
Contributor
Author
|
Infrastructure outage @swift-ci please test |
Contributor
Author
|
@swift-ci please test source compatibility |
Contributor
Author
|
⛵️ |
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.
ProtocolConformanceRefalready has an invalid state. Use this instead ofNoneto signal something has gone wrong or a witness is missing. As this makesProtocolConformanceRefbehave like an Optional, give it anoperator booland a default constructor and clean up all the call sites.The result has been
clang-format'ed with some minor revisions to keep noise down. I apologize in advance for the size of this patch, but there should be no behavior changes so the diff should be read as a 1-1 mapping between APIs.