[QoI] Improve diagnostics for misaligned archetypes with the same name in calls #11281
+104
−5
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 smoke test |
|
/cc @slavapestov I'm not sure if that's the right way of handling decls for generic/dependent type... |
slavapestov
reviewed
Aug 1, 2017
lib/Sema/CSDiag.cpp
Outdated
| @@ -1876,23 +1879,66 @@ bool CalleeCandidateInfo::diagnoseGenericParameterErrors(Expr *badArgExpr) { | |||
| argType, archetypesMap)) | |||
| return false; | |||
|
|
|||
| auto getDecls = | |||
There was a problem hiding this comment.
Just return a Decl* and not this
slavapestov
reviewed
Aug 1, 2017
lib/Sema/CSDiag.cpp
Outdated
| Decl *parent = nullptr; | ||
| ValueDecl *decl = nullptr; | ||
|
|
||
| std::tie(decl, parent) = genericParam; |
There was a problem hiding this comment.
You can compute the parent here
slavapestov
reviewed
Aug 1, 2017
lib/Sema/CSDiag.cpp
Outdated
| auto paramType = env->mapTypeOutOfContext(archetype); | ||
|
|
||
| if (auto *GTPT = paramType->getAs<GenericTypeParamType>()) { | ||
| auto *decl = GTPT->getDecl(); |
There was a problem hiding this comment.
decl might be null, just bail out in that case
slavapestov
reviewed
Aug 1, 2017
lib/Sema/CSDiag.cpp
Outdated
| auto *parent = dc->getInnermostDeclarationDeclContext(); | ||
| return Optional<GenericDeclWithParent>({decl, parent}); | ||
| } else if (auto *DMT = paramType->getAs<DependentMemberType>()) { | ||
| auto *decl = DMT->getAssocType(); |
There was a problem hiding this comment.
decl might be null, just bail out in that case
gottesmm
reviewed
Aug 1, 2017
lib/Sema/CSDiag.cpp
Outdated
| auto *dc = decl->getDeclContext(); | ||
| auto *parent = dc->getInnermostDeclarationDeclContext(); | ||
| return Optional<GenericDeclWithParent>({decl, parent}); | ||
| } else if (auto *DMT = paramType->getAs<DependentMemberType>()) { |
There was a problem hiding this comment.
This violates LLVM style. There is no point in putting in an else if you are returning here. Just use the early return.
…e in calls Resolves: rdar://problem/24329052.
|
Alright, all comments addressed, thanks guys! |
|
@swift-ci please smoke test and merge |
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.
Resolves: rdar://problem/24329052.