[SR-3917] Allow missing witnesses for optional and unavailable requirements. #7886
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
…ements. This is a bit of a hack to dodge an assertion. In essence, it's a harmless hack, but we'd like to make the handling of optional and unavailable requirements more rigorous.
|
@swift-ci please smoke test and merge |
slavapestov
reviewed
Mar 3, 2017
| @@ -1997,7 +1997,8 @@ struct ASTNodeBase {}; | |||
|
|
|||
| if (auto req = dyn_cast<ValueDecl>(member)) { | |||
| if (!normal->hasWitness(req)) { | |||
| if (req->getAttrs().isUnavailable(Ctx) && | |||
| if ((req->getAttrs().isUnavailable(Ctx) || | |||
| req->getAttrs().hasAttribute<OptionalAttr>()) && | |||
There was a problem hiding this comment.
I've got some serious tabs going on, apparently. Will fix!
slavapestov
reviewed
Mar 3, 2017
| || requirement->getAttrs().hasAttribute<OptionalAttr>() | ||
| || requirement->getAttrs().isUnavailable( | ||
| requirement->getASTContext())) && | ||
| "Conformance already complete?"); |
|
Looks good modulo Slava's indentation comments. |
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.
This is a bit of a hack to dodge an assertion. In essence, it's a
harmless hack, but we'd like to make the handling of optional and
unavailable requirements more rigorous.
Resolves SR-3917.