[CF] Add missing DEPLOYMENT_RUNTIME_SWIFT guard. #2594
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
CFArray.c references __CFSwiftBridge which is defined behind DEPLOYMENT_RUNTIME_SWIFT, so this needs to be behind that guard as well when DEPLOYMENT_RUNTIME_SWIFT is not set.
parkera
reviewed
Dec 20, 2019
| @@ -971,8 +971,10 @@ void CFArraySortValues(CFMutableArrayRef array, CFRange range, CFComparatorFunct | |||
| result = CF_OBJC_CALLV((NSMutableArray *)array, isKindOfClass:[NSMutableArray class]); | |||
| immutable = !result; | |||
| } else if (CF_IS_SWIFT(CFArrayGetTypeID(), array)) { | |||
| #if DEPLOYMENT_RUNTIME_SWIFT | |||
There was a problem hiding this comment.
Should we move this up one line, such that the else is inside the guard too?
There was a problem hiding this comment.
It's not strictly necessary, because CF_IS_SWIFT becomes (0) in CFinternal.h:733 when DEPLOYMENT_RUNTIME_SWIFT is undefined.
Let me know if you'd prefer it be moved, though, since it won't really hurt.
|
@swift-ci please test |
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.
CFArray.c references __CFSwiftBridge which is defined behind
DEPLOYMENT_RUNTIME_SWIFT, so this needs to be behind that guard
as well when DEPLOYMENT_RUNTIME_SWIFT is not set.