Skip to content

[5.1-04-24-2019][Reflection] Switch Remote Mirror back to uintptr_t for pointers on watchOS. #24532

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

Conversation

mikeash
Copy link
Contributor

@mikeash mikeash commented May 6, 2019

Cherry-pick #24529 for 5.1-04-024-2019.

Existing Remote Mirror dylibs are compiled this way, and changing it breaks binary compatibility. We want to use uint64_t everywhere else, since the target's pointer size may not match ours.

rdar://problem/50279443

@mikeash mikeash requested a review from a team as a code owner May 6, 2019 20:54
@mikeash
Copy link
Contributor Author

mikeash commented May 6, 2019

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented May 6, 2019

Build failed
Swift Test Linux Platform
Git Sha - 0faceee671b8d27e50588bcfb2438d8921f59a4d

@swift-ci
Copy link
Contributor

swift-ci commented May 6, 2019

Build failed
Swift Test OS X Platform
Git Sha - 0faceee671b8d27e50588bcfb2438d8921f59a4d

@mikeash
Copy link
Contributor Author

mikeash commented May 7, 2019

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented May 7, 2019

Build failed
Swift Test Linux Platform
Git Sha - 0faceee671b8d27e50588bcfb2438d8921f59a4d

@swift-ci
Copy link
Contributor

swift-ci commented May 7, 2019

Build failed
Swift Test OS X Platform
Git Sha - 0faceee671b8d27e50588bcfb2438d8921f59a4d

@bob-wilson
Copy link
Contributor

I would be happy to approve this but it would be good to get someone who knows the remote mirror code to review it. Maybe @slavapestov or @dcci?

@mikeash mikeash requested review from dcci and slavapestov May 7, 2019 13:55
Copy link
Member

@dcci dcci left a comment

Choose a reason for hiding this comment

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

LGTM.

@dcci
Copy link
Member

dcci commented May 7, 2019

(although it's a little sad we have to play these tricks).

…atchOS.

Existing Remote Mirror dylibs are compiled this way, and changing it breaks binary compatibility. We want to use uint64_t everywhere else, since the target's pointer size may not match ours.

rdar://problem/50279443
@mikeash mikeash force-pushed the remote-mirror-watchos-pointer-size-fix-5.1-04-24-2019 branch from 0faceee to 941fdd3 Compare May 8, 2019 17:50
@mikeash
Copy link
Contributor Author

mikeash commented May 8, 2019

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented May 8, 2019

Build failed
Swift Test Linux Platform
Git Sha - 0faceee671b8d27e50588bcfb2438d8921f59a4d

@swift-ci
Copy link
Contributor

swift-ci commented May 8, 2019

Build failed
Swift Test OS X Platform
Git Sha - 0faceee671b8d27e50588bcfb2438d8921f59a4d

…Availability.h.

While we're in there, make SwiftReflectionTest's debugLog function take an @autoclosure so we don't waste a ton of time constructing log messages that are never logged.
@mikeash
Copy link
Contributor Author

mikeash commented May 8, 2019

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented May 8, 2019

Build failed
Swift Test OS X Platform
Git Sha - 941fdd3

@swift-ci
Copy link
Contributor

swift-ci commented May 8, 2019

Build failed
Swift Test Linux Platform
Git Sha - 941fdd3

@mikeash mikeash merged commit f6ac96f into swiftlang:swift-5.1-branch-04-24-2019 May 9, 2019
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