Skip to content

[5.1][CSFix] Delay missing unwrap locator simplification until diagnostic #26413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 30, 2019

Conversation

xedin
Copy link
Contributor

@xedin xedin commented Jul 30, 2019

  • Explanation:

Instead of keeping two locators in the fix let's store only the
original locator and simplify it later in process of emitting
a diagnostic. That helps to avoid some duplicate work as well
as makes sure that locators supplied to the diagnostic always
have an anchor.

  • Issue: rdar://problem/53238058, rdar://problem/53344815

  • Scope: Constraint solver in diagnostic mode.

  • Risk: Very Low.

  • Testing: Added compiler regression tests.

  • Reviewed by: @DougGregor

Resolves: rdar://problem/53344815
Resolves: rdar://problem/53238058
(cherry picked from commit 795a84a)

Instead of keeping two locators in the fix let's store only the
original locator and simplify it later in process of emitting
a diagnostic. That helps to avoid some duplicate work as well
as makes sure that locators supplied to the diagnostic always
have an anchor.

Resolves: rdar://problem/53344815
Resolves: rdar://problem/53238058
(cherry picked from commit 795a84a)
@xedin xedin requested a review from a team as a code owner July 30, 2019 17:02
@xedin
Copy link
Contributor Author

xedin commented Jul 30, 2019

@swift-ci please test

Copy link
Contributor

@AnnaZaks AnnaZaks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved.

@AnnaZaks AnnaZaks merged commit 252a072 into swiftlang:swift-5.1-branch Jul 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants