[QoI] Don't rely on extension type to be present when validating its attributes #6065
Conversation
This file contains 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
|
/cc @rudkx @DougGregor |
slavapestov
reviewed
Dec 5, 2016
| @@ -290,7 +290,8 @@ void AttributeEarlyChecker::visitIBActionAttr(IBActionAttr *attr) { | |||
| void AttributeEarlyChecker::visitIBDesignableAttr(IBDesignableAttr *attr) { | |||
| if (auto *ED = dyn_cast<ExtensionDecl>(D)) { | |||
| CanType extendedTy = ED->getExtendedType()->getCanonicalType(); | |||
| if (!isa<ClassDecl>(extendedTy->getAnyNominal())) | |||
| auto nominalType = extendedTy->getAnyNominal(); | |||
| if (!nominalType || !isa<ClassDecl>(nominalType)) | |||
There was a problem hiding this comment.
Even better:
if (auto classDecl = ED->getAsClassOrClassExtensionContext())
There was a problem hiding this comment.
Thanks for the suggestion! I actually made it that way because I wanted to diagnose in-place if the type is NULL as well, which is not going to happen if I use if (auto classDecl = ED->getAsClassOrClassExtensionContext())
There was a problem hiding this comment.
I think they should be equivalent.
…attributes Malformed 'extension' expressions won't have extended type avaliable, so don't rely on that when validating its attributes.
|
@slavapestov Done! |
|
@swift-ci please smoke test and merge |
|
@DougGregor since #6072 got merged, I am closing this one. |
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.
Malformed 'extension' expressions won't have extended type avaliable,
so don't rely on that when validating its attributes.