Skip to content

[Conformance lookup table] Prefer synthesized conformances to deserialized ones. #12478

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Oct 17, 2017
Merged

[Conformance lookup table] Prefer synthesized conformances to deserialized ones. #12478

merged 2 commits into from
Oct 17, 2017

Conversation

DougGregor
Copy link
Member

@DougGregor DougGregor commented Oct 17, 2017 •
edited
Loading

  • Explanation: Fixes a crash involving the addition of protocol conformances to imported types.
  • Scope of Issue: Affects only those cases where we have extensions of imported types that add conformances to protocols that are themselves related to synthesized conformances, e.g., user-defined protocols that inherit RawRepresentable.
  • Risk: Minimal
  • Reviewed By: @slavapestov
  • Testing: Automated test suite
  • Directions for QA: N/A
  • Radar/SR: rdar://problem/34911378/SR-6105

@DougGregor
[Conformance lookup table] Prefer synthesized conformances to deseria…
48d827e 
…lized ones.

When a conformance can either be synthesized or implied, we tend to prefer
implied. However, if the implied conformance comes from a deserialized
conformance, it will lead to an incomplete conformance and cause a crash.

This is a narrow fix for SR-6105 / rdar://problem/34911378.

(cherry picked from commit f4135f9)
@DougGregor
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 48d827e

@DougGregor
Copy link
Member Author

@swift-ci please test and merge

1 similar comment
@DougGregor
Copy link
Member Author

@swift-ci please test and merge

@swift-ci swift-ci merged commit e004d80 into swiftlang:swift-4.0-branch Oct 17, 2017
@DougGregor DougGregor deleted the sr-6105-4.0 branch October 17, 2017 03:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@tkremenek tkremenek

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@DougGregor @swift-ci @tkremenek