Skip to content

Conversation

@theblixguy
Copy link
Collaborator

Totally forgot to cherry pick #23227 into this branch.


Fixes an issue with redeclaration checking where a static function would incorrectly get marked as a redeclaration of an enum element declaration, even if their types were different. See https://twitter.com/an0/status/1105187953834369025

Resolves SR-10084.

@theblixguy
Copy link
Collaborator Author

Can someone run the CI for me? @xedin @jrose-apple

Thank you!

@xedin
Copy link
Contributor

xedin commented May 29, 2019

@swift-ci please test

@theblixguy
Copy link
Collaborator Author

Thank you @xedin! I think this is worth adding to the change log, so I’ll create another PR for it.

@xedin
Copy link
Contributor

xedin commented May 30, 2019

@slavapestov Since you looked a the original PR and I don't see anything about 5.1 there after quick look, do we want take this?

@theblixguy
Copy link
Collaborator Author

Ping. Can we merge this?

@airspeedswift
Copy link
Member

@slavapestov ?

@airspeedswift
Copy link
Member

@swift-ci please test

@slavapestov slavapestov merged commit cddec31 into swiftlang:swift-5.1-branch Jun 24, 2019
@theblixguy theblixguy deleted the fix/SR-10084 branch June 24, 2019 17:28
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