Skip to content
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

Fix CFSwiftStringGetBytes on big endian #1288

Merged
merged 1 commit into from
Nov 16, 2017

Conversation

vivkong
Copy link
Contributor

@vivkong vivkong commented Oct 30, 2017

This will allow TestNSString.test_swiftStringUTF16 and a few TimeZone related test cases to pass.

@vivkong vivkong changed the base branch from swift-4.1-branch to master October 30, 2017 12:59
@parkera
Copy link
Contributor

parkera commented Oct 31, 2017

So to be clear, this is with data that is UTF16LE on a big endian host?

@vivkong
Copy link
Contributor Author

vivkong commented Oct 31, 2017

Thanks for your review. The previous 2 lines

                 let byte0 = UInt8(character & 0x00ff)
                 let byte1 = UInt8((character >> 8) & 0x00ff)

turned the data into LE format. Maybe a better fix is to modify those 2 lines instead. I've reworked this.

@vivkong vivkong force-pushed the swift-4.1-nscfstring-fix branch from e8fc886 to cec2156 Compare October 31, 2017 13:03
@alblue
Copy link
Contributor

alblue commented Nov 2, 2017

@swift-ci please test

@vivkong
Copy link
Contributor Author

vivkong commented Nov 6, 2017

Doesn't seem like the tests were kicked off. Can we please try again? Thanks.

@spevans
Copy link
Contributor

spevans commented Nov 6, 2017

@swift-ci please test

@alblue
Copy link
Contributor

alblue commented Nov 13, 2017

@parkera this looks good to me - WDYT?

@parkera parkera merged commit c13b850 into swiftlang:master Nov 16, 2017
@vivkong
Copy link
Contributor Author

vivkong commented Nov 17, 2017

Is it possible to have this backported to the 4.0 branch? Is it via PR?

@alblue
Copy link
Contributor

alblue commented Nov 17, 2017

Yeah, you'll have to create a new PR cherry-picking this against the swift-4.0 branch (you can cross-reference this pull request when you do). @parkera will have to explicitly approve it though.

Also, I'm not sure when/if the swift-4.1 branch will pick up changes for master - if there's no further merges happening you might have to cherry-pick there as well.

I'm not sure if the 4.0 branch will build another release or not though, so even if it ends up there you may find we don't build a new release with it in. However, @parkera is the one who can tell you.

I'd suggest getting the PR in today, as next week is Thanksgiving week in the USA and there may be people on vacation during that week.

@vivkong
Copy link
Contributor Author

vivkong commented Nov 17, 2017

Thanks @alblue. I'll try to get one in today. I saw that this commit is already in swift-4.1-branch.

vivkong added a commit to linux-on-ibm-z/swift-corelibs-foundation that referenced this pull request Nov 17, 2017
@vivkong vivkong deleted the swift-4.1-nscfstring-fix branch November 17, 2017 16:27
@parkera
Copy link
Contributor

parkera commented Nov 17, 2017

I think we should focus on the Swift 4.1 branch at this time.

@parkera
Copy link
Contributor

parkera commented Nov 17, 2017

We should still be auto-merging the master branch to swift-4.1 though, so it'll pick this up automatically.

vivkong added a commit to linux-on-ibm-z/swift-corelibs-foundation that referenced this pull request Nov 21, 2017
vivkong added a commit to linux-on-ibm-z/swift-corelibs-foundation that referenced this pull request Feb 2, 2018
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