Skip to content

runtime: make LLP64 clean #11976

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
Sep 19, 2017
Merged

runtime: make LLP64 clean #11976

merged 1 commit into from
Sep 19, 2017

Conversation

compnerd
Copy link
Member

This is a blanket pass replacing use of __LP64__ with
__POINTER_WIDTH__ == 64. The latter is more expressive and also LLP64
clean. This change is needed to enable support for Windows x86_64 which
is a LLP64 environment.

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

Resolves SR-NNNN.

@compnerd compnerd requested a review from gparker42 September 17, 2017 23:27
@compnerd
Copy link
Member Author

CC: @jrose-apple @rjmccall

@compnerd
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - b177a599742226aef9eaf7f859d3aa8bb7a9d89a

@compnerd
Copy link
Member Author

Don't think that the foundation failure is related (network flakiness?)

@swift-ci please test Linux platform

@@ -660,7 +660,7 @@ const ExtraInhabitantsValueWitnessTable METATYPE_VALUE_WITNESS_SYM(Bo); // Built

/// Return the value witnesses for unmanaged pointers.
static inline const ValueWitnessTable &getUnmanagedPointerValueWitnesses() {
#ifdef __LP64__
#ifdef __POINTER_WIDTH__ == 64
Copy link
Member Author

Choose a reason for hiding this comment

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

Oops, I uploaded the wrong version This should be #if __POINTER_WIDTH__ == 64.

This is a blanket pass replacing use of `__LP64__` with
`__POINTER_WIDTH__ == 64`.  The latter is more expressive and also LLP64
clean.  This change is needed to enable support for Windows x86_64 which
is a LLP64 environment.
@compnerd
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - b177a599742226aef9eaf7f859d3aa8bb7a9d89a

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - b177a599742226aef9eaf7f859d3aa8bb7a9d89a

@compnerd
Copy link
Member Author

The macOS failure seems unrelated. "ld: can't write output file: - for architecture i386"

@swift-ci please test macOS platform

@compnerd compnerd merged commit 7ae7cc5 into swiftlang:master Sep 19, 2017
@compnerd compnerd deleted the llp64 branch September 19, 2017 04:26
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.

3 participants