codegen: Use target pointer size consistently for layout calculations #1289
Conversation
This file contains 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
|
|
emilio
force-pushed
the
target-stuff
branch
3 times, most recently
from
e7d8082 to
b69ecbf
Compare
fitzgen
approved these changes
Apr 3, 2018
| let triple; | ||
| let pointer_width; | ||
| unsafe { | ||
| let ti = clang_getTranslationUnitTargetInfo(tu.x); |
There was a problem hiding this comment.
Oh, nice -- this is the API you sent patches upstream to add, right?
| len; | ||
| field_layout.align = mem::size_of::<*mut ()>(); | ||
| // access, since they won't be properly aligned, but there's not too | ||
| // much we can do about it. |
There was a problem hiding this comment.
For posterity, we can use #[repr(align(..))] to fix this ultra hack now (given a new enough target rust).
ci/before_install.sh
Outdated
| @@ -1,36 +1,60 @@ | |||
| set -ex | |||
| set -e | |||
There was a problem hiding this comment.
I think having -x is useful for debugging CI runs -- is there a particular reason you removed it?
There was a problem hiding this comment.
Not really, the script was taken from clang-sys, and they removed it upstream. But I'll re-add.
Plus fix the check that avoids us generating explicit alignment fields for structs aligned to more than pointer-size. Fixes rust-lang#1291
|
@bors-servo r=fitzgen |
|
📌 Commit de0d850 has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
Apr 3, 2018
codegen: Use target pointer size consistently for layout calculations Assuming new enough libclang, this PR makes cross-compilation do layout calculations properly. Fixes #1284
|
☀️ Test successful - status-travis |
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.
Assuming new enough libclang, this PR makes cross-compilation do layout calculations properly.
Fixes #1284