Skip to content

[5.0] [ClangImporter] NS_ERROR_ENUMs can be redefined in separate modules #20572

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
Nov 14, 2018

Conversation

jrose-apple
Copy link
Contributor

@jrose-apple jrose-apple commented Nov 14, 2018

Cherry-pick of #20527 to the swift-5.0-branch. Reviewed by @harlanhaskins.

rdar://problem/45646620
rdar://problem/46066125

…wiftlang#20527)

It's not something that /ought/ to happen, but when modules aren't
quite set up properly (often by accident, thanks to header maps), we
can get into basically this situation by having the definition end up
in a header that's textually included into two different modules, or
into a module and a bridging header. Handle that the same way we
handle other redeclarations: have it show up in both modules.

rdar://problem/45646620
(cherry picked from commit 647dd40)
@jrose-apple
Copy link
Contributor Author

@swift-ci Please test macOS

@jrose-apple jrose-apple merged commit c74abe0 into swiftlang:swift-5.0-branch Nov 14, 2018
@jrose-apple jrose-apple deleted the 5.0-i-am-error branch November 14, 2018 20:51
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.

1 participant