Skip to content

Align certain records on 8-bit boundary for ARM builds #3899

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 4 commits into from
Aug 1, 2016

Conversation

iachievedit
Copy link
Contributor

What's in this pull request?

Fixes for ARM build failure introduced by 508e825 (additional info bits added for PointerIntPair GetSetRecord and BehaviorRecord).


Before merging this pull request to apple/swift repository:

  • Test pull request on Swift continuous integration.

Triggering Swift CI

The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:

Smoke Testing

Platform Comment
All supported platforms @swift-ci Please smoke test
All supported platforms @swift-ci Please smoke test and merge
OS X platform @swift-ci Please smoke test OS X platform
Linux platform @swift-ci Please smoke test Linux platform

A smoke test on macOS does the following:

  1. Builds the compiler incrementally.
  2. Builds the standard library only for macOS. Simulator standard libraries and
    device standard libraries are not built.
  3. lldb is not built.
  4. The test and validation-test targets are run only for macOS. The optimized
    version of these tests are not run.

A smoke test on Linux does the following:

  1. Builds the compiler incrementally.
  2. Builds the standard library incrementally.
  3. lldb is built incrementally.
  4. The swift test and validation-test targets are run. The optimized version of these
    tests are not run.
  5. lldb is tested.

Validation Testing

Platform Comment
All supported platforms @swift-ci Please test
All supported platforms @swift-ci Please test and merge
OS X platform @swift-ci Please test OS X platform
OS X platform @swift-ci Please benchmark
Linux platform @swift-ci Please test Linux platform

Lint Testing

Language Comment
Python @swift-ci Please Python lint

Note: Only members of the Apple organization can trigger swift-ci.

@hpux735
Copy link
Contributor

hpux735 commented Jul 31, 2016

Thanks, Joe!

@gottesmm
Copy link
Contributor

Do we use these for tagged pointers anywhere?

@hpux735
Copy link
Contributor

hpux735 commented Jul 31, 2016

By tagged do you mean PointerIntPair? If so, yes. See the linked commit from @jrose-apple . An additional field was added to the enum used in that commit, which necessitated an additional bit in the pointer.

@gottesmm
Copy link
Contributor

So the issue is that there are not enough tagged pointer bits on ARM by default, so we need to manually align due to that change?

@hpux735
Copy link
Contributor

hpux735 commented Jul 31, 2016

Yep, that's the ticket. I assume it's because ARM is only 32-bit, so the default alignment used on the 64-bit targets is sufficient without this modification.

@gribozavr
Copy link
Contributor

@swift-ci Please smoke test

@gribozavr
Copy link
Contributor

@swift-ci Please test Linux platform

@gribozavr gribozavr merged commit 22de021 into swiftlang:master Aug 1, 2016
@jrose-apple
Copy link
Contributor

Ah, good catch, sorry for the trouble!

@iachievedit
Copy link
Contributor Author

No worries, @jrose-apple , thanks for the merge @gribozavr I've kicked off a build for the BeagleBone and Raspberry Pis. Much appreciated!

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.

5 participants