[Diagnostics] In DefineMemberBasedOnUse::diagnoseForAmbiguity, use the base type from each solution #30844
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
the base type from each solution instead of only the base type from the first solution.
|
@swift-ci please smoke test |
xedin
reviewed
Apr 7, 2020
lib/Sema/CSFix.h
Outdated
| @@ -291,7 +291,10 @@ class ConstraintFix { | |||
| virtual bool diagnose(const Solution &solution, | |||
| bool asNote = false) const = 0; | |||
|
|
|||
| virtual bool diagnoseForAmbiguity(ArrayRef<Solution> solutions) const { return false; } | |||
| virtual bool diagnoseForAmbiguity(ArrayRef<Solution> solutions, | |||
| ArrayRef<ConstraintFix *> fixes) const { | |||
There was a problem hiding this comment.
Could you please adjust this in way that it takes ArrayRef<std::pair<const Solution &, Constraint Fix *>>. That would future proof this interface a bit...
|
@swift-ci please smoke test |
|
Oh, yeah that's easy, thanks! |
…rray ref of pairs rather than two parallel arrays.
hborla
force-pushed
the
diagnose-for-ambiguity
branch
from
a085040 to
ece84b1
Compare
|
@swift-ci please smoke test |
|
@swift-ci please smoke test OS X platform |
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.
Previously, the code only used the base type from the first solution. This resulted in potentially calling
solution.simplifyTypeon a type that involved type variables that didn't appear in that solution.Resolves: rdar://problem/61005878