[CSSimplify] Fix matchDeepEqualityTypes to allow fixing of optionals
#81936
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
…ch is contextual If generic arguments mismatch ends up being recorded on the result of the chain or `try` expression it means that there is a contextual conversion mismatch. For optional conversions the solver currently generates a disjunction with two choices - bind and optional-to-optional conversion which is anchored on the contextual expression. If we can get a fix recorded there that would result in a better diagnostic. It's only possible for optional-to-optional choice because it doesn't bind the variable immediately, so we need to downgrade direct fixes to prevent `bind` choice from considered better.
xedin
requested review from
hborla,
a team,
slavapestov,
xymus,
bnbarham,
CodaFi,
DougGregor,
hamishknight and
rintaro
as code owners
Attempting to propagate generic argument failures up is not always reliable, `matchDeepEqualityTypes` should avoid using `TMF_ApplyingFix` while dealing with optionals and instead let `repairFailures` decide whether to use generic arguments mismatch fix to a more general one.
…ches - Mismatch in tuple element position should reference whole tuple with a note for mismatch position; - Situations where optional object type is not a class but matched against `AnyObject` have a tailored fix.
…ric argument mismatch handling
xedin
force-pushed
the
improve-optional-wrappedValue-mismatch-diagnostics
branch
from
07868df to
4132aa0
Compare
|
@swift-ci please test |
hamishknight
approved these changes
Jun 3, 2025
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.
Attempting to propagate generic argument failures up is not always
reliable,
matchDeepEqualityTypesshould avoid usingTMF_ApplyingFixwhile dealing with optionals and instead let
repairFailuresdecidewhether to use generic arguments mismatch fix to a more general one.
GenericArgumenthandling is updated to:AnyObjectResolves: #81023
Resolves: rdar://149843877