Shims: match the declared type for CF interfaces #14492
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`CFHashBytes` takes a `CFIndex`, not a `long`. Because this type is declared differently on different platforms, desugaring the type can cause mismatches. Make the shims match the real declarations in swift-corelibs-foundation.
|
@swift-ci please test |
|
@jrose-apple could you please poke @phausler? This is pretty trivial. |
|
Maybe @millenomi can get to it sooner? |
|
What platform is CFIndex not pointer sized? If so it probably should be corrected. Iirc the reason why the type was desugared is that was that way before we fixed it in CF (pre-export to swift-corelibs-foundation) The change listed seems isomorphic so I have no problems with it being CFIndex or for that matter even ssize_t (albeit perhaps size_t might be better) |
|
I think it's the other way around: on Windows |
|
@compnerd I think it's okay to merge even if we keep discussing. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CFHashBytestakes aCFIndex, not along. Because this type isdeclared differently on different platforms, desugaring the type can
cause mismatches. Make the shims match the real declarations in
swift-corelibs-foundation.
Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
Resolves SR-NNNN.