Skip to content

[5.0] statically map CF types in the ClangImporter #20840

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
Dec 18, 2018

Conversation

compnerd
Copy link
Member

As per https://forums.swift.org/t/llp64-targets-and-integral-types/18253/15, define mappings for CFTypeID, CFOptionFlags, CFHashCode to UInt for LLP64 support.

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

As per https://forums.swift.org/t/llp64-targets-and-integral-types/18253/15, define mappings for `CFTypeID`, `CFOptionFlags`, `CFHashCode`  to `UInt` for LLP64 support.
@compnerd compnerd requested a review from a team as a code owner November 28, 2018 22:02
@compnerd
Copy link
Member Author

@swift-ci please test

@AnnaZaks AnnaZaks requested a review from jrose-apple November 28, 2018 22:07
@compnerd
Copy link
Member Author

This should be low risk. This doesn't change any thing in the ABI for Darwin (they should map over as they currently do), but will impact Windows x86_64 support. This ensures that the types are mapped correctly.

Copy link
Contributor

@jrose-apple jrose-apple left a comment

Choose a reason for hiding this comment

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

This is a cherry-pick of #20717. I agree with Saleem's analysis; in fact I'd go even further and say there's no effect on either source or binary compatibility for either Apple platforms or Linux.

@compnerd compnerd changed the title CF Types [5.0] statically map CF types in the ClangImporter Nov 28, 2018
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. Waiting for convergence to be over.

@AnnaZaks
Copy link
Contributor

AnnaZaks commented Dec 7, 2018

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented Dec 7, 2018

Build failed
Swift Test Linux Platform
Git Sha - 7ba61f0

@jrose-apple
Copy link
Contributor

Linux failure is a nondeterministic Foundation XCTest segfault, which I've seen on other PRs. @millenomi, do you have a bug for this already?

@swift-ci Please test Linux

@compnerd
Copy link
Member Author

@swift5-branch-managers (@tkremenek) ping?

@jrose-apple
Copy link
Contributor

@apple/swift5-branch-managers works

@compnerd
Copy link
Member Author

@jrose-apple ... unfortunately, it doesn't work for me (you need to be part of the apple organization to do that since the alias is private)

@jrose-apple
Copy link
Contributor

Oh, I didn't realize!

@AnnaZaks AnnaZaks merged commit fdd904b into swiftlang:swift-5.0-branch Dec 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants