Skip to content

Revert "Sema: Remove some unreachable code from CSApply" #36523

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 2 commits into from
Mar 22, 2021

Conversation

ahoppen
Copy link
Member

@ahoppen ahoppen commented Mar 19, 2021

As discussed in #36493 and #36494, this reverts #36028 and adds the test cases from those PRs.

I have also adjusted the tests to live in validation-test/IDE/crashers_2_fixed and use swift-ide-test instead of sourcekitd-test.

Fixes rdar://75219757 [SR-14319] and rdar://75200446 [SR-14318]

@ahoppen ahoppen requested review from xedin and slavapestov March 19, 2021 18:41
@ahoppen
Copy link
Member Author

ahoppen commented Mar 19, 2021

@swift-ci Please test

Copy link
Contributor

@xedin xedin left a comment

Choose a reason for hiding this comment

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

LGTM! We'd have to wait until code completion is completely ported to use typeCheckForCodeCompletion before removing this unfortunately...

@slavapestov
Copy link
Contributor

Nice find! Probably some parts of that PR are almost certainly still dead, but we can wait to re-apply it until we finish cleaning up code completion.

@ahoppen
Copy link
Member Author

ahoppen commented Mar 22, 2021

Yeah, most likely the majority is still unreachable and sorry for reverting. But as you said, we can probably just re-apply it later.

@ahoppen
Copy link
Member Author

ahoppen commented Mar 22, 2021

@swift-ci Please smoke test Windows

@ahoppen ahoppen merged commit 3d2fd56 into swiftlang:main Mar 22, 2021
@ahoppen ahoppen deleted the pr/revert-remove-unreachable-code branch March 22, 2021 12:05
@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 180dd2b

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 180dd2b

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.

4 participants