Clean up extension validation #19386
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
|
@swift-ci Please test |
|
@swift-ci Please test source compatibility |
jrose-apple
reviewed
Sep 19, 2018
| return getGenericParamsOfContext()->getParams().front() | ||
| auto *genericParams = getGenericParamsOfContext(); | ||
| if (genericParams == nullptr) | ||
| return nullptr; |
There was a problem hiding this comment.
When does this come up for a protocol extension?
There was a problem hiding this comment.
Invalid code, like when an extension is inside of another decl, we don't build the generic parameter list for it anymore.
There was a problem hiding this comment.
But we still bind the underlying type? Okay.
jrose-apple
reviewed
Sep 19, 2018
lib/Sema/TypeCheckDecl.cpp
Outdated
| /// typealias GX2<A> = X<A, A> | ||
| /// typealias GX3<A, B> = X<B, A> | ||
| /// \endcode | ||
| bool isPassThroughTypealias(TypeAliasDecl *typealias) { |
…es() Instead, call validateExtension(), but only after we've already ruled out the non-protocol extension case, because we can do that by using getExtendedNominal().
We'll instead diagnose them when we type check their primary file, since typeCheckDecl() calls validateExtension() whcih calls bindExtension().
slavapestov
force-pushed
the
validate-extension-cleanup
branch
from
f977555 to
4c7e889
Compare
|
@swift-ci Please smoke test |
DougGregor
approved these changes
Sep 19, 2018
| auto extendedNominal = aliasDecl->getDeclaredInterfaceType()->getAnyNominal(); | ||
| if (extendedNominal) { | ||
| extendedType = extendedNominal->getDeclaredType(); | ||
| if (!isPassThroughTypealias(aliasDecl)) |
There was a problem hiding this comment.
I suppose this is where we should diagnose non-passthrough typealias declarations that will turn into extensions of the underlying nominal type (and not become parameterized extensions magically).
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.
I started looking at a fix for rdar://44429394 and ended up doing this first...